From 131845c1b3185b5efb8b5bd287747c7086eface8 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Fri, 31 Jul 2020 16:41:53 -0400
Subject: [PATCH] Support cloud-owner input param

If cloud-owner is passed in input, it should override the value
from properties file

Change-Id: I67b0e7e0b4fe546dbdfcaa24785ebd1b3b96e7b5
Issue-ID: SDNC-1260
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 .gitignore                                         |    1 +
 ...URCE-API_network-topology-operation-assign.json | 1201 ++++-
 ...RESOURCE-API_pnf-topology-operation-assign.json |  326 +-
 ..._vf-module-topology-operation-assign-async.json | 4918 ++++++++++----------
 ...I_vf-module-topology-operation-assign-sync.json | 4490 +++++++++---------
 ...CE-API_vnf-topology-operation-assign-async.json | 4006 ++++++++--------
 ...OURCE-API_network-topology-operation-assign.xml |    7 +
 ...-RESOURCE-API_pnf-topology-operation-assign.xml |    7 +
 ...I_vf-module-topology-operation-assign-async.xml |    7 +
 ...PI_vf-module-topology-operation-assign-sync.xml |    9 +-
 ...RCE-API_vnf-topology-operation-assign-async.xml |    7 +
 11 files changed, 8195 insertions(+), 6784 deletions(-)
 mode change 100755 => 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml

diff --git a/.gitignore b/.gitignore
index b632be92..1c75d57a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ org.eclipse.core.resources.prefs
 .pydevproject
 maven-eclipse.xml
 workspace
+.factorypath
 
 ## Compilation Files ##
 *.class
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-assign.json
index 887976b4..6a7565bb 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-assign.json
@@ -1 +1,1200 @@
-[{"id":"35351cd8.e49b6c","type":"dgstart","name":"DGSTART","outputs":1,"x":163.75,"y":130,"z":"a4ab5e6a.05da68","wires":[["c488ab18.813ac"]]},{"id":"c488ab18.813ac","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":307.0356903076172,"y":193.09525775909424,"z":"a4ab5e6a.05da68","wires":[["fd3bd3dd.2fc7e"]]},{"id":"fd3bd3dd.2fc7e","type":"method","name":"network-topology-operation-assign","xml":"<method rpc='network-topology-operation-assign' mode='sync'>\n","comments":"","outputs":1,"x":282.71437072753906,"y":270.892840385437,"z":"a4ab5e6a.05da68","wires":[["a504ce7b.f4be1"]]},{"id":"a504ce7b.f4be1","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":242.03572845458984,"y":455.1578025817871,"z":"a4ab5e6a.05da68","wires":[["7a78b4c3.1d1704","6f978d59.65e2a4","e6aea972.81fa58","c105f712.43feb","2065d316.e3c6b4","435263ad.548d94"]]},{"id":"7a78b4c3.1d1704","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":531.0953216552734,"y":838.428908675909,"z":"a4ab5e6a.05da68","wires":[]},{"id":"9407b227.b5aac","type":"switchNode","name":"switch network-request-information.network-name","xml":"<switch test='`$network-topology-operation-input.network-request-input.network-name`'>\n","comments":"","outputs":1,"x":1393.3293914794922,"y":758.2224534451962,"z":"a4ab5e6a.05da68","wires":[["26796752.d0dcf","b2889a92.f25fa"]]},{"id":"8d83af5b.faf8e","type":"comment","name":"if network-name not populated, generate and call automated flow","info":"","comments":"","x":1979.7104797363281,"y":681.281824439764,"z":"a4ab5e6a.05da68","wires":[]},{"id":"26796752.d0dcf","type":"other","name":"outcome NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1824.7344284057617,"y":724.4007714688778,"z":"a4ab5e6a.05da68","wires":[["2bd3b459.1b62a4"]]},{"id":"2bd3b459.1b62a4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2018.067626953125,"y":721.7341164052486,"z":"a4ab5e6a.05da68","wires":[["ad0c5cfa.c98228"]]},{"id":"ad0c5cfa.c98228","type":"switchNode","name":"switch network-model.onap-generated-naming","xml":"<switch test='`$network-model.ecomp-generated-naming`'>\n","comments":"","outputs":1,"x":2318.01993560791,"y":720.734105437994,"z":"a4ab5e6a.05da68","wires":[["ae485efb.76a4e8","ac9117f1.1932"]]},{"id":"ae485efb.76a4e8","type":"other","name":"outcome Y","xml":"<outcome value='Y'>\n","comments":"","outputs":1,"x":2637.0200386047363,"y":708.7340984344482,"z":"a4ab5e6a.05da68","wires":[["dca1d141.97d82"]]},{"id":"dca1d141.97d82","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":2805.7700805664062,"y":709.2340869903564,"z":"a4ab5e6a.05da68","wires":[["d12936a3.5fdc98","819f29fe.58f36","56735c9d.4e8e44","2a9c33ec.5e77dc"]]},{"id":"ac9117f1.1932","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2628.242328643799,"y":741.7340984344482,"z":"a4ab5e6a.05da68","wires":[["7163c04e.950f4"]]},{"id":"7163c04e.950f4","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=\"Network name is required if onap naming is false\" />\n\n","comments":"","x":2809.742515563965,"y":745.7342141568661,"z":"a4ab5e6a.05da68","wires":[]},{"id":"cb324a53.198fb8","type":"switchNode","name":"switch network-model.onap-generated-naming","xml":"<switch test='`$network-model.naming-policy`'>\n","comments":"","outputs":1,"x":2797.792922973633,"y":1273.127024024725,"z":"a4ab5e6a.05da68","wires":[["75edc6c0.f99408","d438a51e.a26e5","534c46ca.643cc8","113fc1c8.4946c6","90e61ae1.f9a06","9b9f98f0.979af"]]},{"id":"d438a51e.a26e5","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":3115.7932891845703,"y":1493.1270688474178,"z":"a4ab5e6a.05da68","wires":[["30260c5a.e9ea44"]]},{"id":"75edc6c0.f99408","type":"other","name":"outcome org.openecomp.policy.naming.SriovProvider.SriovProviderNetwork","xml":"<outcome value='org.openecomp.policy.naming.SriovProvider.SriovProviderNetwork'>\n","comments":"","outputs":1,"x":3314.904739379883,"y":1419.1271246373653,"z":"a4ab5e6a.05da68","wires":[["9056cce6.58fbd"]]},{"id":"30260c5a.e9ea44","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=\"`'Unknown naming policy = ' \n    + $network-model.naming-policy`\" />\n\n","comments":"","x":3276.2375507354736,"y":1492.793745368719,"z":"a4ab5e6a.05da68","wires":[]},{"id":"9be184e1.57cef8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":3830.8228454589844,"y":1180.210465848446,"z":"a4ab5e6a.05da68","wires":[["39a69556.129652","f43c5a5f.3f54a8","85714f6b.fb864","5ebec644.0ccd68","a8167cc8.a0a54","b9ae426.3e3c74"]]},{"id":"39a69556.129652","type":"set","name":"set nameformat","xml":"<set>\n<parameter name='tmp.network-name-prefix' value='$TenantName_int_$role_net' />\n","comments":"","x":4343.297813415527,"y":1074.5436511933804,"z":"a4ab5e6a.05da68","wires":[]},{"id":"2c4f1662.4b4d3a","type":"set","name":"set nameformat","xml":"<set>\n<parameter name='tmp.network-name-prefix' value='$TenantName_$role_net' />\n","comments":"","x":4341.107772827148,"y":1116.40079459548,"z":"a4ab5e6a.05da68","wires":[]},{"id":"9056cce6.58fbd","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":3726.393653869629,"y":1404.8771620690823,"z":"a4ab5e6a.05da68","wires":[["2c4f1662.4b4d3a","f43c5a5f.3f54a8","85714f6b.fb864","5ebec644.0ccd68","a8167cc8.a0a54","b9ae426.3e3c74"]]},{"id":"534c46ca.643cc8","type":"other","name":"outcome org.openecomp.policy.naming.ViprProtectedOam.ViprOamProtectedNetwork","xml":"<outcome value='org.openecomp.policy.naming.ViprProtectedOam.ViprOamProtectedNetwork'>\n","comments":"","outputs":1,"x":3353.6828384399414,"y":1164.460464477539,"z":"a4ab5e6a.05da68","wires":[["9be184e1.57cef8"]]},{"id":"f43c5a5f.3f54a8","type":"execute","name":"execute SliStringUtils - replace tenantname","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.network-name-prefix`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.network-name-prefix\"/>\n    <parameter name=\"target\" value=\"$TenantName\"/>\n    <parameter name=\"replacement\" value=\"`$aai.tenant.tenant-name`\"/>\n\n","comments":"","outputs":1,"x":4417.552307128906,"y":1240.067470163107,"z":"a4ab5e6a.05da68","wires":[[]]},{"id":"85714f6b.fb864","type":"execute","name":"execute SliStringUtils - replace role","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.network-name-prefix`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.network-name-prefix\"/>\n    <parameter name=\"target\" value=\"$role\"/>\n    <parameter name=\"replacement\" value=\"`$network-model.network-role`\"/>\n\n","comments":"","outputs":1,"x":4390.552307128906,"y":1275.067470163107,"z":"a4ab5e6a.05da68","wires":[[]]},{"id":"5ebec644.0ccd68","type":"get-resource","name":"get-resource NETWORK_INSTANCE_NAME_INDEX","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from NETWORK_INSTANCE_NAME_INDEX WHERE network_instance_name_prefix\n    = $tmp.network-name-prefix'\n  pfx='db.network-name-prefix'>\n\n","comments":"","outputs":1,"x":4440.219055175781,"y":1311.067470163107,"z":"a4ab5e6a.05da68","wires":[["5140a76f.251638"]]},{"id":"a8167cc8.a0a54","type":"switchNode","name":"switch index-number","xml":"<switch test='`$db.network-name-prefix.index-number`'>\n","comments":"","outputs":1,"x":4345.933395385742,"y":1415.353054612875,"z":"a4ab5e6a.05da68","wires":[["1ecccb29.20b9dd","6a4c6ddb.dc419c"]]},{"id":"6a4c6ddb.dc419c","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":4528.790435791016,"y":1456.7815681397915,"z":"a4ab5e6a.05da68","wires":[["6510627a.0b6c54"]]},{"id":"1ecccb29.20b9dd","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":4530.2189865112305,"y":1372.4958969056606,"z":"a4ab5e6a.05da68","wires":[["c1c17349.e7014"]]},{"id":"c5d52aa5.50e6e","type":"save","name":"save (insert) name index","xml":"<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key=\"insert into NETWORK_INSTANCE_NAME_INDEX values ( $tmp.network-name-prefix , 1)\"\n  force='false' pfx='pfx'>\n","comments":"","outputs":1,"x":4902.005027770996,"y":1479.281955331564,"z":"a4ab5e6a.05da68","wires":[["814eff24.4c754"]]},{"id":"7afcc751.2cd6a","type":"set","name":"increment index number","xml":"<set>\n<parameter name='tmp.index-number' value='`$db.network-name-prefix.index-number+1`' />\n","comments":"","x":4901.647624969482,"y":1349.6389118134975,"z":"a4ab5e6a.05da68","wires":[]},{"id":"6510627a.0b6c54","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":4687.361980438232,"y":1455.3532119691372,"z":"a4ab5e6a.05da68","wires":[["9e67cd6.09d453","c5d52aa5.50e6e"]]},{"id":"5140a76f.251638","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":4714.504695892334,"y":1309.6388812959194,"z":"a4ab5e6a.05da68","wires":[["a58dedfa.823ee"]]},{"id":"a58dedfa.823ee","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading the NETWORK_INSTANCE_NAME_INDEX table\" />\n","comments":"","x":4868.790512084961,"y":1309.6389003694057,"z":"a4ab5e6a.05da68","wires":[]},{"id":"9e67cd6.09d453","type":"set","name":"set new index number to 1","xml":"<set>\n<parameter name='tmp.index-number' value='1' />\n","comments":"","x":4910.219207763672,"y":1433.9245296418667,"z":"a4ab5e6a.05da68","wires":[]},{"id":"61fdf122.30c6d","type":"save","name":"save (update) name index","xml":"<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key=\"update NETWORK_INSTANCE_NAME_INDEX\n       set index_number = $tmp.index-number\n       where network_instance_name_prefix = $db.network-name-prefix.network-instance-name-prefix \"\n  force='false' pfx='pfx'>\n","comments":"","outputs":1,"x":4908.79056930542,"y":1391.067464441061,"z":"a4ab5e6a.05da68","wires":[["ee2bd7a9.0d103"]]},{"id":"c1c17349.e7014","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":4687.361877441406,"y":1371.0673442780972,"z":"a4ab5e6a.05da68","wires":[["7afcc751.2cd6a","61fdf122.30c6d"]]},{"id":"ee2bd7a9.0d103","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":5131.647624969482,"y":1391.067464441061,"z":"a4ab5e6a.05da68","wires":[["c54eb549.7b55c"]]},{"id":"c54eb549.7b55c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Failed to update SERVICE_INSTANCE_NAME_INDEX table\" />\n","comments":"","x":5285.933441162109,"y":1391.0674835145473,"z":"a4ab5e6a.05da68","wires":[]},{"id":"814eff24.4c754","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":5130.218925476074,"y":1476.7816768586636,"z":"a4ab5e6a.05da68","wires":[["1d6e678c.ed74c8"]]},{"id":"1d6e678c.ed74c8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Failed to insert record into SERVICE_INSTANCE_NAME_INDEX table\" />\n","comments":"","x":5284.504741668701,"y":1476.78169593215,"z":"a4ab5e6a.05da68","wires":[]},{"id":"b9ae426.3e3c74","type":"set","name":"set tmp.network-instance-name","xml":"<set>\n<parameter name='tmp.network-instance-name' value=\"`$tmp.network-name-prefix + '_' + $tmp.index-number`\" />\n","comments":"","x":4383.504192352295,"y":1494.4959779679775,"z":"a4ab5e6a.05da68","wires":[]},{"id":"b2889a92.f25fa","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1805.3638343811035,"y":777.7248501777649,"z":"a4ab5e6a.05da68","wires":[["a9470efa.ce6fb8"]]},{"id":"6f978d59.65e2a4","type":"get-resource","name":"get-resource tenant","xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tenant\" \n\t\tkey=\"cloud-region.cloud-owner = $prop.cloud-region.cloud-owner AND \n\t\t     cloud-region.cloud-region-id = $network-topology-operation-input.network-request-input.aic-cloud-region AND\n\t\t     tenant.tenant-id = $network-topology-operation-input.network-request-input.tenant\"\n        pfx='aai.tenant' local-only='false' >\n\n","comments":"","outputs":1,"x":578.9153747558594,"y":451.46299585700035,"z":"a4ab5e6a.05da68","wires":[["510eff14.764978","e2757e9.6ede2","723bb3a4.0a6514"]]},{"id":"510eff14.764978","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":814.5267105102539,"y":455.5740579068661,"z":"a4ab5e6a.05da68","wires":[["32cf849b.47605c"]]},{"id":"e2757e9.6ede2","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":809.8597373962402,"y":488.90737184882164,"z":"a4ab5e6a.05da68","wires":[["32cf849b.47605c"]]},{"id":"32cf849b.47605c","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=\"Tenant not found in AAI\" />\n\n","comments":"","x":1010.7023849487305,"y":463.62962278723717,"z":"a4ab5e6a.05da68","wires":[]},{"id":"b95af8cf.640458","type":"set","name":"set tmp.network-instance-name","xml":"<set>\n<parameter name='tmp.network-instance-name' value=\"`$network-topology-operation-input.network-request-input.network-name`\" />\n<parameter name='tmp.l3-network.network-name' value=\"`$network-topology-operation-input.network-request-input.network-name`\" />\n","comments":"","x":2273.835075378418,"y":770.7248662412167,"z":"a4ab5e6a.05da68","wires":[]},{"id":"a9470efa.ce6fb8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2003.882396697998,"y":777.7248196601868,"z":"a4ab5e6a.05da68","wires":[["b95af8cf.640458","d5f7e16b.7cecb"]]},{"id":"994ffad3.0ba89","type":"call","name":"call generate-l3network-network-id","xml":"<call module='GENERIC-RESOURCE-API' rpc='generate-l3network-network-id' mode='sync' >\n","comments":"","outputs":1,"x":1233.0295639038086,"y":542.5410922467709,"z":"a4ab5e6a.05da68","wires":[[]]},{"id":"723bb3a4.0a6514","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":810.0357437133789,"y":424.0000222623348,"z":"a4ab5e6a.05da68","wires":[["2d78cce8.fc4c2c"]]},{"id":"2d78cce8.fc4c2c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1002.5357437133789,"y":424.75003084540367,"z":"a4ab5e6a.05da68","wires":[[]]},{"id":"113fc1c8.4946c6","type":"other","name":"outcome oam_vipr_protected_network","xml":"<outcome value='oam_vipr_protected_network'>\n","comments":"","outputs":1,"x":3208.126640319824,"y":1201.324143409729,"z":"a4ab5e6a.05da68","wires":[["9be184e1.57cef8"]]},{"id":"90e61ae1.f9a06","type":"other","name":"outcome network_without_route_tags_naming_default","xml":"<outcome value='network_without_route_tags_naming_default'>\n","comments":"","outputs":1,"x":3254.793312072754,"y":1237.9908113479614,"z":"a4ab5e6a.05da68","wires":[["9be184e1.57cef8"]]},{"id":"9b9f98f0.979af","type":"other","name":"outcome sriov_provider_network","xml":"<outcome value='sriov_provider_network'>\n","comments":"","outputs":1,"x":3187.460159301758,"y":1452.657508701086,"z":"a4ab5e6a.05da68","wires":[["9056cce6.58fbd"]]},{"id":"99f811c1.c71dc","type":"other","name":"outcome oam_atm_u_landing_network","xml":"<outcome value='oam_atm_u_landing_network'>\n","comments":"","outputs":1,"x":3201.459831237793,"y":1279.657470703125,"z":"a4ab5e6a.05da68","wires":[["9056cce6.58fbd"]]},{"id":"87fe61ea.a414a","type":"other","name":"outcome oam_atm_p_landing_network","xml":"<outcome value='oam_atm_p_landing_network'>\n","comments":"","outputs":1,"x":3199.7930068969727,"y":1314.6574726104736,"z":"a4ab5e6a.05da68","wires":[["9056cce6.58fbd"]]},{"id":"8e28dbe.70ebe28","type":"other","name":"outcome oam_aim_landing_network","xml":"<outcome value='oam_aim_landing_network'>\n","comments":"","outputs":1,"x":3193.1268463134766,"y":1346.3241415023804,"z":"a4ab5e6a.05da68","wires":[["9056cce6.58fbd"]]},{"id":"774e8da3.9580cc","type":"other","name":"outcome network_with_route_tags_naming_default","xml":"<outcome value='network_with_route_tags_naming_default'>\n","comments":"","outputs":1,"x":3238.1269302368164,"y":1379.6574659347534,"z":"a4ab5e6a.05da68","wires":[["9056cce6.58fbd"]]},{"id":"8e167533.9d1438","type":"comment","name":"Changelog","info":"1707: Change vpn binding from field to table selection\n1710: Add ipv6 vipr flows\n1806: Separate out to automated vs preload vs vlan tagging","comments":"","x":376.6071472167969,"y":130.00000667572021,"z":"a4ab5e6a.05da68","wires":[]},{"id":"e6aea972.81fa58","type":"execute","name":"execute Properties - pull properties file","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":642.3214950561523,"y":362.7181886136532,"z":"a4ab5e6a.05da68","wires":[[]]},{"id":"71ac9cb8.c11e3c","type":"comment","name":"Pre-1806 naming logic","info":"","comments":"","x":2718.8212890625,"y":1240.8254249989986,"z":"a4ab5e6a.05da68","wires":[]},{"id":"d12936a3.5fdc98","type":"call","name":"call naming-policy-generate-name","xml":"<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n","comments":"","outputs":1,"x":3083.9288177490234,"y":747.0039323270321,"z":"a4ab5e6a.05da68","wires":[[]]},{"id":"819f29fe.58f36","type":"set","name":"set parameters for generate-unique-name","xml":"<set>\n<parameter name='naming-policy-generate-name-input.policy-instance-name' value='`$network-model.naming-policy`' />\n<parameter name='naming-policy-generate-name-input.context-id' value='`$tmp.l3-network.network-id`' />\n<parameter name='naming-policy-generate-name-input.naming-type' value='NETWORK' />\n<parameter name='naming-policy-generate-name-input.action' value='ASSIGN' />\n<parameter name='naming-policy-generate-name-input.query-parameter' value='`$network-model.customization-uuid`' />\n\n\n","comments":"","x":3106.6791076660156,"y":709.004013389349,"z":"a4ab5e6a.05da68","wires":[]},{"id":"56735c9d.4e8e44","type":"set","name":"set network name","xml":"<set>\n<parameter name='tmp.network-instance-name' value='`$naming-policy-generate-name-output.network-name`' />\n<parameter name='tmp.l3-network.network-name' value='`$naming-policy-generate-name-output.network-name`' />\n\n\n\n","comments":"","x":3033.178871154785,"y":782.0039304196835,"z":"a4ab5e6a.05da68","wires":[]},{"id":"d5f7e16b.7cecb","type":"call","name":"call network-topology-operation-assign-from-preload","xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign-from-preload' mode='sync' >\n","comments":"","outputs":1,"x":2337.9648056030273,"y":805.4324515759945,"z":"a4ab5e6a.05da68","wires":[[]]},{"id":"2a9c33ec.5e77dc","type":"call","name":"call network-topology-operation-assign-automated","xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign-automated' mode='sync' >\n","comments":"","outputs":1,"x":3137.091377258301,"y":819.5833495557308,"z":"a4ab5e6a.05da68","wires":[[]]},{"id":"c105f712.43feb","type":"set","name":"set tmp.l3-network.network-id","xml":"<set>\n<parameter name='tmp.l3-network.network-id' value='`$tmp.return.generate-l3network-network-id.uuid`' />\n<parameter name='network-topology-operation-input.network-information.network-id' value='`$tmp.return.generate-l3network-network-id.uuid`' />","comments":"","x":581.4961700439453,"y":627.2500842511654,"z":"a4ab5e6a.05da68","wires":[]},{"id":"2065d316.e3c6b4","type":"switchNode","name":"switch network-request-information.network-id","xml":"<switch test='`$network-topology-operation-input.network-information.network-id`'>\n","comments":"","outputs":1,"x":631.0000610351562,"y":581.0039370954037,"z":"a4ab5e6a.05da68","wires":[["d4168914.09272","40ee795c.063838"]]},{"id":"d4168914.09272","type":"other","name":"outcome NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":960,"y":544.0039218366146,"z":"a4ab5e6a.05da68","wires":[["994ffad3.0ba89"]]},{"id":"40ee795c.063838","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":940.6294059753418,"y":583.3280005455017,"z":"a4ab5e6a.05da68","wires":[["e717894c.aca1a"]]},{"id":"e717894c.aca1a","type":"set","name":"set network-id","xml":"<set>\n<parameter name='tmp.return.generate-l3network-network-id.uuid' value='`$network-topology-operation-input.network-information.network-id`' />\n\n\n\n","comments":"","x":1163,"y":582.7540283203125,"z":"a4ab5e6a.05da68","wires":[]},{"id":"52111bb9.bd57fc","type":"comment","name":"if network-instance-group-id populated, follow vlan tagging flow","info":"","comments":"","x":685.8945465087891,"y":727.2913134992123,"z":"a4ab5e6a.05da68","wires":[]},{"id":"435263ad.548d94","type":"switchNode","name":"switch network-request-information.network-instance-group-id","xml":"<switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>\n","comments":"","outputs":1,"x":684.6127166748047,"y":762.1563418805599,"z":"a4ab5e6a.05da68","wires":[["e25525d.3b75958","b57f4a07.8cd1e8"]]},{"id":"e25525d.3b75958","type":"other","name":"outcome NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1067.3232421875,"y":760.148541778326,"z":"a4ab5e6a.05da68","wires":[["9407b227.b5aac"]]},{"id":"b57f4a07.8cd1e8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1047.9526481628418,"y":799.4726204872131,"z":"a4ab5e6a.05da68","wires":[["d8ce728c.6ea7b8"]]},{"id":"d8ce728c.6ea7b8","type":"call","name":"call network-topology-operation-assign-vlantagging-instancegroup","xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign-vlantagging-instancegroup' mode='sync' >\n","comments":"","outputs":1,"x":1448.8237915039062,"y":801.2916396558285,"z":"a4ab5e6a.05da68","wires":[[]]},{"id":"210258e5.7e72f","type":"comment","name":"if network-name not populated, generate and call automated flow","info":"","comments":"","x":1995.8810729980469,"y":872.3133433759212,"z":"a4ab5e6a.05da68","wires":[]}]
\ No newline at end of file
+[
+    {
+        "id": "d9354bed.7e3d38",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 109,
+        "y": 90,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "66dddf81.514c08"
+            ]
+        ]
+    },
+    {
+        "id": "66dddf81.514c08",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 252.2856903076172,
+        "y": 153.09525775909424,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "65a79f7d.49e2c"
+            ]
+        ]
+    },
+    {
+        "id": "65a79f7d.49e2c",
+        "type": "method",
+        "name": "network-topology-operation-assign",
+        "xml": "<method rpc='network-topology-operation-assign' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 227.96437072753906,
+        "y": 230.892840385437,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "3f3f6e54.d26392"
+            ]
+        ]
+    },
+    {
+        "id": "3f3f6e54.d26392",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 187.28572845458984,
+        "y": 415.1578025817871,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "96a66838.27eb5",
+                "4ec3b463.9f3dec",
+                "d3ee5726.8245f",
+                "3c332c37.f4b7bc",
+                "6b08e57f.4948f4",
+                "96dfe9d4.8e2428",
+                "66347a0f.b006fc"
+            ]
+        ]
+    },
+    {
+        "id": "96a66838.27eb5",
+        "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": 476.34532165527344,
+        "y": 798.428908675909,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "ff1e099e.f8c22",
+        "type": "switchNode",
+        "name": "switch network-request-information.network-name",
+        "xml": "<switch test='`$network-topology-operation-input.network-request-input.network-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1338.5793914794922,
+        "y": 718.2224534451962,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "5ee2db3f.ff804c",
+                "47dada57.b386d4"
+            ]
+        ]
+    },
+    {
+        "id": "4cfca0e0.5ca288",
+        "type": "comment",
+        "name": "if network-name not populated, generate and call automated flow",
+        "info": "",
+        "comments": "",
+        "x": 1924.9604797363281,
+        "y": 641.281824439764,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "5ee2db3f.ff804c",
+        "type": "other",
+        "name": "outcome NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1769.9844284057617,
+        "y": 684.4007714688778,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "a0461f96.83e898"
+            ]
+        ]
+    },
+    {
+        "id": "a0461f96.83e898",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1963.317626953125,
+        "y": 681.7341164052486,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "e24ce471.3a334"
+            ]
+        ]
+    },
+    {
+        "id": "e24ce471.3a334",
+        "type": "switchNode",
+        "name": "switch network-model.onap-generated-naming",
+        "xml": "<switch test='`$network-model.ecomp-generated-naming`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2263.26993560791,
+        "y": 680.734105437994,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "f6dd56f6.ab0ed8",
+                "5fde81d4.76f8d8"
+            ]
+        ]
+    },
+    {
+        "id": "f6dd56f6.ab0ed8",
+        "type": "other",
+        "name": "outcome Y",
+        "xml": "<outcome value='Y'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2582.2700386047363,
+        "y": 668.7340984344482,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "cf4d3c67.b13698"
+            ]
+        ]
+    },
+    {
+        "id": "cf4d3c67.b13698",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2751.0200805664062,
+        "y": 669.2340869903564,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "b9c386f.7817bf8",
+                "d18311c4.4cd748",
+                "b0171571.8c955",
+                "cc60b7f8.cae668"
+            ]
+        ]
+    },
+    {
+        "id": "5fde81d4.76f8d8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2573.492328643799,
+        "y": 701.7340984344482,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "1c27fc30.223f64"
+            ]
+        ]
+    },
+    {
+        "id": "1c27fc30.223f64",
+        "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=\"Network name is required if onap naming is false\" />\n\n",
+        "comments": "",
+        "x": 2754.992515563965,
+        "y": 705.7342141568661,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "84f94b0f.6ed3",
+        "type": "switchNode",
+        "name": "switch network-model.onap-generated-naming",
+        "xml": "<switch test='`$network-model.naming-policy`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2743.042922973633,
+        "y": 1233.127024024725,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "82ada125.3372f",
+                "82da6366.c03ea",
+                "7c4cce15.39256",
+                "33898a4d.eb2f56",
+                "5a2b9c63.71261c",
+                "403cc823.dd2ee8"
+            ]
+        ]
+    },
+    {
+        "id": "82da6366.c03ea",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3061.0432891845703,
+        "y": 1453.1270688474178,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "b2173417.8d9188"
+            ]
+        ]
+    },
+    {
+        "id": "82ada125.3372f",
+        "type": "other",
+        "name": "outcome org.openecomp.policy.naming.SriovProvider.SriovProviderNetwork",
+        "xml": "<outcome value='org.openecomp.policy.naming.SriovProvider.SriovProviderNetwork'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3260.154739379883,
+        "y": 1379.1271246373653,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "9518558.1f4d3a8"
+            ]
+        ]
+    },
+    {
+        "id": "b2173417.8d9188",
+        "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=\"`'Unknown naming policy = ' \n    + $network-model.naming-policy`\" />\n\n",
+        "comments": "",
+        "x": 3221.4875507354736,
+        "y": 1452.793745368719,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "858baa62.b657b8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3776.0728454589844,
+        "y": 1140.210465848446,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "9c109189.444f58",
+                "cf022494.6df518",
+                "a835404c.942c08",
+                "3e84a79e.7e1e48",
+                "ed5be788.499a98",
+                "c1f2498e.515b7"
+            ]
+        ]
+    },
+    {
+        "id": "9c109189.444f58",
+        "type": "set",
+        "name": "set nameformat",
+        "xml": "<set>\n<parameter name='tmp.network-name-prefix' value='$TenantName_int_$role_net' />\n",
+        "comments": "",
+        "x": 4288.547813415527,
+        "y": 1034.5436511933804,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "683e2e49.348cd8",
+        "type": "set",
+        "name": "set nameformat",
+        "xml": "<set>\n<parameter name='tmp.network-name-prefix' value='$TenantName_$role_net' />\n",
+        "comments": "",
+        "x": 4286.357772827148,
+        "y": 1076.40079459548,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "9518558.1f4d3a8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3671.643653869629,
+        "y": 1364.8771620690823,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "683e2e49.348cd8",
+                "cf022494.6df518",
+                "a835404c.942c08",
+                "3e84a79e.7e1e48",
+                "ed5be788.499a98",
+                "c1f2498e.515b7"
+            ]
+        ]
+    },
+    {
+        "id": "7c4cce15.39256",
+        "type": "other",
+        "name": "outcome org.openecomp.policy.naming.ViprProtectedOam.ViprOamProtectedNetwork",
+        "xml": "<outcome value='org.openecomp.policy.naming.ViprProtectedOam.ViprOamProtectedNetwork'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3298.9328384399414,
+        "y": 1124.460464477539,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "858baa62.b657b8"
+            ]
+        ]
+    },
+    {
+        "id": "cf022494.6df518",
+        "type": "execute",
+        "name": "execute SliStringUtils - replace tenantname",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.network-name-prefix`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.network-name-prefix\"/>\n    <parameter name=\"target\" value=\"$TenantName\"/>\n    <parameter name=\"replacement\" value=\"`$aai.tenant.tenant-name`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4362.802307128906,
+        "y": 1200.067470163107,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a835404c.942c08",
+        "type": "execute",
+        "name": "execute SliStringUtils - replace role",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.network-name-prefix`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.network-name-prefix\"/>\n    <parameter name=\"target\" value=\"$role\"/>\n    <parameter name=\"replacement\" value=\"`$network-model.network-role`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4335.802307128906,
+        "y": 1235.067470163107,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3e84a79e.7e1e48",
+        "type": "get-resource",
+        "name": "get-resource NETWORK_INSTANCE_NAME_INDEX",
+        "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from NETWORK_INSTANCE_NAME_INDEX WHERE network_instance_name_prefix\n    = $tmp.network-name-prefix'\n  pfx='db.network-name-prefix'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4385.469055175781,
+        "y": 1271.067470163107,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "e098e55c.e9bcc8"
+            ]
+        ]
+    },
+    {
+        "id": "ed5be788.499a98",
+        "type": "switchNode",
+        "name": "switch index-number",
+        "xml": "<switch test='`$db.network-name-prefix.index-number`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4291.183395385742,
+        "y": 1375.353054612875,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "5152f824.fb557",
+                "20b4e6c.d14431a"
+            ]
+        ]
+    },
+    {
+        "id": "20b4e6c.d14431a",
+        "type": "other",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 4474.040435791016,
+        "y": 1416.7815681397915,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "25896c27.58ebfc"
+            ]
+        ]
+    },
+    {
+        "id": "5152f824.fb557",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4475.4689865112305,
+        "y": 1332.4958969056606,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "a9ac0b9d.a6eb4"
+            ]
+        ]
+    },
+    {
+        "id": "981d7ecf.08a1d",
+        "type": "save",
+        "name": "save (insert) name index",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key=\"insert into NETWORK_INSTANCE_NAME_INDEX values ( $tmp.network-name-prefix , 1)\"\n  force='false' pfx='pfx'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4847.255027770996,
+        "y": 1439.281955331564,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "2aed3f93.ceaf3"
+            ]
+        ]
+    },
+    {
+        "id": "650af43d.047e24",
+        "type": "set",
+        "name": "increment index number",
+        "xml": "<set>\n<parameter name='tmp.index-number' value='`$db.network-name-prefix.index-number+1`' />\n",
+        "comments": "",
+        "x": 4846.897624969482,
+        "y": 1309.6389118134975,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "25896c27.58ebfc",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4632.611980438232,
+        "y": 1415.3532119691372,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "bac1ba8a.5888d",
+                "981d7ecf.08a1d"
+            ]
+        ]
+    },
+    {
+        "id": "e098e55c.e9bcc8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4659.754695892334,
+        "y": 1269.6388812959194,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "e8519067.5eedc"
+            ]
+        ]
+    },
+    {
+        "id": "e8519067.5eedc",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading the NETWORK_INSTANCE_NAME_INDEX table\" />\n",
+        "comments": "",
+        "x": 4814.040512084961,
+        "y": 1269.6389003694057,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "bac1ba8a.5888d",
+        "type": "set",
+        "name": "set new index number to 1",
+        "xml": "<set>\n<parameter name='tmp.index-number' value='1' />\n",
+        "comments": "",
+        "x": 4855.469207763672,
+        "y": 1393.9245296418667,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "21f03475.9133c4",
+        "type": "save",
+        "name": "save (update) name index",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key=\"update NETWORK_INSTANCE_NAME_INDEX\n       set index_number = $tmp.index-number\n       where network_instance_name_prefix = $db.network-name-prefix.network-instance-name-prefix \"\n  force='false' pfx='pfx'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4854.04056930542,
+        "y": 1351.067464441061,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "c232d6cf.de0a18"
+            ]
+        ]
+    },
+    {
+        "id": "a9ac0b9d.a6eb4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4632.611877441406,
+        "y": 1331.0673442780972,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "650af43d.047e24",
+                "21f03475.9133c4"
+            ]
+        ]
+    },
+    {
+        "id": "c232d6cf.de0a18",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5076.897624969482,
+        "y": 1351.067464441061,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "c68c27c5.c875c8"
+            ]
+        ]
+    },
+    {
+        "id": "c68c27c5.c875c8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Failed to update SERVICE_INSTANCE_NAME_INDEX table\" />\n",
+        "comments": "",
+        "x": 5231.183441162109,
+        "y": 1351.0674835145473,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "2aed3f93.ceaf3",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5075.468925476074,
+        "y": 1436.7816768586636,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "49ac795f.497f88"
+            ]
+        ]
+    },
+    {
+        "id": "49ac795f.497f88",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Failed to insert record into SERVICE_INSTANCE_NAME_INDEX table\" />\n",
+        "comments": "",
+        "x": 5229.754741668701,
+        "y": 1436.78169593215,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "c1f2498e.515b7",
+        "type": "set",
+        "name": "set tmp.network-instance-name",
+        "xml": "<set>\n<parameter name='tmp.network-instance-name' value=\"`$tmp.network-name-prefix + '_' + $tmp.index-number`\" />\n",
+        "comments": "",
+        "x": 4328.754192352295,
+        "y": 1454.4959779679775,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "47dada57.b386d4",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1750.6138343811035,
+        "y": 737.7248501777649,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "fc8a6fbd.0a8c1"
+            ]
+        ]
+    },
+    {
+        "id": "4ec3b463.9f3dec",
+        "type": "get-resource",
+        "name": "get-resource tenant",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tenant\" \n\t\tkey=\"cloud-region.cloud-owner = $prop.cloud-region.cloud-owner AND \n\t\t     cloud-region.cloud-region-id = $network-topology-operation-input.network-request-input.aic-cloud-region AND\n\t\t     tenant.tenant-id = $network-topology-operation-input.network-request-input.tenant\"\n        pfx='aai.tenant' local-only='false' >\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 524.1653747558594,
+        "y": 411.46299585700035,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "dceca419.e95bf",
+                "5c7e325c.1e2d84",
+                "a1832241.3d7b08"
+            ]
+        ]
+    },
+    {
+        "id": "dceca419.e95bf",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 759.7767105102539,
+        "y": 415.5740579068661,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "29bf9597.ed8532"
+            ]
+        ]
+    },
+    {
+        "id": "5c7e325c.1e2d84",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 755.1097373962402,
+        "y": 448.90737184882164,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "29bf9597.ed8532"
+            ]
+        ]
+    },
+    {
+        "id": "29bf9597.ed8532",
+        "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=\"Tenant not found in AAI\" />\n\n",
+        "comments": "",
+        "x": 955.9523849487305,
+        "y": 423.62962278723717,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "fc1552fb.02ef8",
+        "type": "set",
+        "name": "set tmp.network-instance-name",
+        "xml": "<set>\n<parameter name='tmp.network-instance-name' value=\"`$network-topology-operation-input.network-request-input.network-name`\" />\n<parameter name='tmp.l3-network.network-name' value=\"`$network-topology-operation-input.network-request-input.network-name`\" />\n",
+        "comments": "",
+        "x": 2219.085075378418,
+        "y": 730.7248662412167,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "fc8a6fbd.0a8c1",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1949.132396697998,
+        "y": 737.7248196601868,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "fc1552fb.02ef8",
+                "b8fd9c4b.8d8a1"
+            ]
+        ]
+    },
+    {
+        "id": "7df139c4.75d918",
+        "type": "call",
+        "name": "call generate-l3network-network-id",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='generate-l3network-network-id' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1178.2795639038086,
+        "y": 502.54109224677086,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a1832241.3d7b08",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 755.2857437133789,
+        "y": 384.0000222623348,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "f4aa45be.0cd09"
+            ]
+        ]
+    },
+    {
+        "id": "f4aa45be.0cd09",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 947.7857437133789,
+        "y": 384.75003084540367,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "33898a4d.eb2f56",
+        "type": "other",
+        "name": "outcome oam_vipr_protected_network",
+        "xml": "<outcome value='oam_vipr_protected_network'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3153.376640319824,
+        "y": 1161.324143409729,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "858baa62.b657b8"
+            ]
+        ]
+    },
+    {
+        "id": "5a2b9c63.71261c",
+        "type": "other",
+        "name": "outcome network_without_route_tags_naming_default",
+        "xml": "<outcome value='network_without_route_tags_naming_default'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3200.043312072754,
+        "y": 1197.9908113479614,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "858baa62.b657b8"
+            ]
+        ]
+    },
+    {
+        "id": "403cc823.dd2ee8",
+        "type": "other",
+        "name": "outcome sriov_provider_network",
+        "xml": "<outcome value='sriov_provider_network'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3132.710159301758,
+        "y": 1412.657508701086,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "9518558.1f4d3a8"
+            ]
+        ]
+    },
+    {
+        "id": "375f6c6a.29e584",
+        "type": "other",
+        "name": "outcome oam_atm_u_landing_network",
+        "xml": "<outcome value='oam_atm_u_landing_network'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3146.709831237793,
+        "y": 1239.657470703125,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "9518558.1f4d3a8"
+            ]
+        ]
+    },
+    {
+        "id": "839be5c.165d718",
+        "type": "other",
+        "name": "outcome oam_atm_p_landing_network",
+        "xml": "<outcome value='oam_atm_p_landing_network'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3145.0430068969727,
+        "y": 1274.6574726104736,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "9518558.1f4d3a8"
+            ]
+        ]
+    },
+    {
+        "id": "9b384d04.bc9c48",
+        "type": "other",
+        "name": "outcome oam_aim_landing_network",
+        "xml": "<outcome value='oam_aim_landing_network'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3138.3768463134766,
+        "y": 1306.3241415023804,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "9518558.1f4d3a8"
+            ]
+        ]
+    },
+    {
+        "id": "617ccf55.6ce468",
+        "type": "other",
+        "name": "outcome network_with_route_tags_naming_default",
+        "xml": "<outcome value='network_with_route_tags_naming_default'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3183.3769302368164,
+        "y": 1339.6574659347534,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "9518558.1f4d3a8"
+            ]
+        ]
+    },
+    {
+        "id": "48c9f390.1cccac",
+        "type": "comment",
+        "name": "Changelog",
+        "info": "1707: Change vpn binding from field to table selection\n1710: Add ipv6 vipr flows\n1806: Separate out to automated vs preload vs vlan tagging",
+        "comments": "",
+        "x": 321.8571472167969,
+        "y": 90.00000667572021,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "d3ee5726.8245f",
+        "type": "execute",
+        "name": "execute Properties - pull properties file",
+        "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": 586.571533203125,
+        "y": 254.71820068359375,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "533d3c33.ff026c",
+        "type": "comment",
+        "name": "Pre-1806 naming logic",
+        "info": "",
+        "comments": "",
+        "x": 2664.0712890625,
+        "y": 1200.8254249989986,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "b9c386f.7817bf8",
+        "type": "call",
+        "name": "call naming-policy-generate-name",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3029.1788177490234,
+        "y": 707.0039323270321,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d18311c4.4cd748",
+        "type": "set",
+        "name": "set parameters for generate-unique-name",
+        "xml": "<set>\n<parameter name='naming-policy-generate-name-input.policy-instance-name' value='`$network-model.naming-policy`' />\n<parameter name='naming-policy-generate-name-input.context-id' value='`$tmp.l3-network.network-id`' />\n<parameter name='naming-policy-generate-name-input.naming-type' value='NETWORK' />\n<parameter name='naming-policy-generate-name-input.action' value='ASSIGN' />\n<parameter name='naming-policy-generate-name-input.query-parameter' value='`$network-model.customization-uuid`' />\n\n\n",
+        "comments": "",
+        "x": 3051.9291076660156,
+        "y": 669.004013389349,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "b0171571.8c955",
+        "type": "set",
+        "name": "set network name",
+        "xml": "<set>\n<parameter name='tmp.network-instance-name' value='`$naming-policy-generate-name-output.network-name`' />\n<parameter name='tmp.l3-network.network-name' value='`$naming-policy-generate-name-output.network-name`' />\n\n\n\n",
+        "comments": "",
+        "x": 2978.428871154785,
+        "y": 742.0039304196835,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "b8fd9c4b.8d8a1",
+        "type": "call",
+        "name": "call network-topology-operation-assign-from-preload",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign-from-preload' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2283.2148056030273,
+        "y": 765.4324515759945,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cc60b7f8.cae668",
+        "type": "call",
+        "name": "call network-topology-operation-assign-automated",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign-automated' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3082.341377258301,
+        "y": 779.5833495557308,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3c332c37.f4b7bc",
+        "type": "set",
+        "name": "set tmp.l3-network.network-id",
+        "xml": "<set>\n<parameter name='tmp.l3-network.network-id' value='`$tmp.return.generate-l3network-network-id.uuid`' />\n<parameter name='network-topology-operation-input.network-information.network-id' value='`$tmp.return.generate-l3network-network-id.uuid`' />",
+        "comments": "",
+        "x": 526.7461700439453,
+        "y": 587.2500842511654,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "6b08e57f.4948f4",
+        "type": "switchNode",
+        "name": "switch network-request-information.network-id",
+        "xml": "<switch test='`$network-topology-operation-input.network-information.network-id`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 576.2500610351562,
+        "y": 541.0039370954037,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "4c000f91.25bd98",
+                "a2712860.12272"
+            ]
+        ]
+    },
+    {
+        "id": "4c000f91.25bd98",
+        "type": "other",
+        "name": "outcome NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 905.25,
+        "y": 504.0039218366146,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "7df139c4.75d918"
+            ]
+        ]
+    },
+    {
+        "id": "a2712860.12272",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 885.8794059753418,
+        "y": 543.3280005455017,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "8d53d1f0.18ba8"
+            ]
+        ]
+    },
+    {
+        "id": "8d53d1f0.18ba8",
+        "type": "set",
+        "name": "set network-id",
+        "xml": "<set>\n<parameter name='tmp.return.generate-l3network-network-id.uuid' value='`$network-topology-operation-input.network-information.network-id`' />\n\n\n\n",
+        "comments": "",
+        "x": 1108.25,
+        "y": 542.7540283203125,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "1c431b71.bddac5",
+        "type": "comment",
+        "name": "if network-instance-group-id populated, follow vlan tagging flow",
+        "info": "",
+        "comments": "",
+        "x": 631.1445465087891,
+        "y": 687.2913134992123,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "96dfe9d4.8e2428",
+        "type": "switchNode",
+        "name": "switch network-request-information.network-instance-group-id",
+        "xml": "<switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 629.8627166748047,
+        "y": 722.1563418805599,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "b127ebea.ab0398",
+                "12e816ea.a7d6a1"
+            ]
+        ]
+    },
+    {
+        "id": "b127ebea.ab0398",
+        "type": "other",
+        "name": "outcome NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1012.5732421875,
+        "y": 720.148541778326,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "ff1e099e.f8c22"
+            ]
+        ]
+    },
+    {
+        "id": "12e816ea.a7d6a1",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 993.2026481628418,
+        "y": 759.4726204872131,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "954c1f71.93d"
+            ]
+        ]
+    },
+    {
+        "id": "954c1f71.93d",
+        "type": "call",
+        "name": "call network-topology-operation-assign-vlantagging-instancegroup",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign-vlantagging-instancegroup' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1394.0737915039062,
+        "y": 761.2916396558285,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "352e9d1e.614ada",
+        "type": "comment",
+        "name": "if network-name not populated, generate and call automated flow",
+        "info": "",
+        "comments": "",
+        "x": 1941.1310729980469,
+        "y": 832.3133433759212,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    },
+    {
+        "id": "66347a0f.b006fc",
+        "type": "switchNode",
+        "name": "cloud-owner passed in input?",
+        "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.cloud-owner != ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 618,
+        "y": 313,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "606ae78e.f9ea48"
+            ]
+        ]
+    },
+    {
+        "id": "606ae78e.f9ea48",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 915,
+        "y": 313,
+        "z": "81b8b420.9b1d88",
+        "wires": [
+            [
+                "1e09389.8f46447"
+            ]
+        ]
+    },
+    {
+        "id": "1e09389.8f46447",
+        "type": "set",
+        "name": "set prop.cloud-region.cloud-owner to input cloud-owner",
+        "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$network-topology-operation-input.network-request-input.cloud-owner`' />\n",
+        "comments": "",
+        "x": 1322,
+        "y": 314,
+        "z": "81b8b420.9b1d88",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_pnf-topology-operation-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_pnf-topology-operation-assign.json
index 2e3a1c2e..effe51e6 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_pnf-topology-operation-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_pnf-topology-operation-assign.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "d3b3a7ea.d04d08",
+        "id": "ee243452.aa33a8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 133.3333282470703,
-        "y": 79.63588523864746,
-        "z": "6dfe2c1.a0003d4",
+        "x": 134,
+        "y": 98,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "46bb10f7.5c3fb"
+                "5810e1f9.1768b"
             ]
         ]
     },
     {
-        "id": "46bb10f7.5c3fb",
+        "id": "5810e1f9.1768b",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,403 +22,447 @@
         "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": 248.61903381347656,
-        "y": 121.54066467285156,
-        "z": "6dfe2c1.a0003d4",
+        "x": 249.28570556640625,
+        "y": 139.9047794342041,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "11b944cd.c96c5b"
+                "70e23e6c.961c38"
             ]
         ]
     },
     {
-        "id": "11b944cd.c96c5b",
+        "id": "70e23e6c.961c38",
         "type": "method",
         "name": "method pnf-topology-operation-assign",
         "xml": "<method rpc='pnf-topology-operation-assign' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 243.92864990234375,
-        "y": 165.55255317687988,
-        "z": "6dfe2c1.a0003d4",
+        "x": 244.59532165527344,
+        "y": 183.91666793823242,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "ce6b8a58.b8d3e8"
+                "c77449b3.048b78"
             ]
         ]
     },
     {
-        "id": "7e923496.314c4c",
+        "id": "14cec61f.9eab5a",
         "type": "comment",
         "name": "pnf-topology-operation-assign",
         "info": "",
         "comments": "",
-        "x": 535.5948638916016,
-        "y": 41.38888931274414,
-        "z": "6dfe2c1.a0003d4",
+        "x": 536.2615356445312,
+        "y": 59.75300407409668,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "2c8dd484.c334bc",
+        "id": "da472ec3.e5ccd8",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$pnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 627.2143096923828,
-        "y": 309.0287160873413,
-        "z": "6dfe2c1.a0003d4",
+        "x": 627.8809814453125,
+        "y": 327.39283084869385,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "e97259d0.1af158",
-                "413f5d48.571fc4"
+                "b27a37af.b36718",
+                "f6fae337.330588"
             ]
         ]
     },
     {
-        "id": "e97259d0.1af158",
+        "id": "b27a37af.b36718",
         "type": "outcome",
         "name": "CreatePnfInstance",
         "xml": "<outcome value='CreatePnfInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 880.9286041259766,
-        "y": 286.1715974807739,
-        "z": "6dfe2c1.a0003d4",
+        "x": 881.5952758789062,
+        "y": 304.53571224212646,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "f6bc9eb4.5cc37"
+                "5bfce726.0e0808"
             ]
         ]
     },
     {
-        "id": "413f5d48.571fc4",
+        "id": "f6fae337.330588",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 842.9285697937012,
-        "y": 331.88592529296875,
-        "z": "6dfe2c1.a0003d4",
+        "x": 843.5952415466309,
+        "y": 350.2500400543213,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "514d78e9.baa838"
+                "e0cd414.414b64"
             ]
         ]
     },
     {
-        "id": "f6bc9eb4.5cc37",
+        "id": "5bfce726.0e0808",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1065.785732269287,
-        "y": 286.17162704467773,
-        "z": "6dfe2c1.a0003d4",
+        "x": 1066.4524040222168,
+        "y": 304.5357418060303,
+        "z": "19228309.79f23d",
         "wires": [
             []
         ]
     },
     {
-        "id": "514d78e9.baa838",
+        "id": "e0cd414.414b64",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"If svc-action is 'assign' then request-action must be 'CreatePnfInstance'\" />\n",
         "comments": "",
-        "x": 1082.9285774230957,
-        "y": 331.8858833312988,
-        "z": "6dfe2c1.a0003d4",
+        "x": 1083.5952491760254,
+        "y": 350.24999809265137,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "4388ff9d.ce7d6",
+        "id": "19b08e1.3415872",
         "type": "get-resource",
         "name": "get-resource VF_MODEL",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_MODEL WHERE customization_uuid = $pnf-topology-operation-input.pnf-details.onap-model-information.model-customization-uuid'\n  pfx='db.vf-model'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 639.5476150512695,
-        "y": 400.17158603668213,
-        "z": "6dfe2c1.a0003d4",
+        "x": 640.2142868041992,
+        "y": 418.53570079803467,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "512ab575.220ccc",
-                "3a1614d2.3eacec"
+                "982998d2.b1104",
+                "55fc7df0.63822c"
             ]
         ]
     },
     {
-        "id": "6dc29919.0f2208",
+        "id": "ec81ba8b.5b2c9",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No model found for VF customization UUID ' + $pnf-topology-operation-input.pnf-details.onap-model-information.model-customization-uuid`\" />\n",
         "comments": "",
-        "x": 1080.9760932922363,
-        "y": 423.60007190704346,
-        "z": "6dfe2c1.a0003d4",
+        "x": 1081.642765045166,
+        "y": 441.964186668396,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "512ab575.220ccc",
+        "id": "982998d2.b1104",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 840.3333129882812,
-        "y": 380.55242347717285,
-        "z": "6dfe2c1.a0003d4",
+        "x": 840.9999847412109,
+        "y": 398.9165382385254,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "d5d2d14c.f67aa"
+                "6a64650.0d6f39c"
             ]
         ]
     },
     {
-        "id": "3a1614d2.3eacec",
+        "id": "55fc7df0.63822c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 848.9047431945801,
-        "y": 424.83813667297363,
-        "z": "6dfe2c1.a0003d4",
+        "x": 849.5714149475098,
+        "y": 443.2022514343262,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "6dc29919.0f2208"
+                "ec81ba8b.5b2c9"
             ]
         ]
     },
     {
-        "id": "d5d2d14c.f67aa",
+        "id": "6a64650.0d6f39c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODEL table\" />\n",
         "comments": "",
-        "x": 1080.333293914795,
-        "y": 378.695330619812,
-        "z": "6dfe2c1.a0003d4",
+        "x": 1080.9999656677246,
+        "y": 397.05944538116455,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "95465986.653a28",
+        "id": "a75821b1.edfb58",
         "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": 635.1190948486328,
-        "y": 182.314471244812,
-        "z": "6dfe2c1.a0003d4",
+        "x": 637.7857666015625,
+        "y": 117.6785888671875,
+        "z": "19228309.79f23d",
         "wires": [
             []
         ]
     },
     {
-        "id": "ce6b8a58.b8d3e8",
+        "id": "c77449b3.048b78",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 353.41272735595703,
-        "y": 309.5079708099365,
-        "z": "6dfe2c1.a0003d4",
+        "x": 354.0793991088867,
+        "y": 327.87208557128906,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "2c8dd484.c334bc",
-                "4388ff9d.ce7d6",
-                "95465986.653a28",
-                "6cdfcbff.124fe4",
-                "4f7127f2.481f58"
+                "da472ec3.e5ccd8",
+                "19b08e1.3415872",
+                "a75821b1.edfb58",
+                "780d7aca.b60934",
+                "71d0891.189e778",
+                "f6ad14ca.084b8"
             ]
         ]
     },
     {
-        "id": "6cdfcbff.124fe4",
+        "id": "780d7aca.b60934",
         "type": "switchNode",
         "name": "switch input cloud-owner",
         "xml": "<switch test='`$pnf-topology-operation-input.pnf-request-input.cloud-owner`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 635.8333511352539,
-        "y": 237.55254077911377,
-        "z": "6dfe2c1.a0003d4",
+        "x": 636.5000228881836,
+        "y": 255.9166555404663,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "fbe3ca5c.624b78",
-                "12f9e0f5.d15d1f"
+                "c9bdd3dc.faf7b",
+                "6e4e01ec.cdd3b8"
             ]
         ]
     },
     {
-        "id": "fbe3ca5c.624b78",
+        "id": "c9bdd3dc.faf7b",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 819.1667251586914,
-        "y": 207.55252933502197,
-        "z": "6dfe2c1.a0003d4",
+        "x": 819.8333969116211,
+        "y": 225.9166440963745,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "c50e0e6c.80923"
+                "f08a07.1ccc0df8"
             ]
         ]
     },
     {
-        "id": "12f9e0f5.d15d1f",
+        "id": "6e4e01ec.cdd3b8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 818.9286308288574,
-        "y": 248.5050230026245,
-        "z": "6dfe2c1.a0003d4",
+        "x": 819.5953025817871,
+        "y": 266.86913776397705,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "6843bdbc.1eb674"
+                "9f00eed0.781e1"
             ]
         ]
     },
     {
-        "id": "c50e0e6c.80923",
+        "id": "f08a07.1ccc0df8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 954.1666793823242,
-        "y": 205.88586902618408,
-        "z": "6dfe2c1.a0003d4",
+        "x": 954.8333511352539,
+        "y": 224.24998378753662,
+        "z": "19228309.79f23d",
         "wires": [
             []
         ]
     },
     {
-        "id": "6843bdbc.1eb674",
+        "id": "9f00eed0.781e1",
         "type": "set",
         "name": "set prop.cloud-region.cloud-owner",
         "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$pnf-topology-operation-input.pnf-request-input.cloud-owner`' />\n",
         "comments": "",
-        "x": 1035.8333358764648,
-        "y": 247.55255031585693,
-        "z": "6dfe2c1.a0003d4",
+        "x": 1036.5000076293945,
+        "y": 265.9166650772095,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "940a3bec.b79db8",
+        "id": "9a07bcfe.297ad8",
         "type": "call",
         "name": "call self-serve-pnf-assign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-pnf-assign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 848.5553359985352,
-        "y": 596.4128832817078,
-        "z": "6dfe2c1.a0003d4",
+        "x": 849.2220077514648,
+        "y": 614.7769980430603,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "ee11637d.64cc5"
+                "1b53503a.a14958"
             ]
         ]
     },
     {
-        "id": "22ef4f33.3ca9c",
+        "id": "d15a667b.1812a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Failed to create self-serve assignment for pnf with pnf-id=' + $pnf-topology-operation-input.pnf-details.pnf-id + ' with error: ' + $error-message`\" />\n",
         "comments": "",
-        "x": 1232.6267127990723,
-        "y": 596.4128336906433,
-        "z": "6dfe2c1.a0003d4",
+        "x": 1233.293384552002,
+        "y": 614.7769484519958,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "d7499e88.a3c54",
+        "id": "b09b2b8a.09a48",
         "type": "comment",
         "name": "SELF-SERVE FORK",
         "info": "",
         "comments": "",
-        "x": 758.174690246582,
-        "y": 547.6151220798492,
-        "z": "6dfe2c1.a0003d4",
+        "x": 758.8413619995117,
+        "y": 565.9792368412018,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "ee11637d.64cc5",
+        "id": "1b53503a.a14958",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1053.8529167175293,
-        "y": 595.9009146690369,
-        "z": "6dfe2c1.a0003d4",
+        "x": 1054.519588470459,
+        "y": 614.2650294303894,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "22ef4f33.3ca9c"
+                "d15a667b.1812a"
             ]
         ]
     },
     {
-        "id": "8085154e.65e6a8",
+        "id": "1f34dbbd.dc61f4",
         "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": 820.9642715454102,
-        "y": 750.5674510002136,
-        "z": "6dfe2c1.a0003d4",
+        "x": 821.6309432983398,
+        "y": 768.9315657615662,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "4326ce02.3a255",
+        "id": "1f5752f6.bdefd5",
         "type": "set",
         "name": "set pnf-level-oper-status to PendingCreate",
         "xml": "<set>\n<parameter name='service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-level-oper-status.order-status' value='PendingCreate' />\n<parameter name='service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-level-oper-status.last-rpc-action' value='`$pnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-level-oper-status.last-action' value='`$pnf-topology-operation-input.request-information.request-action`' />",
         "comments": "",
-        "x": 959.0277328491211,
-        "y": 649.15491771698,
-        "z": "6dfe2c1.a0003d4",
+        "x": 959.6944046020508,
+        "y": 667.5190324783325,
+        "z": "19228309.79f23d",
         "wires": []
     },
     {
-        "id": "b05b3263.f3526",
+        "id": "e1473b9e.65e3f8",
         "type": "execute",
         "name": "printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-pnf-assign.log' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 810.8689994812012,
-        "y": 698.3447003364563,
-        "z": "6dfe2c1.a0003d4",
+        "x": 811.5356712341309,
+        "y": 716.7088150978088,
+        "z": "19228309.79f23d",
         "wires": [
             []
         ]
     },
     {
-        "id": "4f7127f2.481f58",
+        "id": "71d0891.189e778",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 599.535530090332,
-        "y": 667.8531589508057,
-        "z": "6dfe2c1.a0003d4",
+        "x": 600.2022018432617,
+        "y": 686.2172737121582,
+        "z": "19228309.79f23d",
         "wires": [
             [
-                "940a3bec.b79db8",
-                "8085154e.65e6a8",
-                "b05b3263.f3526"
+                "9a07bcfe.297ad8",
+                "1f34dbbd.dc61f4",
+                "e1473b9e.65e3f8"
             ]
         ]
+    },
+    {
+        "id": "f6ad14ca.084b8",
+        "type": "switchNode",
+        "name": "Is cloud-owner passed in input?",
+        "xml": "<switch test=\"`$pnf-topology-operation-input.pnf-request-input.cloud-owner != ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 723,
+        "y": 172,
+        "z": "19228309.79f23d",
+        "wires": [
+            [
+                "98dded3d.86af78"
+            ]
+        ]
+    },
+    {
+        "id": "98dded3d.86af78",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1020,
+        "y": 172,
+        "z": "19228309.79f23d",
+        "wires": [
+            [
+                "fdb56d64.3dcfa"
+            ]
+        ]
+    },
+    {
+        "id": "fdb56d64.3dcfa",
+        "type": "set",
+        "name": "set prop.cloud-region.cloud-owner to input cloud-owner",
+        "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$pnf-topology-operation-input.pnf-request-input.cloud-owner`' />\n",
+        "comments": "",
+        "x": 1391,
+        "y": 168,
+        "z": "19228309.79f23d",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-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
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.json
index 9411b85e..d10c6bea 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "d899f0c1.6bd748",
+        "id": "56f6ceeb.2f9068",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 140,
-        "y": 125.02430057525635,
-        "z": "9167bcd1.0dd69",
+        "x": 114,
+        "y": 139,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "aaa14e6d.86dda8"
+                "1c7e6bd.909eb14"
             ]
         ]
     },
     {
-        "id": "aaa14e6d.86dda8",
+        "id": "1c7e6bd.909eb14",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,6507 +22,6551 @@
         "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": 253.85713577270508,
-        "y": 164.8338384628296,
-        "z": "9167bcd1.0dd69",
+        "x": 227.85713577270508,
+        "y": 178.80953788757324,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "769bc2ea.c9d65c"
+                "394269ca.2493d6"
             ]
         ]
     },
     {
-        "id": "769bc2ea.c9d65c",
+        "id": "394269ca.2493d6",
         "type": "method",
         "name": "method vf-module-topology-operation-assign-sync",
         "xml": "<method rpc='vf-module-topology-operation-assign-sync' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 253.42862701416016,
-        "y": 205.02430057525635,
-        "z": "9167bcd1.0dd69",
+        "x": 227.42862701416016,
+        "y": 219,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "b1406c81.923cc"
+                "f31d4136.dbad18"
             ]
         ]
     },
     {
-        "id": "a460891c.0d1ba",
+        "id": "8b850552.873b78",
         "type": "comment",
         "name": "vf-module-topology-operation-assign-sync",
         "info": "",
         "comments": "",
-        "x": 398.32110595703125,
-        "y": 51,
-        "z": "9167bcd1.0dd69",
+        "x": 372.32110595703125,
+        "y": 64.97569942474365,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "6fdfcdf3.2ecd44",
+        "id": "76da2351.1e772c",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 545.1905097961426,
-        "y": 380.548122882843,
-        "z": "9167bcd1.0dd69",
+        "x": 519.1905097961426,
+        "y": 394.52382230758667,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "5fb65925.ac9",
-                "f896fbfa.e4db38"
+                "4f2046cb.97cad",
+                "6f4baeb7.64b6a"
             ]
         ]
     },
     {
-        "id": "5fb65925.ac9",
+        "id": "4f2046cb.97cad",
         "type": "outcome",
         "name": "CreateVfModuleInstance",
         "xml": "<outcome value='CreateVfModuleInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 807.2381248474121,
-        "y": 357.6910090446472,
-        "z": "9167bcd1.0dd69",
+        "x": 781.2381248474121,
+        "y": 371.66670846939087,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a252c97a.96867"
+                "bc41f28e.925478"
             ]
         ]
     },
     {
-        "id": "f896fbfa.e4db38",
+        "id": "6f4baeb7.64b6a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 750.9047698974609,
-        "y": 403.07199811935425,
-        "z": "9167bcd1.0dd69",
+        "x": 724.9047698974609,
+        "y": 417.0476975440979,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "acc70f07.86c54"
+                "e7106bf3.cd4de"
             ]
         ]
     },
     {
-        "id": "a252c97a.96867",
+        "id": "bc41f28e.925478",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 997.0952892303467,
-        "y": 357.69104051589966,
-        "z": "9167bcd1.0dd69",
+        "x": 971.0952892303467,
+        "y": 371.6667399406433,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "acc70f07.86c54",
+        "id": "e7106bf3.cd4de",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"If svc-action is 'assign' then request-action must be 'CreateVfModuleInstance'\" />\n",
         "comments": "",
-        "x": 1015.9047775268555,
-        "y": 403.40531063079834,
-        "z": "9167bcd1.0dd69",
+        "x": 989.9047775268555,
+        "y": 417.381010055542,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "c5b83baf.fcb2b8",
+        "id": "729b2317.d41764",
         "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": 592.5237770080566,
-        "y": 471.6910729408264,
-        "z": "9167bcd1.0dd69",
+        "x": 566.5237770080566,
+        "y": 485.66677236557007,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "2d0c3ac2.95728e",
-                "71d0e645.eeba9"
+                "987fd6a8.61bdd8",
+                "20959f4f.3eb5d8"
             ]
         ]
     },
     {
-        "id": "986ddeb5.121a08",
+        "id": "85b6ba66.001968",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No model found for VF module customization UUID ' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`\" />\n",
         "comments": "",
-        "x": 1033.9521980285645,
-        "y": 496.1195454597473,
-        "z": "9167bcd1.0dd69",
+        "x": 1007.9521980285645,
+        "y": 510.09524488449097,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "2d0c3ac2.95728e",
+        "id": "987fd6a8.61bdd8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 858.3094673156738,
-        "y": 452.0719037055969,
-        "z": "9167bcd1.0dd69",
+        "x": 832.3094673156738,
+        "y": 466.0476031303406,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a604e12e.a8eed8"
+                "b104acae.235de"
             ]
         ]
     },
     {
-        "id": "71d0e645.eeba9",
+        "id": "20959f4f.3eb5d8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 866.8808975219727,
-        "y": 496.3576169013977,
-        "z": "9167bcd1.0dd69",
+        "x": 840.8808975219727,
+        "y": 510.33331632614136,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "986ddeb5.121a08"
+                "85b6ba66.001968"
             ]
         ]
     },
     {
-        "id": "a604e12e.a8eed8",
+        "id": "b104acae.235de",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VF_MODULE_MODEL table\" />\n",
         "comments": "",
-        "x": 1033.309398651123,
-        "y": 451.21480417251587,
-        "z": "9167bcd1.0dd69",
+        "x": 1007.309398651123,
+        "y": 465.1905035972595,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "58f29161.867a9",
+        "id": "ebe8b394.b57a1",
         "type": "switchNode",
         "name": "switch service-data.vnfs.vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 587.6190414428711,
-        "y": 680.2624082565308,
-        "z": "9167bcd1.0dd69",
+        "x": 561.6190414428711,
+        "y": 694.2381076812744,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4d071976.5050c",
-                "c3315f66.868788"
+                "cc1ff8d8.e54a",
+                "25f65cf0.a13c74"
             ]
         ]
     },
     {
-        "id": "4d071976.5050c",
+        "id": "cc1ff8d8.e54a",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 828.3333129882812,
-        "y": 657.4051485061646,
-        "z": "9167bcd1.0dd69",
+        "x": 802.3333129882812,
+        "y": 671.3808479309082,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "550ea296.96c2cc"
+                "e620f2a.d32df1"
             ]
         ]
     },
     {
-        "id": "c3315f66.868788",
+        "id": "25f65cf0.a13c74",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 828.0951538085938,
-        "y": 698.3576669692993,
-        "z": "9167bcd1.0dd69",
+        "x": 802.0951538085938,
+        "y": 712.333366394043,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "1218b6d8.cadda9"
+                "f839c9ee.7363c8"
             ]
         ]
     },
     {
-        "id": "43e1e208.1c9204",
+        "id": "cdb40a91.68e35",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 166.19043731689453,
-        "y": 3161.92930662632,
-        "z": "9167bcd1.0dd69",
-        "wires": [
-            [
-                "badfdbc9.022e2",
-                "1265e597.326aea",
-                "d904000a.ab2f38",
-                "b9dd9667.33695",
-                "b4b281fa.e85d5",
-                "68dfa5ea.e5019c",
-                "a1e477f0.0b584",
-                "fa229a92.ce9da8",
-                "43deefc2.c1bae8",
-                "2312018e.28175e",
-                "bab10e90.55c028",
-                "5554f045.52dd38",
-                "dd4f4eeb.8d24e",
-                "7af69df8.0374dc",
-                "453e667a.37bcb",
-                "5245ba39.530f94",
-                "fee3a1a8.2d1ad8",
-                "a61a195a.95b1e8",
-                "7314ccc5.2134a4",
-                "ad9d0c92.4b3468",
-                "9535b7df.620268",
-                "cf140a5d.20d0a",
-                "c8b952a9.c78298",
-                "e5e2fde7.2191d",
-                "8534c826.13da18",
-                "75790bd1.e8defc",
-                "c898fd55.fa0688",
-                "f1de476.813b738",
-                "cc91d00d.836b9",
-                "709b1630.8dd8b8",
-                "6f90d0a3.4f5888"
-            ]
-        ]
-    },
-    {
-        "id": "550ea296.96c2cc",
+        "x": 140.19043731689453,
+        "y": 3175.9050060510635,
+        "z": "f3a72141.88f688",
+        "wires": [
+            [
+                "22e5e45e.411d54",
+                "aab26fce.f8257",
+                "d90a1287.58a548",
+                "beda92ef.691fd8",
+                "68d89a29.07cf94",
+                "2568cf35.f17b4",
+                "2930947a.5fb83c",
+                "50b9a90a.fc82d",
+                "23cc94b1.59977c",
+                "d4c27c38.cb815",
+                "83666c5c.749a58",
+                "9931e32c.9b539",
+                "32580d0f.1a87f2",
+                "a3e2c0ba.ee212",
+                "be655d76.fadfe8",
+                "a5b2add1.64cc98",
+                "3a0e8e07.615d92",
+                "d3f07b7.dd74b88",
+                "8005f008.78f808",
+                "e1af8d51.2ba338",
+                "8fd60795.26d88",
+                "a146e36e.bc5ed",
+                "cda23fd1.47e1a8",
+                "4f9ff09e.f47468",
+                "a248e487.7d841",
+                "bf14b0a9.d3e2d",
+                "56373ee9.f19b2",
+                "61b10d9d.cb5ec4",
+                "6758cc3d.63107c",
+                "758d4da0.c2995c",
+                "ee77fdb8.d87748"
+            ]
+        ]
+    },
+    {
+        "id": "e620f2a.d32df1",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"There are no VNFs defined in MD-SAL\" />\n",
         "comments": "",
-        "x": 994.999927520752,
-        "y": 656.6909036636353,
-        "z": "9167bcd1.0dd69",
+        "x": 968.999927520752,
+        "y": 670.6666030883789,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "1218b6d8.cadda9",
+        "id": "f839c9ee.7363c8",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 990.3332977294922,
-        "y": 698.0242853164673,
-        "z": "9167bcd1.0dd69",
+        "x": 964.3332977294922,
+        "y": 711.9999847412109,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "9a0906d8.7ab488"
+                "64c8c312.1061f4"
             ]
         ]
     },
     {
-        "id": "9a0906d8.7ab488",
+        "id": "64c8c312.1061f4",
         "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": 1241.6665954589844,
-        "y": 697.6910133361816,
-        "z": "9167bcd1.0dd69",
+        "x": 1215.6665954589844,
+        "y": 711.6667127609253,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "34a2a2c8.9ed3d6"
+                "b6bafc8a.6df098"
             ]
         ]
     },
     {
-        "id": "34a2a2c8.9ed3d6",
+        "id": "b6bafc8a.6df098",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1471.6666069030762,
-        "y": 697.0243263244629,
-        "z": "9167bcd1.0dd69",
+        "x": 1445.6666069030762,
+        "y": 711.0000257492065,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "38dbdaf8.de3b36"
+                "eac623e8.5e60c8"
             ]
         ]
     },
     {
-        "id": "169ef671.ac8942",
+        "id": "c81a4e60.7d0e28",
         "type": "set",
         "name": "set vnf-index to -1",
         "xml": "<set>\n<parameter name='vnf-index' value='-1' />\n",
         "comments": "",
-        "x": 536.6666641235352,
-        "y": 611.6909074783325,
-        "z": "9167bcd1.0dd69",
+        "x": 510.66666412353516,
+        "y": 625.6666069030762,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "8699ebe3.da5b5",
+        "id": "5d5edd84.2d5f2c",
         "type": "set",
         "name": "set vnf-index to idx",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1793.3332443237305,
-        "y": 668.024284362793,
-        "z": "9167bcd1.0dd69",
+        "x": 1767.3332443237305,
+        "y": 681.9999837875366,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "3a7d1430.c71c54",
+        "id": "a8e5db24.a73738",
         "type": "switchNode",
         "name": "switch vnf-index",
         "xml": "<switch test='`$vnf-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 526.6666717529297,
-        "y": 748.3576040267944,
-        "z": "9167bcd1.0dd69",
+        "x": 500.6666717529297,
+        "y": 762.3333034515381,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "d200952e.82a"
+                "87ecd247.e52678"
             ]
         ]
     },
     {
-        "id": "d200952e.82a",
+        "id": "87ecd247.e52678",
         "type": "outcome",
         "name": "-1",
         "xml": "<outcome value='-1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 705.000057220459,
-        "y": 747.6909799575806,
-        "z": "9167bcd1.0dd69",
+        "x": 679.000057220459,
+        "y": 761.6666793823242,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "df336439.6441b8"
+                "4e06f17a.d0856"
             ]
         ]
     },
     {
-        "id": "df336439.6441b8",
+        "id": "4e06f17a.d0856",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unable to find VNF ID ' + $vf-module-topology-operation-input.vnf-information.vnf-id + ' in MD-SAL'`\" />\n",
         "comments": "",
-        "x": 864.9999656677246,
-        "y": 747.0242834091187,
-        "z": "9167bcd1.0dd69",
+        "x": 838.9999656677246,
+        "y": 760.9999828338623,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "badfdbc9.022e2",
+        "id": "22e5e45e.411d54",
         "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": 543.3333930969238,
-        "y": 1378.3578004837036,
-        "z": "9167bcd1.0dd69",
+        "x": 517.3333930969238,
+        "y": 1392.3334999084473,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "46bc83ea.153584",
-                "6bf719df.db171"
+                "14229ff2.8aa128",
+                "b10cf2c1.50f1b"
             ]
         ]
     },
     {
-        "id": "46bc83ea.153584",
+        "id": "14229ff2.8aa128",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 800.7143478393555,
-        "y": 1345.5005741119385,
-        "z": "9167bcd1.0dd69",
+        "x": 774.7143478393555,
+        "y": 1359.4762735366821,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a719934f.fd479"
+                "bfd42049.5713c8"
             ]
         ]
     },
     {
-        "id": "a719934f.fd479",
+        "id": "bfd42049.5713c8",
         "type": "set",
         "name": "set vf-module-index=0",
         "xml": "<set>\n<parameter name='vf-module-index' value='0' />\n",
         "comments": "",
-        "x": 988.3333854675293,
-        "y": 1346.1673488616943,
-        "z": "9167bcd1.0dd69",
+        "x": 962.3333854675293,
+        "y": 1360.143048286438,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "6bf719df.db171",
+        "id": "b10cf2c1.50f1b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 801.1428909301758,
-        "y": 1409.7864322662354,
-        "z": "9167bcd1.0dd69",
+        "x": 775.1428909301758,
+        "y": 1423.762131690979,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "8d56de21.005688"
+                "4d58fe6c.1bc33"
             ]
         ]
     },
     {
-        "id": "7bb74faf.1a3bf",
+        "id": "82cd745.5985888",
         "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": 1186.3334312438965,
-        "y": 1389.97682762146,
-        "z": "9167bcd1.0dd69",
+        "x": 1160.3334312438965,
+        "y": 1403.9525270462036,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "20d53539.793ec2",
+        "id": "f5e9c444.577ec8",
         "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": 1145.428524017334,
-        "y": 1434.072057723999,
-        "z": "9167bcd1.0dd69",
+        "x": 1119.428524017334,
+        "y": 1448.0477571487427,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "c80b7ff5.a77ae8"
+                "77f0e5e3.b50b0c"
             ]
         ]
     },
     {
-        "id": "8d56de21.005688",
+        "id": "4d58fe6c.1bc33",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 937.8571701049805,
-        "y": 1409.7863578796387,
-        "z": "9167bcd1.0dd69",
+        "x": 911.8571701049805,
+        "y": 1423.7620573043823,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "7bb74faf.1a3bf",
-                "20d53539.793ec2"
+                "82cd745.5985888",
+                "f5e9c444.577ec8"
             ]
         ]
     },
     {
-        "id": "c80b7ff5.a77ae8",
+        "id": "77f0e5e3.b50b0c",
         "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": 1649.0476264953613,
-        "y": 1433.6434688568115,
-        "z": "9167bcd1.0dd69",
+        "x": 1623.0476264953613,
+        "y": 1447.6191682815552,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4b42022b.8dc95c"
+                "d89d248c.26c058"
             ]
         ]
     },
     {
-        "id": "4b42022b.8dc95c",
+        "id": "d89d248c.26c058",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2091.666675567627,
-        "y": 1433.2149200439453,
-        "z": "9167bcd1.0dd69",
+        "x": 2065.666675567627,
+        "y": 1447.190619468689,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "b16fc4ad.46cbc"
+                "52475e31.0d704"
             ]
         ]
     },
     {
-        "id": "b16fc4ad.46cbc",
+        "id": "52475e31.0d704",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'VF module id ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id\n       + ' already exists, and status is ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.vf-module-level-oper-status.order-status`\" />\n",
         "comments": "",
-        "x": 2243.5715560913086,
-        "y": 1433.2149066925049,
-        "z": "9167bcd1.0dd69",
+        "x": 2217.5715560913086,
+        "y": 1447.1906061172485,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "6bc28de3.9197f4",
+        "id": "d2a9bffe.3868f",
         "type": "comment",
         "name": "make sure this VF module doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1675.4999732971191,
-        "y": 1388.2709608078003,
-        "z": "9167bcd1.0dd69",
+        "x": 1649.4999732971191,
+        "y": 1402.246660232544,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "1265e597.326aea",
+        "id": "aab26fce.f8257",
         "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": 553.9999732971191,
-        "y": 1489.3576555252075,
-        "z": "9167bcd1.0dd69",
+        "x": 527.9999732971191,
+        "y": 1503.3333549499512,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "d904000a.ab2f38",
+        "id": "d90a1287.58a548",
         "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": 560.4999923706055,
-        "y": 1601.857762336731,
-        "z": "9167bcd1.0dd69",
+        "x": 534.4999923706055,
+        "y": 1615.8334617614746,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "8e6d01f4.b1a178",
+        "id": "52b2c2fd.f94b84",
         "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": 1321.4522514343262,
-        "y": 1761.0956888198853,
-        "z": "9167bcd1.0dd69",
+        "x": 1295.4522514343262,
+        "y": 1775.071388244629,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "b9dd9667.33695",
+        "id": "beda92ef.691fd8",
         "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": 520.4999122619629,
-        "y": 1875.0480289459229,
-        "z": "9167bcd1.0dd69",
+        "x": 494.4999122619629,
+        "y": 1889.0237283706665,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4138e9bf.74e39"
+                "f0c65b19.86b048"
             ]
         ]
     },
     {
-        "id": "4138e9bf.74e39",
+        "id": "f0c65b19.86b048",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 665.7856025695801,
-        "y": 1875.0480976104736,
-        "z": "9167bcd1.0dd69",
+        "x": 639.7856025695801,
+        "y": 1889.0237970352173,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "d3d7ad76.5bcb38"
+                "dcf514cb.dd0c78"
             ]
         ]
     },
     {
-        "id": "d3d7ad76.5bcb38",
+        "id": "dcf514cb.dd0c78",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`\" />\n",
         "comments": "",
-        "x": 812.9284629821777,
-        "y": 1874.6195316314697,
-        "z": "9167bcd1.0dd69",
+        "x": 786.9284629821777,
+        "y": 1888.5952310562134,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "b4b281fa.e85d5",
+        "id": "68d89a29.07cf94",
         "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": 559.3571281433105,
-        "y": 1675.1913003921509,
-        "z": "9167bcd1.0dd69",
+        "x": 533.3571281433105,
+        "y": 1689.1669998168945,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "c2f7e9d3.776b",
-                "1f1578fa.24f767"
+                "70243d82.24a30c",
+                "f46b3e9e.8d6668"
             ]
         ]
     },
     {
-        "id": "1f1578fa.24f767",
+        "id": "f46b3e9e.8d6668",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 773.6033210754395,
-        "y": 1693.3421564102173,
-        "z": "9167bcd1.0dd69",
+        "x": 747.6033210754395,
+        "y": 1707.317855834961,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "657da328.17e1b4"
+                "91f2a24b.1b4878"
             ]
         ]
     },
     {
-        "id": "657da328.17e1b4",
+        "id": "91f2a24b.1b4878",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error retrieving cloud region from AAI\" />\n",
         "comments": "",
-        "x": 948.6032943725586,
-        "y": 1693.3421926498413,
-        "z": "9167bcd1.0dd69",
+        "x": 922.6032943725586,
+        "y": 1707.317892074585,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "c2f7e9d3.776b",
+        "id": "70243d82.24a30c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 782.5319175720215,
-        "y": 1651.6278896331787,
-        "z": "9167bcd1.0dd69",
+        "x": 756.5319175720215,
+        "y": 1665.6035890579224,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "f1454109.93f188"
+                "19c79205.64aec6"
             ]
         ]
     },
     {
-        "id": "f1454109.93f188",
+        "id": "19c79205.64aec6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Cloud region not found in AAI\" />\n",
         "comments": "",
-        "x": 948.8811950683594,
-        "y": 1650.933466911316,
-        "z": "9167bcd1.0dd69",
+        "x": 922.8811950683594,
+        "y": 1664.9091663360596,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "38dbdaf8.de3b36",
+        "id": "eac623e8.5e60c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1620.0000686645508,
-        "y": 695.9440250396729,
-        "z": "9167bcd1.0dd69",
+        "x": 1594.0000686645508,
+        "y": 709.9197244644165,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "8699ebe3.da5b5",
-                "bf6a8dc5.58a6a8"
+                "5d5edd84.2d5f2c",
+                "cf8fe3f6.94c17"
             ]
         ]
     },
     {
-        "id": "bf6a8dc5.58a6a8",
+        "id": "cf8fe3f6.94c17",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 1755.0000343322754,
-        "y": 717.6106109619141,
-        "z": "9167bcd1.0dd69",
+        "x": 1729.0000343322754,
+        "y": 731.5863103866577,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "9382afb.71420d",
+        "id": "f023a409.07cdc8",
         "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": 934.833251953125,
-        "y": 1916.44402217865,
-        "z": "9167bcd1.0dd69",
+        "x": 908.833251953125,
+        "y": 1930.4197216033936,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "68dfa5ea.e5019c",
+        "id": "2568cf35.f17b4",
         "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": 578.6903266906738,
-        "y": 1939.2684659957886,
-        "z": "9167bcd1.0dd69",
+        "x": 552.6903266906738,
+        "y": 1953.2441654205322,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "e49707ca.7af328",
-                "812a586e.32e2f"
+                "2966e953.50db6e",
+                "aa0220f1.1c7508"
             ]
         ]
     },
     {
-        "id": "e49707ca.7af328",
+        "id": "2966e953.50db6e",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 784.3569984436035,
-        "y": 1916.4114294052124,
-        "z": "9167bcd1.0dd69",
+        "x": 758.3569984436035,
+        "y": 1930.387128829956,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "9382afb.71420d"
+                "f023a409.07cdc8"
             ]
         ]
     },
     {
-        "id": "812a586e.32e2f",
+        "id": "aa0220f1.1c7508",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 785.7855949401855,
-        "y": 1960.6970205307007,
-        "z": "9167bcd1.0dd69",
+        "x": 759.7855949401855,
+        "y": 1974.6727199554443,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "b87936af.b7f308"
+                "36a1b2f5.8b27ee"
             ]
         ]
     },
     {
-        "id": "b87936af.b7f308",
+        "id": "36a1b2f5.8b27ee",
         "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": 940.0713310241699,
-        "y": 1960.1255927085876,
-        "z": "9167bcd1.0dd69",
+        "x": 914.0713310241699,
+        "y": 1974.1012921333313,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "118d8bd8.da309c",
+        "id": "f5ac6aff.db1c88",
         "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": 935.7855224609375,
-        "y": 2004.9826984405518,
-        "z": "9167bcd1.0dd69",
+        "x": 909.7855224609375,
+        "y": 2018.9583978652954,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "a1e477f0.0b584",
+        "id": "2930947a.5fb83c",
         "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": 551.3093452453613,
-        "y": 2027.8072032928467,
-        "z": "9167bcd1.0dd69",
+        "x": 525.3093452453613,
+        "y": 2041.7829027175903,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "6305d1b8.c1dda8",
-                "ccca0eb9.c0c188"
+                "b3c44516.bf01f",
+                "c8c7af7f.bda348"
             ]
         ]
     },
     {
-        "id": "6305d1b8.c1dda8",
+        "id": "b3c44516.bf01f",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 785.3093185424805,
-        "y": 2004.950135231018,
-        "z": "9167bcd1.0dd69",
+        "x": 759.3093185424805,
+        "y": 2018.9258346557617,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "118d8bd8.da309c"
+                "f5ac6aff.db1c88"
             ]
         ]
     },
     {
-        "id": "ccca0eb9.c0c188",
+        "id": "c8c7af7f.bda348",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 786.7379150390625,
-        "y": 2049.2357263565063,
-        "z": "9167bcd1.0dd69",
+        "x": 760.7379150390625,
+        "y": 2063.21142578125,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "6b7d1d6.80304e4"
+                "9ee74458.70cbf8"
             ]
         ]
     },
     {
-        "id": "6b7d1d6.80304e4",
+        "id": "9ee74458.70cbf8",
         "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": 941.0236511230469,
-        "y": 2048.6642985343933,
-        "z": "9167bcd1.0dd69",
+        "x": 915.0236511230469,
+        "y": 2062.639997959137,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "e5be2743.5d4508",
+        "id": "137c0b44.9e7df5",
         "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": 932.9284553527832,
-        "y": 2093.8399057388306,
-        "z": "9167bcd1.0dd69",
+        "x": 906.9284553527832,
+        "y": 2107.815605163574,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "fa229a92.ce9da8",
+        "id": "50b9a90a.fc82d",
         "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": 559.4522171020508,
-        "y": 2116.6643505096436,
-        "z": "9167bcd1.0dd69",
+        "x": 533.4522171020508,
+        "y": 2130.640049934387,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "34c4c596.157f8a",
-                "847f3b10.726578"
+                "1eea34fe.5390a3",
+                "6c98f90.4d63188"
             ]
         ]
     },
     {
-        "id": "34c4c596.157f8a",
+        "id": "1eea34fe.5390a3",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 782.4522018432617,
-        "y": 2093.807312965393,
-        "z": "9167bcd1.0dd69",
+        "x": 756.4522018432617,
+        "y": 2107.7830123901367,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "e5be2743.5d4508"
+                "137c0b44.9e7df5"
             ]
         ]
     },
     {
-        "id": "847f3b10.726578",
+        "id": "6c98f90.4d63188",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 783.8807983398438,
-        "y": 2138.0929040908813,
-        "z": "9167bcd1.0dd69",
+        "x": 757.8807983398438,
+        "y": 2152.068603515625,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "9764857e.e18c18"
+                "699947d7.d4326"
             ]
         ]
     },
     {
-        "id": "9764857e.e18c18",
+        "id": "699947d7.d4326",
         "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": 938.1665344238281,
-        "y": 2137.5214762687683,
-        "z": "9167bcd1.0dd69",
+        "x": 912.1665344238281,
+        "y": 2151.497175693512,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "9b53eb1f.f2e23",
+        "id": "a7fd32d7.026dc8",
         "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": 932.9284553527832,
-        "y": 2180.9827280044556,
-        "z": "9167bcd1.0dd69",
+        "x": 906.9284553527832,
+        "y": 2194.958427429199,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "43deefc2.c1bae8",
+        "id": "23cc94b1.59977c",
         "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": 554.4522171020508,
-        "y": 2203.8071727752686,
-        "z": "9167bcd1.0dd69",
+        "x": 528.4522171020508,
+        "y": 2217.782872200012,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "1728f46d.49d514",
-                "c03e99e4.3d5358"
+                "e3af7baa.c4981",
+                "3ab505bb.0b8a4a"
             ]
         ]
     },
     {
-        "id": "1728f46d.49d514",
+        "id": "e3af7baa.c4981",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 782.4522018432617,
-        "y": 2180.950135231018,
-        "z": "9167bcd1.0dd69",
+        "x": 756.4522018432617,
+        "y": 2194.9258346557617,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "9b53eb1f.f2e23"
+                "a7fd32d7.026dc8"
             ]
         ]
     },
     {
-        "id": "c03e99e4.3d5358",
+        "id": "3ab505bb.0b8a4a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 783.8807983398438,
-        "y": 2225.2357263565063,
-        "z": "9167bcd1.0dd69",
+        "x": 757.8807983398438,
+        "y": 2239.21142578125,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "f18842f5.5d912"
+                "2d788c97.c9e78c"
             ]
         ]
     },
     {
-        "id": "f18842f5.5d912",
+        "id": "2d788c97.c9e78c",
         "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": 938.1665344238281,
-        "y": 2224.6642985343933,
-        "z": "9167bcd1.0dd69",
+        "x": 912.1665344238281,
+        "y": 2238.639997959137,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "2312018e.28175e",
+        "id": "d4c27c38.cb815",
         "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": 568.9045524597168,
-        "y": 2276.316162109375,
-        "z": "9167bcd1.0dd69",
+        "x": 542.9045524597168,
+        "y": 2290.2918615341187,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "bab10e90.55c028",
+        "id": "83666c5c.749a58",
         "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": 522.0951995849609,
-        "y": 1545.0393381118774,
-        "z": "9167bcd1.0dd69",
+        "x": 496.09519958496094,
+        "y": 1559.015037536621,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "5554f045.52dd38",
+        "id": "9931e32c.9b539",
         "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": 581.6109428405762,
-        "y": 1763.6979837417603,
-        "z": "9167bcd1.0dd69",
+        "x": 555.6109428405762,
+        "y": 1777.673683166504,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "65c117a1.56bd9"
+                "c780cafa.90153"
             ]
         ]
     },
     {
-        "id": "65c117a1.56bd9",
+        "id": "c780cafa.90153",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$aai.cloud-region.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 829.2894859313965,
-        "y": 1763.4479131698608,
-        "z": "9167bcd1.0dd69",
+        "x": 803.2894859313965,
+        "y": 1777.4236125946045,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "b53c4970.3c3e18"
+                "229e7db2.d0a45a"
             ]
         ]
     },
     {
-        "id": "b53c4970.3c3e18",
+        "id": "229e7db2.d0a45a",
         "type": "outcome",
         "name": "complex",
         "xml": "<outcome value='complex'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 998.7538070678711,
-        "y": 1762.8407354354858,
-        "z": "9167bcd1.0dd69",
+        "x": 972.7538070678711,
+        "y": 1776.8164348602295,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "31580412.a83eb4"
+                "acb46213.14fd98"
             ]
         ]
     },
     {
-        "id": "1e303b58.a257cd",
+        "id": "f7e18dd6.c3ff2",
         "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": 1338.848964691162,
-        "y": 1717.269310951233,
-        "z": "9167bcd1.0dd69",
+        "x": 1312.848964691162,
+        "y": 1731.2450103759766,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "31580412.a83eb4",
+        "id": "acb46213.14fd98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1158.51566696167,
-        "y": 1763.9360990524292,
-        "z": "9167bcd1.0dd69",
+        "x": 1132.51566696167,
+        "y": 1777.9117984771729,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "1e303b58.a257cd",
-                "7debff63.6d9ad",
-                "8e6d01f4.b1a178"
+                "f7e18dd6.c3ff2",
+                "c0d0286c.f8db38",
+                "52b2c2fd.f94b84"
             ]
         ]
     },
     {
-        "id": "7debff63.6d9ad",
+        "id": "c0d0286c.f8db38",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 1308.5156288146973,
-        "y": 1807.269395828247,
-        "z": "9167bcd1.0dd69",
+        "x": 1282.5156288146973,
+        "y": 1821.2450952529907,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "43097907.f1acb8",
+        "id": "8e5c6ccb.163dc",
         "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": 559.0476226806641,
-        "y": 234.5481081008911,
-        "z": "9167bcd1.0dd69",
+        "x": 563.047607421875,
+        "y": 179.5238037109375,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "7314ccc5.2134a4",
+        "id": "8005f008.78f808",
         "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": 464.2622375488281,
-        "y": 7372.904296875,
-        "z": "9167bcd1.0dd69",
+        "x": 438.2622375488281,
+        "y": 7386.879996299744,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "9535b7df.620268",
+        "id": "8fd60795.26d88",
         "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": 403.8335418701172,
-        "y": 7486.522626876831,
-        "z": "9167bcd1.0dd69",
+        "x": 377.8335418701172,
+        "y": 7500.498326301575,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "a61a195a.95b1e8",
+        "id": "d3f07b7.dd74b88",
         "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": 420.11924743652344,
-        "y": 7229.252753674984,
-        "z": "9167bcd1.0dd69",
+        "x": 394.11924743652344,
+        "y": 7243.228453099728,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "fee3a1a8.2d1ad8",
+        "id": "3a0e8e07.615d92",
         "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": 465.00025177001953,
-        "y": 7181.038265645504,
-        "z": "9167bcd1.0dd69",
+        "x": 439.00025177001953,
+        "y": 7195.013965070248,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "ad9d0c92.4b3468",
+        "id": "e1af8d51.2ba338",
         "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": 398.71449279785156,
-        "y": 7438.752443313599,
-        "z": "9167bcd1.0dd69",
+        "x": 372.71449279785156,
+        "y": 7452.728142738342,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "7af69df8.0374dc",
+        "id": "a3e2c0ba.ee212",
         "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": 484.1429786682129,
-        "y": 4383.039919495583,
-        "z": "9167bcd1.0dd69",
+        "x": 458.1429786682129,
+        "y": 4397.015618920326,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "ff28151e.c99568",
-                "84d4e577.067c6"
+                "ab0703e.11e55",
+                "f03457b2.f371"
             ]
         ]
     },
     {
-        "id": "829bb1f4.830f08",
+        "id": "e60106b.28aadf8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No vf-module found in AAI for vf module ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`\" />\n",
         "comments": "",
-        "x": 989.1906547546387,
-        "y": 4417.801350176334,
-        "z": "9167bcd1.0dd69",
+        "x": 963.1906547546387,
+        "y": 4431.777049601078,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "ff28151e.c99568",
+        "id": "ab0703e.11e55",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 659.2146186828613,
-        "y": 4351.420541405678,
-        "z": "9167bcd1.0dd69",
+        "x": 633.2146186828613,
+        "y": 4365.396240830421,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "c0a6d69d.c741f8"
+                "16daf1fb.74eafe"
             ]
         ]
     },
     {
-        "id": "84d4e577.067c6",
+        "id": "f03457b2.f371",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 667.7859916687012,
-        "y": 4420.039631426334,
-        "z": "9167bcd1.0dd69",
+        "x": 641.7859916687012,
+        "y": 4434.015330851078,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "9fa62cc3.2f0038"
+                "cf4b3a59.c0e438"
             ]
         ]
     },
     {
-        "id": "f3f4159f.aadd9",
+        "id": "9f7ab13.96daed",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating vf-module in AAI\" />\n",
         "comments": "",
-        "x": 994.2145729064941,
-        "y": 4369.564098000526,
-        "z": "9167bcd1.0dd69",
+        "x": 968.2145729064941,
+        "y": 4383.53979742527,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "dd4f4eeb.8d24e",
+        "id": "32580d0f.1a87f2",
         "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": 507.80978775024414,
-        "y": 4258.564148545265,
-        "z": "9167bcd1.0dd69",
+        "x": 481.80978775024414,
+        "y": 4272.539847970009,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "98920223.9d1788",
+        "id": "c0d1ee17.6f56f",
         "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": 1277.8335342407227,
-        "y": 5941.192313909531,
-        "z": "9167bcd1.0dd69",
+        "x": 1251.8335342407227,
+        "y": 5955.168013334274,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "3760c1b8.f1b83e",
-                "e7d6710.a6ccc1"
+                "7141904.0c5e2f",
+                "2951128e.c9a6fe"
             ]
         ]
     },
     {
-        "id": "3760c1b8.f1b83e",
+        "id": "7141904.0c5e2f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1497.666877746582,
-        "y": 5912.064058065414,
-        "z": "9167bcd1.0dd69",
+        "x": 1471.666877746582,
+        "y": 5926.039757490158,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "5010a64f.2f3dc"
+                "ba15facd.605eb8"
             ]
         ]
     },
     {
-        "id": "e7d6710.a6ccc1",
+        "id": "2951128e.c9a6fe",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1506.238410949707,
-        "y": 5964.683202505112,
-        "z": "9167bcd1.0dd69",
+        "x": 1480.238410949707,
+        "y": 5978.658901929855,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4bde1cab.c0624c"
+                "18873198.c57256"
             ]
         ]
     },
     {
-        "id": "da526891.6d6948",
+        "id": "a267bbc6.a0ea2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating vf-module relationships in AAI\" />\n",
         "comments": "",
-        "x": 1832.6670112609863,
-        "y": 5931.873954534531,
-        "z": "9167bcd1.0dd69",
+        "x": 1806.6670112609863,
+        "y": 5945.849653959274,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "453e667a.37bcb",
+        "id": "be655d76.fadfe8",
         "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": 457.50025939941406,
-        "y": 5706.5258667469025,
-        "z": "9167bcd1.0dd69",
+        "x": 431.50025939941406,
+        "y": 5720.501566171646,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "9e617b8e.e0967"
+                "9ef55446.fb8ff"
             ]
         ]
     },
     {
-        "id": "b22bc2e1.6fc3a8",
+        "id": "b6dec962.68a7c",
         "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": 854.5002708435059,
-        "y": 6125.192698955536,
-        "z": "9167bcd1.0dd69",
+        "x": 828.5002708435059,
+        "y": 6139.1683983802795,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "e3a4933c.85a3c8"
+                "338a7f2e.d4c058"
             ]
         ]
     },
     {
-        "id": "91bf4a81.2bbfb",
+        "id": "ab32c032.f2d458",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No l3-network found in AAI for network ID '\n      + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-id`\" />\n",
         "comments": "",
-        "x": 1834.5003852844238,
-        "y": 5981.858495473862,
-        "z": "9167bcd1.0dd69",
+        "x": 1808.5003852844238,
+        "y": 5995.834194898605,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "5245ba39.530f94",
+        "id": "a5b2add1.64cc98",
         "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": 431.92879486083984,
-        "y": 7073.571922242641,
-        "z": "9167bcd1.0dd69",
+        "x": 405.92879486083984,
+        "y": 7087.547621667385,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "801c847a.0c2ab8"
+                "e36a023.cd3fb"
             ]
         ]
     },
     {
-        "id": "801c847a.0c2ab8",
+        "id": "e36a023.cd3fb",
         "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": 626.928825378418,
-        "y": 7072.904930055141,
-        "z": "9167bcd1.0dd69",
+        "x": 600.928825378418,
+        "y": 7086.880629479885,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "9048210a.638ad"
+                "434730cd.aa95a"
             ]
         ]
     },
     {
-        "id": "1404a29d.dfd36d",
+        "id": "7d25dc74.1b248c",
         "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": 1018.5955276489258,
-        "y": 7095.57258027792,
-        "z": "9167bcd1.0dd69",
+        "x": 992.5955276489258,
+        "y": 7109.548279702663,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "698fdfc8.5c59c"
+                "aa481da1.69dd38"
             ]
         ]
     },
     {
-        "id": "2fc7ee54.674b22",
+        "id": "5fef6728.83d2",
         "type": "comment",
         "name": "Not a failure",
         "info": "",
         "comments": "",
-        "x": 1538.5954284667969,
-        "y": 7095.572585046291,
-        "z": "9167bcd1.0dd69",
+        "x": 1512.5954284667969,
+        "y": 7109.548284471035,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "698fdfc8.5c59c",
+        "id": "aa481da1.69dd38",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1228.5955123901367,
-        "y": 7095.572730004787,
-        "z": "9167bcd1.0dd69",
+        "x": 1202.5955123901367,
+        "y": 7109.548429429531,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "46d81bad.b0cf7c"
+                "b7f52d22.6f1a6"
             ]
         ]
     },
     {
-        "id": "46d81bad.b0cf7c",
+        "id": "b7f52d22.6f1a6",
         "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": 1371.928955078125,
-        "y": 7095.572567880154,
-        "z": "9167bcd1.0dd69",
+        "x": 1345.928955078125,
+        "y": 7109.548267304897,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "87a12e16.c1c8e",
+        "id": "dd8f2dbc.1424c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1401.9290771484375,
-        "y": 7046.904281556606,
-        "z": "9167bcd1.0dd69",
+        "x": 1375.9290771484375,
+        "y": 7060.87998098135,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "faaa33d2.7941d8"
+                "105602e9.282d2d"
             ]
         ]
     },
     {
-        "id": "7a365224.c1009c",
+        "id": "d079e008.5f24",
         "type": "comment",
         "name": "Not a failure",
         "info": "",
         "comments": "",
-        "x": 1725.2621307373047,
-        "y": 7045.2381038069725,
-        "z": "9167bcd1.0dd69",
+        "x": 1699.2621307373047,
+        "y": 7059.213803231716,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "faaa33d2.7941d8",
+        "id": "105602e9.282d2d",
         "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": 1547.929012298584,
-        "y": 7046.904914796352,
-        "z": "9167bcd1.0dd69",
+        "x": 1521.929012298584,
+        "y": 7060.880614221096,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "9048210a.638ad",
+        "id": "434730cd.aa95a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 795.2622184753418,
-        "y": 7071.904774606228,
-        "z": "9167bcd1.0dd69",
+        "x": 769.2622184753418,
+        "y": 7085.8804740309715,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "cc3d7eaa.03db28",
-                "1404a29d.dfd36d"
+                "c4265324.dc984",
+                "7d25dc74.1b248c"
             ]
         ]
     },
     {
-        "id": "cc3d7eaa.03db28",
+        "id": "c4265324.dc984",
         "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": 1108.5955429077148,
-        "y": 7047.238914430141,
-        "z": "9167bcd1.0dd69",
+        "x": 1082.5955429077148,
+        "y": 7061.214613854885,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "87a12e16.c1c8e"
+                "dd8f2dbc.1424c8"
             ]
         ]
     },
     {
-        "id": "c0a6d69d.c741f8",
+        "id": "16daf1fb.74eafe",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 817.500186920166,
-        "y": 4351.191212296486,
-        "z": "9167bcd1.0dd69",
+        "x": 791.500186920166,
+        "y": 4365.16691172123,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "f3f4159f.aadd9",
-                "6f96a138.acc9c8"
+                "9f7ab13.96daed",
+                "99a0939e.edd618"
             ]
         ]
     },
     {
-        "id": "9fa62cc3.2f0038",
+        "id": "cf4b3a59.c0e438",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 818.5001029968262,
-        "y": 4417.857502520084,
-        "z": "9167bcd1.0dd69",
+        "x": 792.5001029968262,
+        "y": 4431.833201944828,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "829bb1f4.830f08",
-                "6f96a138.acc9c8"
+                "e60106b.28aadf8",
+                "99a0939e.edd618"
             ]
         ]
     },
     {
-        "id": "5010a64f.2f3dc",
+        "id": "ba15facd.605eb8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1666.1668815612793,
-        "y": 5911.858327627182,
-        "z": "9167bcd1.0dd69",
+        "x": 1640.1668815612793,
+        "y": 5925.834027051926,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "da526891.6d6948",
-                "b976bf80.a00868"
+                "a267bbc6.a0ea2",
+                "89b0c713.c7a1a8"
             ]
         ]
     },
     {
-        "id": "4bde1cab.c0624c",
+        "id": "18873198.c57256",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1661.1668815612793,
-        "y": 5964.85817027092,
-        "z": "9167bcd1.0dd69",
+        "x": 1635.1668815612793,
+        "y": 5978.833869695663,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "91bf4a81.2bbfb",
-                "b976bf80.a00868"
+                "ab32c032.f2d458",
+                "89b0c713.c7a1a8"
             ]
         ]
     },
     {
-        "id": "6529b298.61d4a4",
+        "id": "c68814e7.3e7978",
         "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": 1003.3333778381348,
-        "y": 2421.1915349960327,
-        "z": "9167bcd1.0dd69",
+        "x": 977.3333778381348,
+        "y": 2435.1672344207764,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "8fa815b3.c373e8",
-                "d50aff26.86ca6"
+                "7721826a.263bbc",
+                "1da5a68e.f50659"
             ]
         ]
     },
     {
-        "id": "8fa815b3.c373e8",
+        "id": "7721826a.263bbc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1266.6666933695474,
-        "y": 2384.524751345316,
-        "z": "9167bcd1.0dd69",
+        "x": 1240.6666933695474,
+        "y": 2398.5004507700596,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "72fd863f.96d978"
+                "744a6e59.c4d87"
             ]
         ]
     },
     {
-        "id": "d50aff26.86ca6",
+        "id": "1da5a68e.f50659",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1269.9999809265137,
-        "y": 2459.5247468948364,
-        "z": "9167bcd1.0dd69",
+        "x": 1243.9999809265137,
+        "y": 2473.50044631958,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "3381b8ad.4cf26"
+                "1a97623c.4236ee"
             ]
         ]
     },
     {
-        "id": "72fd863f.96d978",
+        "id": "744a6e59.c4d87",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1428.333381652832,
-        "y": 2382.8580360412598,
-        "z": "9167bcd1.0dd69",
+        "x": 1402.333381652832,
+        "y": 2396.8337354660034,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "ddcdfbdc.02069"
+                "a9ea6465.0e1a"
             ]
         ]
     },
     {
-        "id": "3381b8ad.4cf26",
+        "id": "1a97623c.4236ee",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1424.9999885559082,
-        "y": 2459.5245885849,
-        "z": "9167bcd1.0dd69",
+        "x": 1398.9999885559082,
+        "y": 2473.5002880096436,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "5fd67b5c.1966a4"
+                "7895ddc8.adca34"
             ]
         ]
     },
     {
-        "id": "ddcdfbdc.02069",
+        "id": "a9ea6465.0e1a",
         "type": "switchNode",
         "name": "switch mdsal-preload.response-code",
         "xml": "<switch test='`$mdsal-preload.response-code`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1656.6666831970215,
-        "y": 2382.8580770492554,
-        "z": "9167bcd1.0dd69",
+        "x": 1630.6666831970215,
+        "y": 2396.833776473999,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "1032eb5c.8c7bfd",
-                "fe3501c8.ebdf28"
+                "6fc37eb4.61cff8",
+                "e6efb736.3838e8"
             ]
         ]
     },
     {
-        "id": "1032eb5c.8c7bfd",
+        "id": "6fc37eb4.61cff8",
         "type": "outcome",
         "name": "404 (not found)",
         "xml": "<outcome value='404'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1908.3334197998047,
-        "y": 2346.191451072693,
-        "z": "9167bcd1.0dd69",
+        "x": 1882.3334197998047,
+        "y": 2360.1671504974365,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a37b13e8.33b938"
+                "751c0b43.04587c"
             ]
         ]
     },
     {
-        "id": "a37b13e8.33b938",
+        "id": "751c0b43.04587c",
         "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": 2304.9998893737793,
-        "y": 2344.5245790481567,
-        "z": "9167bcd1.0dd69",
+        "x": 2278.9998893737793,
+        "y": 2358.5002784729004,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "233356b2.248a72"
+                "a300226a.2a6a9"
             ]
         ]
     },
     {
-        "id": "233356b2.248a72",
+        "id": "a300226a.2a6a9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2675.0000381469727,
-        "y": 2342.858115196228,
-        "z": "9167bcd1.0dd69",
+        "x": 2649.0000381469727,
+        "y": 2356.8338146209717,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "5f9b54a9.c1cdd4"
+                "854c8589.9f57c8"
             ]
         ]
     },
     {
-        "id": "c88feb78.b7ccd",
+        "id": "4b1cfdbb.d134fc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n",
         "comments": "",
-        "x": 2983.3334159851074,
-        "y": 2374.5248517990112,
-        "z": "9167bcd1.0dd69",
+        "x": 2957.3334159851074,
+        "y": 2388.500551223755,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "fe3501c8.ebdf28",
+        "id": "e6efb736.3838e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1883.3334999084473,
-        "y": 2402.8579416275024,
-        "z": "9167bcd1.0dd69",
+        "x": 1857.3334999084473,
+        "y": 2416.833641052246,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "f6f1c5d8.dc0ab"
+                "ce26b35e.dec2c"
             ]
         ]
     },
     {
-        "id": "7a69f1ed.4762a8",
+        "id": "fae1cd84.a9bd78",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error retrieving preload-information\" />\n",
         "comments": "",
-        "x": 2196.666404724121,
-        "y": 2419.52436542511,
-        "z": "9167bcd1.0dd69",
+        "x": 2170.666404724121,
+        "y": 2433.5000648498535,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "5fd67b5c.1966a4",
+        "id": "7895ddc8.adca34",
         "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": 1788.3332786560059,
-        "y": 2461.191336631775,
-        "z": "9167bcd1.0dd69",
+        "x": 1762.3332786560059,
+        "y": 2475.1670360565186,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "eeab2ed9.18515"
+                "abc28c19.d114f"
             ]
         ]
     },
     {
-        "id": "eeab2ed9.18515",
+        "id": "abc28c19.d114f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2144.000141143799,
-        "y": 2459.5249547958374,
-        "z": "9167bcd1.0dd69",
+        "x": 2118.000141143799,
+        "y": 2473.500654220581,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4331007b.e83998"
+                "e2bf8646.281a5"
             ]
         ]
     },
     {
-        "id": "ff44880b.925a9",
+        "id": "19d62bdc.450b0c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n",
         "comments": "",
-        "x": 2452.333393096924,
-        "y": 2481.191849708557,
-        "z": "9167bcd1.0dd69",
+        "x": 2426.333393096924,
+        "y": 2495.167549133301,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "9e617b8e.e0967",
+        "id": "9ef55446.fb8ff",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 648.0003280639648,
-        "y": 5707.35910153389,
-        "z": "9167bcd1.0dd69",
+        "x": 622.0003280639648,
+        "y": 5721.334800958633,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "b22bc2e1.6fc3a8",
-                "938e3050.854e5"
+                "b6dec962.68a7c",
+                "95f7cff4.36b8a"
             ]
         ]
     },
     {
-        "id": "938e3050.854e5",
+        "id": "95f7cff4.36b8a",
         "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": 899.0003776550293,
-        "y": 4912.025192737579,
-        "z": "9167bcd1.0dd69",
+        "x": 873.0003776550293,
+        "y": 4926.000892162323,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "6085493.53a3238"
+                "f3b94caa.1b1fa8"
             ]
         ]
     },
     {
-        "id": "bf5629c7.b8c548",
+        "id": "d289e33f.82de9",
         "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": 1625.00044631958,
-        "y": 4720.3591232299805,
-        "z": "9167bcd1.0dd69",
+        "x": 1599.00044631958,
+        "y": 4734.334822654724,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "57f9125a.f4f11c",
-                "c29ebd4.1b8af4"
+                "bf47efb9.ef7f",
+                "569de2d6.f82d54"
             ]
         ]
     },
     {
-        "id": "6085493.53a3238",
+        "id": "f3b94caa.1b1fa8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1067.3336791992188,
-        "y": 4912.692019939423,
-        "z": "9167bcd1.0dd69",
+        "x": 1041.3336791992188,
+        "y": 4926.667719364166,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "efdceadd.e8246",
-                "1fc575ba.ed4b2a",
-                "1a5d8b36.aeca65",
-                "6f6678f2.1bf2e",
-                "c11e7bb7.050ab8",
-                "dc86b143.7bc0f"
+                "64a79036.af227",
+                "1453c597.eede0a",
+                "4ddfdd9a.1fb534",
+                "3812039f.e87b54",
+                "c84f1dbb.f047b",
+                "1a6fc532.9edecb"
             ]
         ]
     },
     {
-        "id": "57f9125a.f4f11c",
+        "id": "bf47efb9.ef7f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1816.0004844665527,
-        "y": 4672.692457199097,
-        "z": "9167bcd1.0dd69",
+        "x": 1790.0004844665527,
+        "y": 4686.66815662384,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "e06eae25.746e28"
+                "6e86a94c.fb3c98"
             ]
         ]
     },
     {
-        "id": "25a824ba.d2e37c",
+        "id": "f7569ccb.527fb8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error saving vnfc to AAI\" />\n",
         "comments": "",
-        "x": 2155.0006370544434,
-        "y": 4706.835712790489,
-        "z": "9167bcd1.0dd69",
+        "x": 2129.0006370544434,
+        "y": 4720.811412215233,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "e06eae25.746e28",
+        "id": "6e86a94c.fb3c98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1981.1671714782715,
-        "y": 4686.820290505886,
-        "z": "9167bcd1.0dd69",
+        "x": 1955.1671714782715,
+        "y": 4700.79598993063,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "25a824ba.d2e37c",
-                "3db10379.cadefc"
+                "f7569ccb.527fb8",
+                "5306b235.f40434"
             ]
         ]
     },
     {
-        "id": "1a5d8b36.aeca65",
+        "id": "4ddfdd9a.1fb534",
         "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": 1291.9049644470215,
-        "y": 4820.978354930878,
-        "z": "9167bcd1.0dd69",
+        "x": 1265.9049644470215,
+        "y": 4834.954054355621,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "fbea59e9.f333f",
-                "14799014.2fab18"
+                "c2be51fa.60e598",
+                "2a3d4c91.ac8394"
             ]
         ]
     },
     {
-        "id": "7572056c.67fde4",
+        "id": "3a0d84a1.dc1034",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating vnfc relationships in AAI\" />\n",
         "comments": "",
-        "x": 1801.904899597168,
-        "y": 4812.64519071579,
-        "z": "9167bcd1.0dd69",
+        "x": 1775.904899597168,
+        "y": 4826.620890140533,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "7a494aad.c286a4",
+        "id": "afe00e2d.a0f838",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Not-found error updating vnfc relationships\" />\n",
         "comments": "",
-        "x": 1797.0718078613281,
-        "y": 4864.296397686005,
-        "z": "9167bcd1.0dd69",
+        "x": 1771.0718078613281,
+        "y": 4878.272097110748,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "3e10eb95.8e38dc",
+        "id": "c56add47.3caa38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1623.7381553649902,
-        "y": 4794.29597902298,
-        "z": "9167bcd1.0dd69",
+        "x": 1597.7381553649902,
+        "y": 4808.271678447723,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "7572056c.67fde4",
-                "3db10379.cadefc"
+                "3a0d84a1.dc1034",
+                "5306b235.f40434"
             ]
         ]
     },
     {
-        "id": "eb8fe9e3.991998",
+        "id": "efc908b3.5b4f1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1623.7382316589355,
-        "y": 4847.295737743378,
-        "z": "9167bcd1.0dd69",
+        "x": 1597.7382316589355,
+        "y": 4861.271437168121,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "7a494aad.c286a4",
-                "3db10379.cadefc"
+                "afe00e2d.a0f838",
+                "5306b235.f40434"
             ]
         ]
     },
     {
-        "id": "fbea59e9.f333f",
+        "id": "c2be51fa.60e598",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1466.9050407409668,
-        "y": 4794.311648845673,
-        "z": "9167bcd1.0dd69",
+        "x": 1440.9050407409668,
+        "y": 4808.287348270416,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "3e10eb95.8e38dc"
+                "c56add47.3caa38"
             ]
         ]
     },
     {
-        "id": "14799014.2fab18",
+        "id": "2a3d4c91.ac8394",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1475.4765739440918,
-        "y": 4846.93079328537,
-        "z": "9167bcd1.0dd69",
+        "x": 1449.4765739440918,
+        "y": 4860.9064927101135,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "eb8fe9e3.991998"
+                "efc908b3.5b4f1"
             ]
         ]
     },
     {
-        "id": "efdceadd.e8246",
+        "id": "64a79036.af227",
         "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": 1289.3810844421387,
-        "y": 5237.834763050079,
-        "z": "9167bcd1.0dd69",
+        "x": 1263.3810844421387,
+        "y": 5251.810462474823,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "bc7e2484.e69228"
+                "c0124012.781378"
             ]
         ]
     },
     {
-        "id": "cf140a5d.20d0a",
+        "id": "a146e36e.bc5ed",
         "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": 509.9999885559082,
-        "y": 2545.73858499527,
-        "z": "9167bcd1.0dd69",
+        "x": 483.9999885559082,
+        "y": 2559.7142844200134,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "502f6d13.ee70cc",
+        "id": "5fca11f4.669f4",
         "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": 1745.3336219787598,
-        "y": 5201.025196552277,
-        "z": "9167bcd1.0dd69",
+        "x": 1719.3336219787598,
+        "y": 5215.00089597702,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "3183d8e5.672be"
+                "85888402.2be4b8"
             ]
         ]
     },
     {
-        "id": "3183d8e5.672be",
+        "id": "85888402.2be4b8",
         "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": 2012.6669654846191,
-        "y": 5200.025684833527,
-        "z": "9167bcd1.0dd69",
+        "x": 1986.6669654846191,
+        "y": 5214.00138425827,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "779f95e4.f78a8c"
+                "9a087527.d5ab28"
             ]
         ]
     },
     {
-        "id": "5357cf02.932768",
+        "id": "1e939e61.89f482",
         "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": 2444.666576385498,
-        "y": 5266.691384315491,
-        "z": "9167bcd1.0dd69",
+        "x": 2418.666576385498,
+        "y": 5280.667083740234,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "3c7bceb4.1549ba"
+                "7bcb5345.4ee26c"
             ]
         ]
     },
     {
-        "id": "779f95e4.f78a8c",
+        "id": "9a087527.d5ab28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2223.666736602783,
-        "y": 5200.025141239166,
-        "z": "9167bcd1.0dd69",
+        "x": 2197.666736602783,
+        "y": 5214.00084066391,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a3b35b4c.65bd08",
-                "5357cf02.932768"
+                "cb5d5c29.e70c1",
+                "1e939e61.89f482"
             ]
         ]
     },
     {
-        "id": "a3b35b4c.65bd08",
+        "id": "cb5d5c29.e70c1",
         "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": 2443.667064666748,
-        "y": 5120.025038719177,
-        "z": "9167bcd1.0dd69",
+        "x": 2417.667064666748,
+        "y": 5134.000738143921,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "3c7bceb4.1549ba",
+        "id": "7bcb5345.4ee26c",
         "type": "switchNode",
         "name": "switch address family",
         "xml": "<switch test='`$tmp.address-family`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2683.6666679382324,
-        "y": 5265.025206565857,
-        "z": "9167bcd1.0dd69",
+        "x": 2657.6666679382324,
+        "y": 5279.000905990601,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "3dbb3b5c.4b19bc",
-                "5644f796.d8b738"
+                "a5ee9f3c.a8b118",
+                "cbf318c7.aa7798"
             ]
         ]
     },
     {
-        "id": "3dbb3b5c.4b19bc",
+        "id": "a5ee9f3c.a8b118",
         "type": "outcome",
         "name": "ipv4",
         "xml": "<outcome value='ipv4'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2880.809673309326,
-        "y": 5168.596467018127,
-        "z": "9167bcd1.0dd69",
+        "x": 2854.809673309326,
+        "y": 5182.572166442871,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "98a03a47.d1bb1"
+                "af8d9d5c.4e2818"
             ]
         ]
     },
     {
-        "id": "5644f796.d8b738",
+        "id": "cbf318c7.aa7798",
         "type": "outcome",
         "name": "ipv6",
         "xml": "<outcome value='ipv6'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2878.4287452697754,
-        "y": 5348.358498573303,
-        "z": "9167bcd1.0dd69",
+        "x": 2852.4287452697754,
+        "y": 5362.334197998047,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "831b99d7.14637"
+                "38fedc99.f67e84"
             ]
         ]
     },
     {
-        "id": "8eaadf17.3b8f38",
+        "id": "8093133b.217ed8",
         "type": "comment",
         "name": "Fixed IPs",
         "info": "",
         "comments": "",
-        "x": 1762.3336372375488,
-        "y": 5162.692573547363,
-        "z": "9167bcd1.0dd69",
+        "x": 1736.3336372375488,
+        "y": 5176.668272972107,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "9054c457.8f5da",
+        "id": "512883d4.a75cdc",
         "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": 3324.1428031921387,
-        "y": 5116.929546991985,
-        "z": "9167bcd1.0dd69",
+        "x": 3298.1428031921387,
+        "y": 5130.905246416729,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "2621f47c.ef48fc"
+                "caeff4c7.0f0308"
             ]
         ]
     },
     {
-        "id": "98a03a47.d1bb1",
+        "id": "af8d9d5c.4e2818",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3030.809673309326,
-        "y": 5168.59638563792,
-        "z": "9167bcd1.0dd69",
+        "x": 3004.809673309326,
+        "y": 5182.572085062664,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "9054c457.8f5da",
-                "cff14283.064d58"
+                "512883d4.a75cdc",
+                "8418bbb6.06414"
             ]
         ]
     },
     {
-        "id": "ef84b8c0.919f68",
+        "id": "31b70f0e.de26f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error creating l3-interface-ipv4-address-list object in AAI\" />\n",
         "comments": "",
-        "x": 3907.4763221740723,
-        "y": 5135.263206164043,
-        "z": "9167bcd1.0dd69",
+        "x": 3881.4763221740723,
+        "y": 5149.238905588787,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "74ceecc0.c34db4",
+        "id": "544248a1.55df98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3737.642677307129,
-        "y": 5116.914039293926,
-        "z": "9167bcd1.0dd69",
+        "x": 3711.642677307129,
+        "y": 5130.88973871867,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "ef84b8c0.919f68",
-                "379792a1.9d134e"
+                "31b70f0e.de26f",
+                "c4597b10.c8c598"
             ]
         ]
     },
     {
-        "id": "2621f47c.ef48fc",
+        "id": "caeff4c7.0f0308",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3580.8095626831055,
-        "y": 5116.929709116619,
-        "z": "9167bcd1.0dd69",
+        "x": 3554.8095626831055,
+        "y": 5130.905408541363,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "74ceecc0.c34db4"
+                "544248a1.55df98"
             ]
         ]
     },
     {
-        "id": "cff14283.064d58",
+        "id": "8418bbb6.06414",
         "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": 3319.1430473327637,
-        "y": 5215.262965838116,
-        "z": "9167bcd1.0dd69",
+        "x": 3293.1430473327637,
+        "y": 5229.238665262859,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "298ae030.16817",
-                "72d565c9.1fdcd4"
+                "ede48cf8.ee34a",
+                "6164433f.493c0c"
             ]
         ]
     },
     {
-        "id": "6ca890e0.85d5d",
+        "id": "4c64363c.6d06a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating l3-interface-ipv4-address-list relationships in AAI\" />\n",
         "comments": "",
-        "x": 3905.809429168701,
-        "y": 5206.929637591045,
-        "z": "9167bcd1.0dd69",
+        "x": 3879.809429168701,
+        "y": 5220.905337015789,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "5bb6eebc.15be48",
+        "id": "2d13a4f0.bd25d4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Not-found error updating l3-interface-ipv4-address-list relationships\" />\n",
         "comments": "",
-        "x": 3905.976291656494,
-        "y": 5256.914095560711,
-        "z": "9167bcd1.0dd69",
+        "x": 3879.976291656494,
+        "y": 5270.8897949854545,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "602f85ca.3af6ec",
+        "id": "c041ca58.d5cef",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3739.309299468994,
-        "y": 5186.914010683697,
-        "z": "9167bcd1.0dd69",
+        "x": 3713.309299468994,
+        "y": 5200.88971010844,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "6ca890e0.85d5d",
-                "379792a1.9d134e"
+                "4c64363c.6d06a",
+                "c4597b10.c8c598"
             ]
         ]
     },
     {
-        "id": "671adf60.dbe2f",
+        "id": "99e2f815.bdbdd8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3739.3093757629395,
-        "y": 5239.913769404095,
-        "z": "9167bcd1.0dd69",
+        "x": 3713.3093757629395,
+        "y": 5253.889468828838,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "5bb6eebc.15be48",
-                "379792a1.9d134e"
+                "2d13a4f0.bd25d4",
+                "c4597b10.c8c598"
             ]
         ]
     },
     {
-        "id": "298ae030.16817",
+        "id": "ede48cf8.ee34a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3582.4761848449707,
-        "y": 5186.92968050639,
-        "z": "9167bcd1.0dd69",
+        "x": 3556.4761848449707,
+        "y": 5200.905379931133,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "602f85ca.3af6ec"
+                "c041ca58.d5cef"
             ]
         ]
     },
     {
-        "id": "72d565c9.1fdcd4",
+        "id": "6164433f.493c0c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3591.0477180480957,
-        "y": 5239.548824946087,
-        "z": "9167bcd1.0dd69",
+        "x": 3565.0477180480957,
+        "y": 5253.5245243708305,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "671adf60.dbe2f"
+                "99e2f815.bdbdd8"
             ]
         ]
     },
     {
-        "id": "13f0f3c7.903904",
+        "id": "f831731c.2fd57",
         "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": 3322.9525413513184,
-        "y": 5295.977602958679,
-        "z": "9167bcd1.0dd69",
+        "x": 3296.9525413513184,
+        "y": 5309.953302383423,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "cd295240.6fd0c"
+                "2bc07238.f95d5e"
             ]
         ]
     },
     {
-        "id": "831b99d7.14637",
+        "id": "38fedc99.f67e84",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3029.619411468506,
-        "y": 5347.644441604614,
-        "z": "9167bcd1.0dd69",
+        "x": 3003.619411468506,
+        "y": 5361.620141029358,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "13f0f3c7.903904",
-                "9e5eb4e4.990e68"
+                "f831731c.2fd57",
+                "b7a7473f.797278"
             ]
         ]
     },
     {
-        "id": "91bc7464.bf1b48",
+        "id": "cf91be24.b998f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error creating l3-interface-ipv6-address-list object in AAI\" />\n",
         "comments": "",
-        "x": 3906.286060333252,
-        "y": 5314.311262130737,
-        "z": "9167bcd1.0dd69",
+        "x": 3880.286060333252,
+        "y": 5328.286961555481,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "2ba2dbf4.a9426c",
+        "id": "ea259af2.224e08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3736.4524154663086,
-        "y": 5295.96209526062,
-        "z": "9167bcd1.0dd69",
+        "x": 3710.4524154663086,
+        "y": 5309.937794685364,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "91bc7464.bf1b48",
-                "379792a1.9d134e"
+                "cf91be24.b998f",
+                "c4597b10.c8c598"
             ]
         ]
     },
     {
-        "id": "cd295240.6fd0c",
+        "id": "2bc07238.f95d5e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3579.619300842285,
-        "y": 5295.977765083313,
-        "z": "9167bcd1.0dd69",
+        "x": 3553.619300842285,
+        "y": 5309.953464508057,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "2ba2dbf4.a9426c"
+                "ea259af2.224e08"
             ]
         ]
     },
     {
-        "id": "9e5eb4e4.990e68",
+        "id": "b7a7473f.797278",
         "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": 3317.9527854919434,
-        "y": 5394.31102180481,
-        "z": "9167bcd1.0dd69",
+        "x": 3291.9527854919434,
+        "y": 5408.286721229553,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "821e155.0c03768",
-                "d1daf5a7.4e5038"
+                "d5743cde.2a99a",
+                "654cf89c.3dd958"
             ]
         ]
     },
     {
-        "id": "702086e5.a87928",
+        "id": "6dc75c34.cbb114",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating l3-interface-ipv6-address-list relationships in AAI\" />\n",
         "comments": "",
-        "x": 3904.619167327881,
-        "y": 5385.977693557739,
-        "z": "9167bcd1.0dd69",
+        "x": 3878.619167327881,
+        "y": 5399.953392982483,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "810daf5d.d981a",
+        "id": "1830af79.d932b9",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Not-found error updating l3-interface-ipv6-address-list relationships\" />\n",
         "comments": "",
-        "x": 3908.1193885803223,
-        "y": 5432.628710031509,
-        "z": "9167bcd1.0dd69",
+        "x": 3882.1193885803223,
+        "y": 5446.604409456253,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "a387fb05.ace298",
+        "id": "bf7ed658.687448",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3738.119037628174,
-        "y": 5365.962066650391,
-        "z": "9167bcd1.0dd69",
+        "x": 3712.119037628174,
+        "y": 5379.937766075134,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "702086e5.a87928",
-                "379792a1.9d134e"
+                "6dc75c34.cbb114",
+                "c4597b10.c8c598"
             ]
         ]
     },
     {
-        "id": "2e5a57f5.b0c6d",
+        "id": "6452b9f7.7198e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3738.119113922119,
-        "y": 5418.961825370789,
-        "z": "9167bcd1.0dd69",
+        "x": 3712.119113922119,
+        "y": 5432.937524795532,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "810daf5d.d981a",
-                "379792a1.9d134e"
+                "1830af79.d932b9",
+                "c4597b10.c8c598"
             ]
         ]
     },
     {
-        "id": "821e155.0c03768",
+        "id": "d5743cde.2a99a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3581.2859230041504,
-        "y": 5365.9777364730835,
-        "z": "9167bcd1.0dd69",
+        "x": 3555.2859230041504,
+        "y": 5379.953435897827,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a387fb05.ace298"
+                "bf7ed658.687448"
             ]
         ]
     },
     {
-        "id": "d1daf5a7.4e5038",
+        "id": "654cf89c.3dd958",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3589.8574562072754,
-        "y": 5418.596880912781,
-        "z": "9167bcd1.0dd69",
+        "x": 3563.8574562072754,
+        "y": 5432.572580337524,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "2e5a57f5.b0c6d"
+                "6452b9f7.7198e"
             ]
         ]
     },
     {
-        "id": "e3a4933c.85a3c8",
+        "id": "338a7f2e.d4c058",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1044.3335914611816,
-        "y": 6124.692138195038,
-        "z": "9167bcd1.0dd69",
+        "x": 1018.3335914611816,
+        "y": 6138.6678376197815,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "977e1113.8ffe08",
-                "98920223.9d1788",
-                "4e4aa877.9d0b4",
-                "509b4c19.fe40b4"
+                "cdfadd41.c27e88",
+                "c0d1ee17.6f56f",
+                "29da88d2.619828",
+                "778d41ae.068ed"
             ]
         ]
     },
     {
-        "id": "41944760.d8c68",
+        "id": "f73cf5ca.890db",
         "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": 1692.3337669372559,
-        "y": 6247.025886058807,
-        "z": "9167bcd1.0dd69",
+        "x": 1666.3337669372559,
+        "y": 6261.001585483551,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "61dec192.4d7148"
+                "f728c8ba.23c06"
             ]
         ]
     },
     {
-        "id": "c022e9c3.807898",
+        "id": "1824604b.2416d",
         "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": 1775.3336219787598,
-        "y": 6078.358897686005,
-        "z": "9167bcd1.0dd69",
+        "x": 1749.3336219787598,
+        "y": 6092.334597110748,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "7a0ce7a9.67d428",
-                "8bc67e6d.794ba8"
+                "438a7d62.57f234",
+                "1ad76478.51609c"
             ]
         ]
     },
     {
-        "id": "4e4aa877.9d0b4",
+        "id": "29da88d2.619828",
         "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": 1283.3336143493652,
-        "y": 6136.358970165253,
-        "z": "9167bcd1.0dd69",
+        "x": 1257.3336143493652,
+        "y": 6150.334669589996,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "ad98d310.ff19b"
+                "37c98a04.bb93de"
             ]
         ]
     },
     {
-        "id": "ad98d310.ff19b",
+        "id": "37c98a04.bb93de",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1509.3336143493652,
-        "y": 6134.358970165253,
-        "z": "9167bcd1.0dd69",
+        "x": 1483.3336143493652,
+        "y": 6148.334669589996,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "c022e9c3.807898",
-                "db158df8.1167b",
-                "41944760.d8c68"
+                "1824604b.2416d",
+                "83dc1a75.df99f",
+                "f73cf5ca.890db"
             ]
         ]
     },
     {
-        "id": "7ef8032.ed11efc",
+        "id": "9e39d198.93b71",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error saving vip-ipv4-address-list in AAI\" />\n",
         "comments": "",
-        "x": 2337.3336219787598,
-        "y": 6068.358897686005,
-        "z": "9167bcd1.0dd69",
+        "x": 2311.3336219787598,
+        "y": 6082.334597110748,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "e03d6e17.c3c688",
+        "id": "61f82df6.e1bc7c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Not-found error saving vip-ipv4-address-list\" />\n",
         "comments": "",
-        "x": 2337.5004844665527,
-        "y": 6118.34335565567,
-        "z": "9167bcd1.0dd69",
+        "x": 2311.5004844665527,
+        "y": 6132.319055080414,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "fbbe1588.40205",
+        "id": "70e4e939.7a5698",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2170.8334922790527,
-        "y": 6048.343270778656,
-        "z": "9167bcd1.0dd69",
+        "x": 2144.8334922790527,
+        "y": 6062.3189702034,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "7ef8032.ed11efc",
-                "2e738df3.a266b2"
+                "9e39d198.93b71",
+                "197c2a2b.1fd476"
             ]
         ]
     },
     {
-        "id": "2a573c62.740a54",
+        "id": "122e2a34.2cb72e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2170.833568572998,
-        "y": 6101.343029499054,
-        "z": "9167bcd1.0dd69",
+        "x": 2144.833568572998,
+        "y": 6115.318728923798,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "e03d6e17.c3c688",
-                "2e738df3.a266b2"
+                "61f82df6.e1bc7c",
+                "197c2a2b.1fd476"
             ]
         ]
     },
     {
-        "id": "7a0ce7a9.67d428",
+        "id": "438a7d62.57f234",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2014.0003776550293,
-        "y": 6048.358940601349,
-        "z": "9167bcd1.0dd69",
+        "x": 1988.0003776550293,
+        "y": 6062.3346400260925,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "fbbe1588.40205"
+                "70e4e939.7a5698"
             ]
         ]
     },
     {
-        "id": "8bc67e6d.794ba8",
+        "id": "1ad76478.51609c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2022.5719108581543,
-        "y": 6100.978085041046,
-        "z": "9167bcd1.0dd69",
+        "x": 1996.5719108581543,
+        "y": 6114.95378446579,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "2a573c62.740a54"
+                "122e2a34.2cb72e"
             ]
         ]
     },
     {
-        "id": "4d116331.dbe40c",
+        "id": "65898e8.b71e1f",
         "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": 2111.000217437744,
-        "y": 6191.0255608558655,
-        "z": "9167bcd1.0dd69",
+        "x": 2085.000217437744,
+        "y": 6205.001260280609,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "5c248e68.67eca8",
-                "b00109fd.7018a"
+                "402e9d9b.733204",
+                "70c9212c.bbca1"
             ]
         ]
     },
     {
-        "id": "194ccbea.7b2314",
+        "id": "ace25aed.ae464",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv4-address-list relationships in AAI\" />\n",
         "comments": "",
-        "x": 2680.6666259765625,
-        "y": 6183.025530397892,
-        "z": "9167bcd1.0dd69",
+        "x": 2654.6666259765625,
+        "y": 6197.001229822636,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "24399d85.a919ca",
+        "id": "31548e06.a1695a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Not-found error updating vip-ipv4-address-list relationships\" />\n",
         "comments": "",
-        "x": 2680.833595275879,
-        "y": 6233.009704113007,
-        "z": "9167bcd1.0dd69",
+        "x": 2654.833595275879,
+        "y": 6246.98540353775,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "215feb82.3c18c4",
+        "id": "50f58ee.2b436f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2514.1664962768555,
-        "y": 6163.009903490543,
-        "z": "9167bcd1.0dd69",
+        "x": 2488.1664962768555,
+        "y": 6176.985602915287,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "194ccbea.7b2314",
-                "2e738df3.a266b2"
+                "ace25aed.ae464",
+                "197c2a2b.1fd476"
             ]
         ]
     },
     {
-        "id": "bd320fdf.1dd3",
+        "id": "d18b7bf8.606268",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2514.166572570801,
-        "y": 6216.009662210941,
-        "z": "9167bcd1.0dd69",
+        "x": 2488.166572570801,
+        "y": 6229.985361635685,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "24399d85.a919ca",
-                "2e738df3.a266b2"
+                "31548e06.a1695a",
+                "197c2a2b.1fd476"
             ]
         ]
     },
     {
-        "id": "5c248e68.67eca8",
+        "id": "402e9d9b.733204",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2357.333381652832,
-        "y": 6163.025573313236,
-        "z": "9167bcd1.0dd69",
+        "x": 2331.333381652832,
+        "y": 6177.00127273798,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "215feb82.3c18c4"
+                "50f58ee.2b436f"
             ]
         ]
     },
     {
-        "id": "b00109fd.7018a",
+        "id": "70c9212c.bbca1",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2365.904914855957,
-        "y": 6215.6447177529335,
-        "z": "9167bcd1.0dd69",
+        "x": 2339.904914855957,
+        "y": 6229.620417177677,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "bd320fdf.1dd3"
+                "d18b7bf8.606268"
             ]
         ]
     },
     {
-        "id": "14908e4.0b7c572",
+        "id": "7fc77ef2.07aa8",
         "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": 1778.66695022583,
-        "y": 6401.691581249237,
-        "z": "9167bcd1.0dd69",
+        "x": 1752.66695022583,
+        "y": 6415.667280673981,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "5b0cff7c.4a4298",
-                "31df6b80.4ae1ac"
+                "809737d2.f14978",
+                "965dffd5.95084"
             ]
         ]
     },
     {
-        "id": "509b4c19.fe40b4",
+        "id": "778d41ae.068ed",
         "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": 1286.6669425964355,
-        "y": 6458.691653728485,
-        "z": "9167bcd1.0dd69",
+        "x": 1260.6669425964355,
+        "y": 6472.667353153229,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "3c84431b.8f327c"
+                "8f96d394.0feec"
             ]
         ]
     },
     {
-        "id": "3c84431b.8f327c",
+        "id": "8f96d394.0feec",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1512.6669425964355,
-        "y": 6457.691653728485,
-        "z": "9167bcd1.0dd69",
+        "x": 1486.6669425964355,
+        "y": 6471.667353153229,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "14908e4.0b7c572",
-                "c9260312.daf868",
-                "5aa22816.429f48"
+                "7fc77ef2.07aa8",
+                "155a1d21.29a5db",
+                "ec86e082.0ebd08"
             ]
         ]
     },
     {
-        "id": "dd2eb416.73c908",
+        "id": "6546b9c9.b685b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error saving vip-ipv6-address-list in AAI\" />\n",
         "comments": "",
-        "x": 2340.66695022583,
-        "y": 6391.691581249237,
-        "z": "9167bcd1.0dd69",
+        "x": 2314.66695022583,
+        "y": 6405.667280673981,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "10c3fbcd.513b94",
+        "id": "8dfef510.d4b698",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Not-found error saving vip-ipv6-address-list\" />\n",
         "comments": "",
-        "x": 2340.833812713623,
-        "y": 6441.676039218903,
-        "z": "9167bcd1.0dd69",
+        "x": 2314.833812713623,
+        "y": 6455.651738643646,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "28179059.d61ef8",
+        "id": "4ccd550e.0b5b84",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2174.166820526123,
-        "y": 6371.675954341888,
-        "z": "9167bcd1.0dd69",
+        "x": 2148.166820526123,
+        "y": 6385.651653766632,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "dd2eb416.73c908",
-                "2e738df3.a266b2"
+                "6546b9c9.b685b8",
+                "197c2a2b.1fd476"
             ]
         ]
     },
     {
-        "id": "35207268.e2e96e",
+        "id": "4638bb37.c9cf24",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2174.1668968200684,
-        "y": 6424.675713062286,
-        "z": "9167bcd1.0dd69",
+        "x": 2148.1668968200684,
+        "y": 6438.65141248703,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "10c3fbcd.513b94",
-                "2e738df3.a266b2"
+                "8dfef510.d4b698",
+                "197c2a2b.1fd476"
             ]
         ]
     },
     {
-        "id": "5b0cff7c.4a4298",
+        "id": "809737d2.f14978",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2017.3337059020996,
-        "y": 6371.691624164581,
-        "z": "9167bcd1.0dd69",
+        "x": 1991.3337059020996,
+        "y": 6385.667323589325,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "28179059.d61ef8"
+                "4ccd550e.0b5b84"
             ]
         ]
     },
     {
-        "id": "31df6b80.4ae1ac",
+        "id": "965dffd5.95084",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2025.9052391052246,
-        "y": 6424.310768604279,
-        "z": "9167bcd1.0dd69",
+        "x": 1999.9052391052246,
+        "y": 6438.286468029022,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "35207268.e2e96e"
+                "4638bb37.c9cf24"
             ]
         ]
     },
     {
-        "id": "be05c61f.2a3f48",
+        "id": "1bfe393d.78ce37",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv6-address-list relationships in AAI\" />\n",
         "comments": "",
-        "x": 2674.0002059936523,
-        "y": 6504.6916318535805,
-        "z": "9167bcd1.0dd69",
+        "x": 2648.0002059936523,
+        "y": 6518.667331278324,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "4ddaaa06.7ec0e4",
+        "id": "8e452db7.9148e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Not-found error updating vip-ipv6-address-list relationships\" />\n",
         "comments": "",
-        "x": 2674.1670684814453,
-        "y": 6554.676089823246,
-        "z": "9167bcd1.0dd69",
+        "x": 2648.1670684814453,
+        "y": 6568.65178924799,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "6169d8f1.0fca9",
+        "id": "d1798ee3.3c5528",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2507.5000762939453,
-        "y": 6484.676004946232,
-        "z": "9167bcd1.0dd69",
+        "x": 2481.5000762939453,
+        "y": 6498.6517043709755,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "be05c61f.2a3f48",
-                "2e738df3.a266b2"
+                "1bfe393d.78ce37",
+                "197c2a2b.1fd476"
             ]
         ]
     },
     {
-        "id": "104ad559.84aa1b",
+        "id": "6080e54e.a2c7bc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2507.5001525878906,
-        "y": 6537.67576366663,
-        "z": "9167bcd1.0dd69",
+        "x": 2481.5001525878906,
+        "y": 6551.651463091373,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4ddaaa06.7ec0e4",
-                "2e738df3.a266b2"
+                "8e452db7.9148e",
+                "197c2a2b.1fd476"
             ]
         ]
     },
     {
-        "id": "3625278f.94f36",
+        "id": "1eacc679.59eb8a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2350.666961669922,
-        "y": 6484.691674768925,
-        "z": "9167bcd1.0dd69",
+        "x": 2324.666961669922,
+        "y": 6498.667374193668,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "6169d8f1.0fca9"
+                "d1798ee3.3c5528"
             ]
         ]
     },
     {
-        "id": "dbaa45c3.a58ac8",
+        "id": "60fbd117.43ed78",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2359.238494873047,
-        "y": 6537.310819208622,
-        "z": "9167bcd1.0dd69",
+        "x": 2333.238494873047,
+        "y": 6551.286518633366,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "104ad559.84aa1b"
+                "6080e54e.a2c7bc"
             ]
         ]
     },
     {
-        "id": "6bd05851.cda258",
+        "id": "870acd7f.91e8a",
         "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": 2106.3338050842285,
-        "y": 6513.358093738556,
-        "z": "9167bcd1.0dd69",
+        "x": 2080.3338050842285,
+        "y": 6527.3337931633,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "3625278f.94f36",
-                "dbaa45c3.a58ac8"
+                "1eacc679.59eb8a",
+                "60fbd117.43ed78"
             ]
         ]
     },
     {
-        "id": "6f96a138.acc9c8",
+        "id": "99a0939e.edd618",
         "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": 1162.3334770202637,
-        "y": 4321.691486895084,
-        "z": "9167bcd1.0dd69",
+        "x": 1136.3334770202637,
+        "y": 4335.667186319828,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "3db10379.cadefc",
+        "id": "5306b235.f40434",
         "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": 2327.0004234313965,
-        "y": 4659.692221999168,
-        "z": "9167bcd1.0dd69",
+        "x": 2301.0004234313965,
+        "y": 4673.667921423912,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "b976bf80.a00868",
+        "id": "89b0c713.c7a1a8",
         "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": 2035.6670036315918,
-        "y": 5876.6920592188835,
-        "z": "9167bcd1.0dd69",
+        "x": 2009.6670036315918,
+        "y": 5890.667758643627,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "2e738df3.a266b2",
+        "id": "197c2a2b.1fd476",
         "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": 2984.667133331299,
-        "y": 5995.691905498505,
-        "z": "9167bcd1.0dd69",
+        "x": 2958.667133331299,
+        "y": 6009.667604923248,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "379792a1.9d134e",
+        "id": "c4597b10.c8c598",
         "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": 4304.0001220703125,
-        "y": 5043.357985436916,
-        "z": "9167bcd1.0dd69",
+        "x": 4278.0001220703125,
+        "y": 5057.33368486166,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "1fc575ba.ed4b2a",
+        "id": "1453c597.eede0a",
         "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": 1269.0002479553223,
-        "y": 4760.691877782345,
-        "z": "9167bcd1.0dd69",
+        "x": 1243.0002479553223,
+        "y": 4774.6675772070885,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "977e1113.8ffe08",
+        "id": "cdfadd41.c27e88",
         "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": 1239.6670036315918,
-        "y": 6008.6920592188835,
-        "z": "9167bcd1.0dd69",
+        "x": 1213.6670036315918,
+        "y": 6022.667758643627,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "db158df8.1167b",
+        "id": "83dc1a75.df99f",
         "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": 1712.6669692993164,
-        "y": 6136.6921390891075,
-        "z": "9167bcd1.0dd69",
+        "x": 1686.6669692993164,
+        "y": 6150.667838513851,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "c9260312.daf868",
+        "id": "155a1d21.29a5db",
         "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": 1718.0003051757812,
-        "y": 6462.691742360592,
-        "z": "9167bcd1.0dd69",
+        "x": 1692.0003051757812,
+        "y": 6476.6674417853355,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "c29ebd4.1b8af4",
+        "id": "569de2d6.f82d54",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1819.0004234313965,
-        "y": 4720.692116677761,
-        "z": "9167bcd1.0dd69",
+        "x": 1793.0004234313965,
+        "y": 4734.667816102505,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "e06eae25.746e28"
+                "6e86a94c.fb3c98"
             ]
         ]
     },
     {
-        "id": "c8b952a9.c78298",
+        "id": "cda23fd1.47e1a8",
         "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": 602.6667823791504,
-        "y": 6800.691919803619,
-        "z": "9167bcd1.0dd69",
+        "x": 576.6667823791504,
+        "y": 6814.667619228363,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "644ad1c5.87cc3"
+                "e90bb7c8.08e178"
             ]
         ]
     },
     {
-        "id": "644ad1c5.87cc3",
+        "id": "e90bb7c8.08e178",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 947.0001983642578,
-        "y": 6800.025414943695,
-        "z": "9167bcd1.0dd69",
+        "x": 921.0001983642578,
+        "y": 6814.001114368439,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "52273fde.82a9b"
+                "18d401ff.91ad6e"
             ]
         ]
     },
     {
-        "id": "52273fde.82a9b",
+        "id": "18d401ff.91ad6e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1102.000072479248,
-        "y": 6800.025210857391,
-        "z": "9167bcd1.0dd69",
+        "x": 1076.000072479248,
+        "y": 6814.000910282135,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "cf013b75.034798",
-                "6bc578d2.be185",
-                "d4d7a21f.792e98"
+                "9c285c4.54c07a",
+                "53893b7.1824544",
+                "1e2c10de.ec2827"
             ]
         ]
     },
     {
-        "id": "cf013b75.034798",
+        "id": "9c285c4.54c07a",
         "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": 1450.3333625793457,
-        "y": 6745.025630712509,
-        "z": "9167bcd1.0dd69",
+        "x": 1424.3333625793457,
+        "y": 6759.001330137253,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "6bc578d2.be185",
+        "id": "53893b7.1824544",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n",
         "comments": "",
-        "x": 1278.6668014526367,
-        "y": 6843.358858704567,
-        "z": "9167bcd1.0dd69",
+        "x": 1252.6668014526367,
+        "y": 6857.334558129311,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "d4d7a21f.792e98",
+        "id": "1e2c10de.ec2827",
         "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": 1273.6666984558105,
-        "y": 6796.691714763641,
-        "z": "9167bcd1.0dd69",
+        "x": 1247.6666984558105,
+        "y": 6810.667414188385,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "b1406c81.923cc",
+        "id": "f31d4136.dbad18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 240.8928680419922,
-        "y": 556.5714416503906,
-        "z": "9167bcd1.0dd69",
+        "x": 214.8928680419922,
+        "y": 570.5471410751343,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "43097907.f1acb8",
-                "6fdfcdf3.2ecd44",
-                "c5b83baf.fcb2b8",
-                "169ef671.ac8942",
-                "58f29161.867a9",
-                "3a7d1430.c71c54",
-                "cfe429db.9ee878",
-                "59c722cd.d5e3ac",
-                "9ed32d4f.dbd058"
+                "8e5c6ccb.163dc",
+                "76da2351.1e772c",
+                "729b2317.d41764",
+                "c81a4e60.7d0e28",
+                "ebe8b394.b57a1",
+                "a8e5db24.a73738",
+                "bd911df4.417368",
+                "5e3595bc.cfed8c",
+                "5eb11d31.97f244",
+                "557cfb68.ef7394"
             ]
         ]
     },
     {
-        "id": "cc91d00d.836b9",
+        "id": "6758cc3d.63107c",
         "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": 531.904712677002,
-        "y": 2612.1672048568726,
-        "z": "9167bcd1.0dd69",
+        "x": 505.90471267700195,
+        "y": 2626.142904281616,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "dade25b1.c84ca",
-                "947e2614.ca4708"
+                "cb04a746.6669f",
+                "824ab2b0.df6428"
             ]
         ]
     },
     {
-        "id": "dade25b1.c84ca",
+        "id": "cb04a746.6669f",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 703.8094444274902,
-        "y": 2589.548225402832,
-        "z": "9167bcd1.0dd69",
+        "x": 677.8094444274902,
+        "y": 2603.5239248275757,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a599121f.29119"
+                "15aec9d4.c06a16"
             ]
         ]
     },
     {
-        "id": "947e2614.ca4708",
+        "id": "824ab2b0.df6428",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 705.4760971069336,
-        "y": 2634.5480642318726,
-        "z": "9167bcd1.0dd69",
+        "x": 679.4760971069336,
+        "y": 2648.523763656616,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "f0b8dd3.f8d9fa"
+                "1b5ec8ed.f0fa5f"
             ]
         ]
     },
     {
-        "id": "a599121f.29119",
+        "id": "15aec9d4.c06a16",
         "type": "set",
         "name": "set automated-assignment to true",
         "xml": "<set>\n<parameter name='automated-assignment' value='true' />\n",
         "comments": "",
-        "x": 918.8094291687012,
-        "y": 2587.88139629364,
-        "z": "9167bcd1.0dd69",
+        "x": 892.8094291687012,
+        "y": 2601.857095718384,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "f0b8dd3.f8d9fa",
+        "id": "1b5ec8ed.f0fa5f",
         "type": "set",
         "name": "set automated-assignment to false",
         "xml": "<set>\n<parameter name='automated-assignment' value='false' />\n",
         "comments": "",
-        "x": 917.142749786377,
-        "y": 2632.8813161849976,
-        "z": "9167bcd1.0dd69",
+        "x": 891.142749786377,
+        "y": 2646.857015609741,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "5aa22816.429f48",
+        "id": "ec86e082.0ebd08",
         "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": 1693.4288368225098,
-        "y": 6561.572165966034,
-        "z": "9167bcd1.0dd69",
+        "x": 1667.4288368225098,
+        "y": 6575.547865390778,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "5e28153d.aad85c"
+                "63b023e.b6b035c"
             ]
         ]
     },
     {
-        "id": "375c5c4e.30f4cc",
+        "id": "7edee497.097a8c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Test return\" />\n",
         "comments": "",
-        "x": 158.00014877319336,
-        "y": 7041.359684050083,
-        "z": "9167bcd1.0dd69",
+        "x": 132.00014877319336,
+        "y": 7055.335383474827,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "e5e2fde7.2191d",
+        "id": "4f9ff09e.f47468",
         "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": 510.66680908203125,
-        "y": 3972.358087539673,
-        "z": "9167bcd1.0dd69",
+        "x": 484.66680908203125,
+        "y": 3986.3337869644165,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "d363401e.7355c"
+                "617011f9.ea2ab"
             ]
         ]
     },
     {
-        "id": "d363401e.7355c",
+        "id": "617011f9.ea2ab",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 701.166877746582,
-        "y": 3973.19132232666,
-        "z": "9167bcd1.0dd69",
+        "x": 675.166877746582,
+        "y": 3987.167021751404,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "e3fa98f1.b438d"
+                "83d39866.f1404"
             ]
         ]
     },
     {
-        "id": "e3fa98f1.b438d",
+        "id": "83d39866.f1404",
         "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": 902.6668090820312,
-        "y": 3972.358087539673,
-        "z": "9167bcd1.0dd69",
+        "x": 876.6668090820312,
+        "y": 3986.3337869644165,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "40b3e744.61964"
+                "1bc0649f.f8534b"
             ]
         ]
     },
     {
-        "id": "40b3e744.61964",
+        "id": "1bc0649f.f8534b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1092.500129699707,
-        "y": 3971.857526779175,
-        "z": "9167bcd1.0dd69",
+        "x": 1066.500129699707,
+        "y": 3985.8332262039185,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "e55f887a.2c28b8"
+                "d88aed65.46a24"
             ]
         ]
     },
     {
-        "id": "e55f887a.2c28b8",
+        "id": "d88aed65.46a24",
         "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": 1382.0001029968262,
-        "y": 3970.358169555664,
-        "z": "9167bcd1.0dd69",
+        "x": 1356.0001029968262,
+        "y": 3984.3338689804077,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "38728e09.f4cc2a",
-                "61cfce62.115458"
+                "2f7749ca.aec726",
+                "e8b4eef1.ffee3"
             ]
         ]
     },
     {
-        "id": "38728e09.f4cc2a",
+        "id": "2f7749ca.aec726",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1653.00004196167,
-        "y": 3875.024871826172,
-        "z": "9167bcd1.0dd69",
+        "x": 1627.00004196167,
+        "y": 3889.0005712509155,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "9486bfbc.c85ee"
+                "66c6e90.48fb618"
             ]
         ]
     },
     {
-        "id": "9486bfbc.c85ee",
+        "id": "66c6e90.48fb618",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1800.190559387207,
-        "y": 3873.57288646698,
-        "z": "9167bcd1.0dd69",
+        "x": 1774.190559387207,
+        "y": 3887.5485858917236,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "ff352d2b.40694",
-                "f46bd80d.b62c1"
+                "ec91bd86.5aa968",
+                "93d1e771.4e016"
             ]
         ]
     },
     {
-        "id": "61cfce62.115458",
+        "id": "e8b4eef1.ffee3",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1641.333293914795,
-        "y": 4094.691343307495,
-        "z": "9167bcd1.0dd69",
+        "x": 1615.333293914795,
+        "y": 4108.667042732239,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a9e83864.3544c8"
+                "3cdc82f8.a4faee"
             ]
         ]
     },
     {
-        "id": "aeabd7d7.f9db5",
+        "id": "4cc96e52.e6a0c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2059.66654586792,
-        "y": 4096.69109916687,
-        "z": "9167bcd1.0dd69",
+        "x": 2033.66654586792,
+        "y": 4110.666798591614,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "777f849.576bdfc",
-                "65c58e18.2c5ff",
-                "de7a8e52.6c38f",
-                "d8f45dd9.fffaa",
-                "d55dcbe4.b448d8",
-                "dd07d863.1ec54",
-                "66d1505f.39733",
-                "9bb872f6.753258"
+                "a85f734e.8216f8",
+                "d8f7b669.bdae5",
+                "f0b1e50.2419f98",
+                "c9e00ddc.ec7f9",
+                "5f1709b2.75df38",
+                "ed23f3c3.06c99",
+                "801aa393.e7c828",
+                "bc7278c.42fbb88"
             ]
         ]
     },
     {
-        "id": "ff352d2b.40694",
+        "id": "ec91bd86.5aa968",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error reading VFC_RELATED_NETWORK_ROLE table\" />\n",
         "comments": "",
-        "x": 1952.3334159851074,
-        "y": 3870.358123779297,
-        "z": "9167bcd1.0dd69",
+        "x": 1926.3334159851074,
+        "y": 3884.3338232040405,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "65c58e18.2c5ff",
+        "id": "d8f7b669.bdae5",
         "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": 2254.6666831970215,
-        "y": 3964.0247554779053,
-        "z": "9167bcd1.0dd69",
+        "x": 2228.6666831970215,
+        "y": 3978.000454902649,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "287be929.0998de"
+                "ab33d64f.d9b14"
             ]
         ]
     },
     {
-        "id": "777f849.576bdfc",
+        "id": "a85f734e.8216f8",
         "type": "set",
         "name": "set found-related-network to false",
         "xml": "<set>\n<parameter name='found-related-network' value='false' />\n",
         "comments": "",
-        "x": 2294.666759490967,
-        "y": 3905.6915321350098,
-        "z": "9167bcd1.0dd69",
+        "x": 2268.666759490967,
+        "y": 3919.6672315597534,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "8af8893c.0f1fc8",
+        "id": "a7f98828.b1bf6",
         "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": 2653.666645050049,
-        "y": 3940.6910190582275,
-        "z": "9167bcd1.0dd69",
+        "x": 2627.666645050049,
+        "y": 3954.666718482971,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "7e43f742.984c4"
+                "ee66934b.2211c"
             ]
         ]
     },
     {
-        "id": "287be929.0998de",
+        "id": "ab33d64f.d9b14",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2442.6666831970215,
-        "y": 3964.0247554779053,
-        "z": "9167bcd1.0dd69",
+        "x": 2416.6666831970215,
+        "y": 3978.000454902649,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "8af8893c.0f1fc8",
-                "44f2cc37.a78364"
+                "a7f98828.b1bf6",
+                "c6074e1a.a9bd"
             ]
         ]
     },
     {
-        "id": "7e43f742.984c4",
+        "id": "ee66934b.2211c",
         "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": 2905.666561126709,
-        "y": 3940.691095352173,
-        "z": "9167bcd1.0dd69",
+        "x": 2879.666561126709,
+        "y": 3954.6667947769165,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "13b580a4.638417"
+                "6379e03d.d86428"
             ]
         ]
     },
     {
-        "id": "a9e83864.3544c8",
+        "id": "3cdc82f8.a4faee",
         "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": 1845.6666679382324,
-        "y": 4095.35809135437,
-        "z": "9167bcd1.0dd69",
+        "x": 1819.6666679382324,
+        "y": 4109.333790779114,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "aeabd7d7.f9db5"
+                "4cc96e52.e6a0c8"
             ]
         ]
     },
     {
-        "id": "4c894758.36b448",
+        "id": "228dd6f5.02d922",
         "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": 326.6669120788574,
-        "y": 7001.359684050083,
-        "z": "9167bcd1.0dd69",
+        "x": 300.6669120788574,
+        "y": 7015.335383474827,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "13b580a4.638417",
+        "id": "6379e03d.d86428",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3105.666561126709,
-        "y": 3938.691095352173,
-        "z": "9167bcd1.0dd69",
+        "x": 3079.666561126709,
+        "y": 3952.6667947769165,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "32afed8d.51d1a2"
+                "be891755.bf2fc8"
             ]
         ]
     },
     {
-        "id": "32afed8d.51d1a2",
+        "id": "be891755.bf2fc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3259.666561126709,
-        "y": 3936.691095352173,
-        "z": "9167bcd1.0dd69",
+        "x": 3233.666561126709,
+        "y": 3950.6667947769165,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "f204e763.59bda8",
-                "85e8b1c6.3df998",
-                "334d9e50.554812"
+                "b8f64431.0e9ce",
+                "dfbc238f.56c8f",
+                "742ee78e.6f2f6"
             ]
         ]
     },
     {
-        "id": "f204e763.59bda8",
+        "id": "b8f64431.0e9ce",
         "type": "set",
         "name": "set found-related-network to true",
         "xml": "<set>\n<parameter name='found-related-network' value='true' />\n",
         "comments": "",
-        "x": 3491.666721343994,
-        "y": 3896.3576793670654,
-        "z": "9167bcd1.0dd69",
+        "x": 3465.666721343994,
+        "y": 3910.333378791809,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "85e8b1c6.3df998",
+        "id": "dfbc238f.56c8f",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3414.999897003174,
-        "y": 3983.024429321289,
-        "z": "9167bcd1.0dd69",
+        "x": 3388.999897003174,
+        "y": 3997.0001287460327,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "de7a8e52.6c38f",
+        "id": "f0b1e50.2419f98",
         "type": "switchNode",
         "name": "switch found-related-network",
         "xml": "<switch test='`$found-related-network`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2277.6666145324707,
-        "y": 4039.6912326812744,
-        "z": "9167bcd1.0dd69",
+        "x": 2251.6666145324707,
+        "y": 4053.666932106018,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "b21eb0fb.04ea08"
+                "66365547.f331dc"
             ]
         ]
     },
     {
-        "id": "b21eb0fb.04ea08",
+        "id": "66365547.f331dc",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2471.6666145324707,
-        "y": 4037.6912326812744,
-        "z": "9167bcd1.0dd69",
+        "x": 2445.6666145324707,
+        "y": 4051.666932106018,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "86e33f55.12f7a"
+                "b53b662c.742d2"
             ]
         ]
     },
     {
-        "id": "bc2b0b96.f1ccb",
+        "id": "40a9653b.0b6d7c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unable to find related network '\n      + $db.vnf-related-network-role[$db-related-network-index].related-network-role + ' in vnf-networks'`\" />\n",
         "comments": "",
-        "x": 2749.6666145324707,
-        "y": 4035.6912326812744,
-        "z": "9167bcd1.0dd69",
+        "x": 2723.6666145324707,
+        "y": 4049.666932106018,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "86e33f55.12f7a",
+        "id": "b53b662c.742d2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2601.6666145324707,
-        "y": 4037.6912326812744,
-        "z": "9167bcd1.0dd69",
+        "x": 2575.6666145324707,
+        "y": 4051.666932106018,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "bc2b0b96.f1ccb",
-                "f46bd80d.b62c1"
+                "40a9653b.0b6d7c",
+                "93d1e771.4e016"
             ]
         ]
     },
     {
-        "id": "f46bd80d.b62c1",
+        "id": "93d1e771.4e016",
         "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": 2694.3334159851074,
-        "y": 3800.358123779297,
-        "z": "9167bcd1.0dd69",
+        "x": 2668.3334159851074,
+        "y": 3814.3338232040405,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "d8f45dd9.fffaa",
+        "id": "c9e00ddc.ec7f9",
         "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": 2339.6666145324707,
-        "y": 4087.6912326812744,
-        "z": "9167bcd1.0dd69",
+        "x": 2313.6666145324707,
+        "y": 4101.666932106018,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "dd07d863.1ec54",
+        "id": "ed23f3c3.06c99",
         "type": "switchNode",
         "name": "switch rn-index",
         "xml": "<switch test='`$rn-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2227.6666145324707,
-        "y": 4195.691232681274,
-        "z": "9167bcd1.0dd69",
+        "x": 2201.6666145324707,
+        "y": 4209.666932106018,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a5dcf4c4.8aa428"
+                "d39e156e.f32e6"
             ]
         ]
     },
     {
-        "id": "d55dcbe4.b448d8",
+        "id": "5f1709b2.75df38",
         "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": 2299.6666145324707,
-        "y": 4139.691232681274,
-        "z": "9167bcd1.0dd69",
+        "x": 2273.6666145324707,
+        "y": 4153.666932106018,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "a5dcf4c4.8aa428",
+        "id": "d39e156e.f32e6",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 2391.6666145324707,
-        "y": 4195.691232681274,
-        "z": "9167bcd1.0dd69",
+        "x": 2365.6666145324707,
+        "y": 4209.666932106018,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "aaf887bc.8a7d1"
+                "fa5ee6e9.4c4208"
             ]
         ]
     },
     {
-        "id": "aaf887bc.8a7d1",
+        "id": "fa5ee6e9.4c4208",
         "type": "set",
         "name": "set rn-index to 0",
         "xml": "<set>\n<parameter name='rn-index' value='0' />\n",
         "comments": "",
-        "x": 2551.6666145324707,
-        "y": 4195.691232681274,
-        "z": "9167bcd1.0dd69",
+        "x": 2525.6666145324707,
+        "y": 4209.666932106018,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "66d1505f.39733",
+        "id": "801aa393.e7c828",
         "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": 2251.6666145324707,
-        "y": 4247.691232681274,
-        "z": "9167bcd1.0dd69",
+        "x": 2225.6666145324707,
+        "y": 4261.666932106018,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "9bb872f6.753258",
+        "id": "bc7278c.42fbb88",
         "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": 2269.6666145324707,
-        "y": 4299.691232681274,
-        "z": "9167bcd1.0dd69",
+        "x": 2243.6666145324707,
+        "y": 4313.666932106018,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "44f2cc37.a78364",
+        "id": "c6074e1a.a9bd",
         "type": "switchNode",
         "name": "switch found-related-network",
         "xml": "<switch test='`$found-related-network`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2666.6666679382324,
-        "y": 3988.357879638672,
-        "z": "9167bcd1.0dd69",
+        "x": 2640.6666679382324,
+        "y": 4002.3335790634155,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "21303fe3.7cc7a8"
+                "8293e055.0b529"
             ]
         ]
     },
     {
-        "id": "21303fe3.7cc7a8",
+        "id": "8293e055.0b529",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2863.3335304260254,
-        "y": 3988.3582515716553,
-        "z": "9167bcd1.0dd69",
+        "x": 2837.3335304260254,
+        "y": 4002.333950996399,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "c3c23e6e.f406e8"
+                "acab0841.3643f8"
             ]
         ]
     },
     {
-        "id": "c3c23e6e.f406e8",
+        "id": "acab0841.3643f8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2993.3334159851074,
-        "y": 3986.691375732422,
-        "z": "9167bcd1.0dd69",
+        "x": 2967.3334159851074,
+        "y": 4000.6670751571655,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "334d9e50.554812",
+        "id": "742ee78e.6f2f6",
         "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": 3433.3336296081543,
-        "y": 3938.3582496643066,
-        "z": "9167bcd1.0dd69",
+        "x": 3407.3336296081543,
+        "y": 3952.3339490890503,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "b8c9d127.4eec38",
+        "id": "6499d375.d639b4",
         "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": 1722.2381210327148,
-        "y": 4967.882302761078,
-        "z": "9167bcd1.0dd69",
+        "x": 1696.2381210327148,
+        "y": 4981.8580021858215,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "aaf32437.4cef88",
+        "id": "3db114ad.dcb564",
         "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": 1703.90474319458,
-        "y": 5034.5488085746765,
-        "z": "9167bcd1.0dd69",
+        "x": 1677.90474319458,
+        "y": 5048.52450799942,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "45f81af2.00ca24",
-                "cfdaff5f.4d6de8"
+                "9e0f4fdf.dbdf98",
+                "1b0cb761.91e779"
             ]
         ]
     },
     {
-        "id": "45f81af2.00ca24",
+        "id": "9e0f4fdf.dbdf98",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1892.9047241210938,
-        "y": 5010.215422093868,
-        "z": "9167bcd1.0dd69",
+        "x": 1866.9047241210938,
+        "y": 5024.191121518612,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "b0518f34.cac6c"
+                "c9632036.0de2a8"
             ]
         ]
     },
     {
-        "id": "b0518f34.cac6c",
+        "id": "c9632036.0de2a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2060.0714721679688,
-        "y": 5026.009855687618,
-        "z": "9167bcd1.0dd69",
+        "x": 2034.0714721679688,
+        "y": 5039.985555112362,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a5df6a1f.787e3",
-                "3db10379.cadefc"
+                "6abd6309.f3a80c",
+                "5306b235.f40434"
             ]
         ]
     },
     {
-        "id": "cfdaff5f.4d6de8",
+        "id": "1b0cb761.91e779",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1897.9047241210938,
-        "y": 5059.881681859493,
-        "z": "9167bcd1.0dd69",
+        "x": 1871.9047241210938,
+        "y": 5073.857381284237,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "b0518f34.cac6c"
+                "c9632036.0de2a8"
             ]
         ]
     },
     {
-        "id": "a5df6a1f.787e3",
+        "id": "6abd6309.f3a80c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error creating cp object in AAI\" />\n",
         "comments": "",
-        "x": 2225.5714836120605,
-        "y": 5037.8820605278015,
-        "z": "9167bcd1.0dd69",
+        "x": 2199.5714836120605,
+        "y": 5051.857759952545,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "bc7e2484.e69228",
+        "id": "c0124012.781378",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1498.714443206787,
-        "y": 5237.167096614838,
-        "z": "9167bcd1.0dd69",
+        "x": 1472.714443206787,
+        "y": 5251.142796039581,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "134d490c.25b81f",
-                "502f6d13.ee70cc",
-                "b8c9d127.4eec38",
-                "aaf32437.4cef88",
-                "9ac4ad9c.d842",
-                "7ff418af.f0a608"
+                "d25d14c8.b399b8",
+                "5fca11f4.669f4",
+                "6499d375.d639b4",
+                "3db114ad.dcb564",
+                "248610c9.0e15e",
+                "b11e623d.b5492"
             ]
         ]
     },
     {
-        "id": "134d490c.25b81f",
+        "id": "d25d14c8.b399b8",
         "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": 1734.2382850646973,
-        "y": 5112.406378269196,
-        "z": "9167bcd1.0dd69",
+        "x": 1708.2382850646973,
+        "y": 5126.382077693939,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "16d827bf.761bd",
+        "id": "68b0a887.307e58",
         "type": "comment",
         "name": "Floating IPs",
         "info": "",
         "comments": "",
-        "x": 1295.0001029968262,
-        "y": 6094.691496551037,
-        "z": "9167bcd1.0dd69",
+        "x": 1269.0001029968262,
+        "y": 6108.6671959757805,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "9ac4ad9c.d842",
+        "id": "248610c9.0e15e",
         "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": 1718.3332862854004,
-        "y": 5508.691872119904,
-        "z": "9167bcd1.0dd69",
+        "x": 1692.3332862854004,
+        "y": 5522.667571544647,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "36b35f12.bc0638"
+                "62bb1af7.8a69a4"
             ]
         ]
     },
     {
-        "id": "a55f1caf.a65878",
+        "id": "b1ff62bf.b7b008",
         "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": 2356.6667671203613,
-        "y": 5508.358379840851,
-        "z": "9167bcd1.0dd69",
+        "x": 2330.6667671203613,
+        "y": 5522.3340792655945,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "2783a294.d9970e",
-                "26e2d614.94cbb2"
+                "d91ef2a1.cec1a",
+                "4d40fb59.ff273c"
             ]
         ]
     },
     {
-        "id": "fb9b2db7.a119f",
+        "id": "767b44d.6e18fbc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2728.4998054504395,
-        "y": 5481.6763281822205,
-        "z": "9167bcd1.0dd69",
+        "x": 2702.4998054504395,
+        "y": 5495.652027606964,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4f31fc68.c1e6b4",
-                "31ec22c4.51ea5e"
+                "21d7f3dd.742d5c",
+                "a4df0ca4.d12fc8"
             ]
         ]
     },
     {
-        "id": "fff4f3ff.1947f8",
+        "id": "f7d542c9.1503d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2728.4998817443848,
-        "y": 5534.676086902618,
-        "z": "9167bcd1.0dd69",
+        "x": 2702.4998817443848,
+        "y": 5548.651786327362,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4f31fc68.c1e6b4",
-                "15135e2c.b33e5a"
+                "21d7f3dd.742d5c",
+                "f30ea0fd.c2421"
             ]
         ]
     },
     {
-        "id": "2783a294.d9970e",
+        "id": "d91ef2a1.cec1a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2571.666690826416,
-        "y": 5481.691998004913,
-        "z": "9167bcd1.0dd69",
+        "x": 2545.666690826416,
+        "y": 5495.667697429657,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "fb9b2db7.a119f"
+                "767b44d.6e18fbc"
             ]
         ]
     },
     {
-        "id": "26e2d614.94cbb2",
+        "id": "4d40fb59.ff273c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2580.238224029541,
-        "y": 5534.311142444611,
-        "z": "9167bcd1.0dd69",
+        "x": 2554.238224029541,
+        "y": 5548.286841869354,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "fff4f3ff.1947f8"
+                "f7d542c9.1503d8"
             ]
         ]
     },
     {
-        "id": "31ec22c4.51ea5e",
+        "id": "a4df0ca4.d12fc8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating cp relationship to l3-network in AAI\" />\n",
         "comments": "",
-        "x": 2900.6666145324707,
-        "y": 5504.3587040901175,
-        "z": "9167bcd1.0dd69",
+        "x": 2874.6666145324707,
+        "y": 5518.334403514861,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "15135e2c.b33e5a",
+        "id": "f30ea0fd.c2421",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Not-found error updating cp relationship to l3-network\" />\n",
         "comments": "",
-        "x": 2895.833522796631,
-        "y": 5556.009911060332,
-        "z": "9167bcd1.0dd69",
+        "x": 2869.833522796631,
+        "y": 5569.985610485076,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "4f31fc68.c1e6b4",
+        "id": "21d7f3dd.742d5c",
         "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": 3102.3333778381348,
-        "y": 5454.35870218277,
-        "z": "9167bcd1.0dd69",
+        "x": 3076.3333778381348,
+        "y": 5468.334401607513,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "7ff418af.f0a608",
+        "id": "b11e623d.b5492",
         "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": 1718.333438873291,
-        "y": 5669.35822725296,
-        "z": "9167bcd1.0dd69",
+        "x": 1692.333438873291,
+        "y": 5683.333926677704,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "77662062.8159c"
+                "4dd5a013.e9e42"
             ]
         ]
     },
     {
-        "id": "fb03ccd9.dcf8d8",
+        "id": "81d2246c.8ca24",
         "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": 2638.00044631958,
-        "y": 5667.358222484589,
-        "z": "9167bcd1.0dd69",
+        "x": 2612.00044631958,
+        "y": 5681.333921909332,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "3ba6953f.154e12",
-                "dd2a018a.ddecf"
+                "6f2d5835.8b06e8",
+                "6af35271.e80934"
             ]
         ]
     },
     {
-        "id": "25b1ce59.35b64a",
+        "id": "aec56c50.11c2b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3044.8334922790527,
-        "y": 5640.67552137375,
-        "z": "9167bcd1.0dd69",
+        "x": 3018.8334922790527,
+        "y": 5654.651220798493,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "43ea6b39.724e64",
-                "4f31fc68.c1e6b4"
+                "e619b229.08af08",
+                "21d7f3dd.742d5c"
             ]
         ]
     },
     {
-        "id": "776418cc.650358",
+        "id": "772066d4.b53278",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3044.833568572998,
-        "y": 5693.675280094148,
-        "z": "9167bcd1.0dd69",
+        "x": 3018.833568572998,
+        "y": 5707.650979518891,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "177fa68d.607ac9",
-                "4f31fc68.c1e6b4"
+                "31e4d0b4.6f2ea8",
+                "21d7f3dd.742d5c"
             ]
         ]
     },
     {
-        "id": "3ba6953f.154e12",
+        "id": "6f2d5835.8b06e8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2888.0003776550293,
-        "y": 5640.691191196443,
-        "z": "9167bcd1.0dd69",
+        "x": 2862.0003776550293,
+        "y": 5654.666890621186,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "25b1ce59.35b64a"
+                "aec56c50.11c2b8"
             ]
         ]
     },
     {
-        "id": "dd2a018a.ddecf",
+        "id": "6af35271.e80934",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2896.5719108581543,
-        "y": 5693.31033563614,
-        "z": "9167bcd1.0dd69",
+        "x": 2870.5719108581543,
+        "y": 5707.2860350608835,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "776418cc.650358"
+                "772066d4.b53278"
             ]
         ]
     },
     {
-        "id": "43ea6b39.724e64",
+        "id": "e619b229.08af08",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating cp relationship to l3-network and vlan-tag in AAI\" />\n",
         "comments": "",
-        "x": 3217.000301361084,
-        "y": 5663.357897281647,
-        "z": "9167bcd1.0dd69",
+        "x": 3191.000301361084,
+        "y": 5677.33359670639,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "177fa68d.607ac9",
+        "id": "31e4d0b4.6f2ea8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Not-found error updating cp relationship to l3-network and vlan-tag\" />\n",
         "comments": "",
-        "x": 3212.167209625244,
-        "y": 5715.009104251862,
-        "z": "9167bcd1.0dd69",
+        "x": 3186.167209625244,
+        "y": 5728.984803676605,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "f4be9dce.3fda3",
+        "id": "6d38b4de.53c2e4",
         "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": 2334.0002784729004,
-        "y": 5667.358223438263,
-        "z": "9167bcd1.0dd69",
+        "x": 2308.0002784729004,
+        "y": 5681.333922863007,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "fb03ccd9.dcf8d8"
+                "81d2246c.8ca24"
             ]
         ]
     },
     {
-        "id": "8534c826.13da18",
+        "id": "a248e487.7d841",
         "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": 592.3335723876953,
-        "y": 6910.358483910561,
-        "z": "9167bcd1.0dd69",
+        "x": 566.3335723876953,
+        "y": 6924.334183335304,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "75790bd1.e8defc",
+        "id": "bf14b0a9.d3e2d",
         "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": 413.6669006347656,
-        "y": 6958.358586907387,
-        "z": "9167bcd1.0dd69",
+        "x": 387.6669006347656,
+        "y": 6972.33428633213,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "c898fd55.fa0688",
+        "id": "56373ee9.f19b2",
         "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": 565.0000038146973,
-        "y": 2394.191044807434,
-        "z": "9167bcd1.0dd69",
+        "x": 539.0000038146973,
+        "y": 2408.1667442321777,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "ba4d5614.642188",
-                "37d64c51.9cd974"
+                "ce9ac2f5.cd33d",
+                "de25859e.aa53b8"
             ]
         ]
     },
     {
-        "id": "ba4d5614.642188",
+        "id": "ce9ac2f5.cd33d",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 764.9999961853027,
-        "y": 2371.690947532654,
-        "z": "9167bcd1.0dd69",
+        "x": 738.9999961853027,
+        "y": 2385.6666469573975,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a37b13e8.33b938"
+                "751c0b43.04587c"
             ]
         ]
     },
     {
-        "id": "37d64c51.9cd974",
+        "id": "de25859e.aa53b8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 765.4285888671875,
-        "y": 2421.81005859375,
-        "z": "9167bcd1.0dd69",
+        "x": 739.4285888671875,
+        "y": 2435.7857580184937,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "6529b298.61d4a4"
+                "c68814e7.3e7978"
             ]
         ]
     },
     {
-        "id": "6553babe.5f42ac",
+        "id": "506d6b1c.ec80dc",
         "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": 1322.5001029968262,
-        "y": 3189.190721511841,
-        "z": "9167bcd1.0dd69",
+        "x": 1296.5001029968262,
+        "y": 3203.1664209365845,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "13b1a341.f7194d"
+                "2294ba3f.d84456"
             ]
         ]
     },
     {
-        "id": "13b1a341.f7194d",
+        "id": "2294ba3f.d84456",
         "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": 1570.8333625793457,
-        "y": 3189.190721511841,
-        "z": "9167bcd1.0dd69",
+        "x": 1544.8333625793457,
+        "y": 3203.1664209365845,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a495cd13.ac3888"
+                "b67cbf0d.afed4"
             ]
         ]
     },
     {
-        "id": "f1de476.813b738",
+        "id": "61b10d9d.cb5ec4",
         "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": 528.3332786560059,
-        "y": 2907.52405834198,
-        "z": "9167bcd1.0dd69",
+        "x": 502.33327865600586,
+        "y": 2921.4997577667236,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "5d8aed8b.1bdc24"
+                "5cb28855.a7cb48"
             ]
         ]
     },
     {
-        "id": "5d8aed8b.1bdc24",
+        "id": "5cb28855.a7cb48",
         "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": 710.000057220459,
-        "y": 2906.191206932068,
-        "z": "9167bcd1.0dd69",
+        "x": 684.000057220459,
+        "y": 2920.1669063568115,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "8556a0d3.b51ac"
+                "8d269e15.726ee8"
             ]
         ]
     },
     {
-        "id": "8556a0d3.b51ac",
+        "id": "8d269e15.726ee8",
         "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": 911.1666297912598,
-        "y": 2906.023896217346,
-        "z": "9167bcd1.0dd69",
+        "x": 885.1666297912598,
+        "y": 2919.99959564209,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "6e901201.85a804"
+                "1c614ad3.f890f5"
             ]
         ]
     },
     {
-        "id": "6e901201.85a804",
+        "id": "1c614ad3.f890f5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1123.3333015441895,
-        "y": 2905.024256706238,
-        "z": "9167bcd1.0dd69",
+        "x": 1097.3333015441895,
+        "y": 2918.9999561309814,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "914f0e01.802e08",
-                "2226678b.986958",
-                "26a1009d.f04208",
-                "6553babe.5f42ac"
+                "9befab67.ec4df",
+                "eba3a652.01819",
+                "2e4be547.9f8b3a",
+                "506d6b1c.ec80dc"
             ]
         ]
     },
     {
-        "id": "914f0e01.802e08",
+        "id": "9befab67.ec4df",
         "type": "set",
         "name": "set vnf-network-index to -1",
         "xml": "<set>\n<parameter name='vnf-network-index' value='-1' />\n",
         "comments": "",
-        "x": 1335.0000190734863,
-        "y": 2858.35747051239,
-        "z": "9167bcd1.0dd69",
+        "x": 1309.0000190734863,
+        "y": 2872.333169937134,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "2226678b.986958",
+        "id": "eba3a652.01819",
         "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": 1316.6668090820312,
-        "y": 2905.0242223739624,
-        "z": "9167bcd1.0dd69",
+        "x": 1290.6668090820312,
+        "y": 2918.999921798706,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "90d45d40.9fed1"
+                "6078ccfd.ea944c"
             ]
         ]
     },
     {
-        "id": "90d45d40.9fed1",
+        "id": "6078ccfd.ea944c",
         "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": 1558.3332786560059,
-        "y": 2903.357717514038,
-        "z": "9167bcd1.0dd69",
+        "x": 1532.3332786560059,
+        "y": 2917.3334169387817,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "b1008fcb.57c808"
+                "d84c654.fa00798"
             ]
         ]
     },
     {
-        "id": "b1008fcb.57c808",
+        "id": "d84c654.fa00798",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1754.99995803833,
-        "y": 2903.357636451721,
-        "z": "9167bcd1.0dd69",
+        "x": 1728.99995803833,
+        "y": 2917.333335876465,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "c0752eeb.157cc"
+                "2b9ee331.dce634"
             ]
         ]
     },
     {
-        "id": "c0752eeb.157cc",
+        "id": "2b9ee331.dce634",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1908.333179473877,
-        "y": 2903.357508659363,
-        "z": "9167bcd1.0dd69",
+        "x": 1882.333179473877,
+        "y": 2917.3332080841064,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "aa9d4976.24874",
-                "14a1e383.35ce54",
-                "d1f1e28b.e998b"
+                "f732773f.abd008",
+                "432b5764.5f12d",
+                "dceb937d.7cbe3"
             ]
         ]
     },
     {
-        "id": "aa9d4976.24874",
+        "id": "f732773f.abd008",
         "type": "set",
         "name": "set vnf-network-index",
         "xml": "<set>\n<parameter name='vnf-network-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 2115.000011444092,
-        "y": 2851.6908864974976,
-        "z": "9167bcd1.0dd69",
+        "x": 2089.000011444092,
+        "y": 2865.666585922241,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "14a1e383.35ce54",
+        "id": "432b5764.5f12d",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2069.999927520752,
-        "y": 2941.6908073425293,
-        "z": "9167bcd1.0dd69",
+        "x": 2043.999927520752,
+        "y": 2955.666506767273,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "26a1009d.f04208",
+        "id": "2e4be547.9f8b3a",
         "type": "switchNode",
         "name": "switch vnf-network-index",
         "xml": "<switch test='`$vnf-network-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1328.3333473205566,
-        "y": 2965.024224281311,
-        "z": "9167bcd1.0dd69",
+        "x": 1302.3333473205566,
+        "y": 2978.9999237060547,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "d0a470bb.1e44a8"
+                "3d957fc7.96b0d8"
             ]
         ]
     },
     {
-        "id": "d0a470bb.1e44a8",
+        "id": "3d957fc7.96b0d8",
         "type": "outcome",
         "name": "-1",
         "xml": "<outcome value='-1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1519.9999885559082,
-        "y": 2965.024468421936,
-        "z": "9167bcd1.0dd69",
+        "x": 1493.9999885559082,
+        "y": 2979.0001678466797,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "f884f987.8fb5f"
+                "b4602d48.9b452"
             ]
         ]
     },
     {
-        "id": "f884f987.8fb5f",
+        "id": "b4602d48.9b452",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1668.333179473877,
-        "y": 2963.357508659363,
-        "z": "9167bcd1.0dd69",
+        "x": 1642.333179473877,
+        "y": 2977.3332080841064,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "89311515.bf059",
-                "d72a7284.bd122"
+                "db1b6914.38bb2",
+                "cb224311.28b7c8"
             ]
         ]
     },
     {
-        "id": "89311515.bf059",
+        "id": "db1b6914.38bb2",
         "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": 3196.6668128967285,
-        "y": 2815.024085998535,
-        "z": "9167bcd1.0dd69",
+        "x": 3170.6668128967285,
+        "y": 2828.999785423279,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "d72a7284.bd122",
+        "id": "cb224311.28b7c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'VNFC network role '\n      + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-network-role\n      + ' is not found in VNF network list'\n      `\" />\n\n\n\n",
         "comments": "",
-        "x": 1836.6665534973145,
-        "y": 2981.690760612488,
-        "z": "9167bcd1.0dd69",
+        "x": 1810.6665534973145,
+        "y": 2995.6664600372314,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "e074c1fb.288db",
+        "id": "776dc3af.6ef3ec",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2359.999897003174,
-        "y": 3373.3573598861694,
-        "z": "9167bcd1.0dd69",
+        "x": 2333.999897003174,
+        "y": 3387.333059310913,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "c84bee67.a01c",
-                "7e827224.b98a54",
-                "158ff27d.f681fe"
+                "144772ce.885bed",
+                "9a72e7d3.0207b8",
+                "5ab022e0.76ab7c"
             ]
         ]
     },
     {
-        "id": "c84bee67.a01c",
+        "id": "144772ce.885bed",
         "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": 2556.666648864746,
-        "y": 3328.3572788238525,
-        "z": "9167bcd1.0dd69",
+        "x": 2530.666648864746,
+        "y": 3342.332978248596,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "db92134e.c11958"
+                "746b4322.9622a4"
             ]
         ]
     },
     {
-        "id": "db92134e.c11958",
+        "id": "746b4322.9622a4",
         "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": 2783.3332748413086,
-        "y": 3328.3572788238525,
-        "z": "9167bcd1.0dd69",
+        "x": 2757.3332748413086,
+        "y": 3342.332978248596,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "664e2d50.db9864"
+                "e6434ad2.bae308"
             ]
         ]
     },
     {
-        "id": "664e2d50.db9864",
+        "id": "e6434ad2.bae308",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2963.333240509033,
-        "y": 3328.3576850891113,
-        "z": "9167bcd1.0dd69",
+        "x": 2937.333240509033,
+        "y": 3342.333384513855,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "86f838f7.8fb2d8"
+                "efbac697.5d7758"
             ]
         ]
     },
     {
-        "id": "53f781b3.123d98",
+        "id": "4e05f98.a5bdf08",
         "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": 2388.3332328796387,
-        "y": 3191.690773010254,
-        "z": "9167bcd1.0dd69",
+        "x": 2362.3332328796387,
+        "y": 3205.6664724349976,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "a495cd13.ac3888",
+        "id": "b67cbf0d.afed4",
         "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": 1833.3335762023926,
-        "y": 3188.357808113098,
-        "z": "9167bcd1.0dd69",
+        "x": 1807.3335762023926,
+        "y": 3202.333507537842,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "39bb02f5.1a9bde",
-                "1e32cfbf.18065",
-                "c36c4aab.2dd96"
+                "6b6ccf2e.67b5b8",
+                "3fd9179d.ef197",
+                "bf6a8d08.4bbdb8"
             ]
         ]
     },
     {
-        "id": "39bb02f5.1a9bde",
+        "id": "6b6ccf2e.67b5b8",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 2035.000087738037,
-        "y": 3088.3573513031006,
-        "z": "9167bcd1.0dd69",
+        "x": 2009.000087738037,
+        "y": 3102.3330507278442,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "6c7a9e2c.5ffe28"
+                "3d6c6945.2371a6"
             ]
         ]
     },
     {
-        "id": "1e32cfbf.18065",
+        "id": "3fd9179d.ef197",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2031.4287185668945,
-        "y": 3274.309642791748,
-        "z": "9167bcd1.0dd69",
+        "x": 2005.4287185668945,
+        "y": 3288.2853422164917,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "cb710085.b13e"
+                "655717fb.4876b"
             ]
         ]
     },
     {
-        "id": "6c7a9e2c.5ffe28",
+        "id": "3d6c6945.2371a6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2166.6666374206543,
-        "y": 3111.0240983963013,
-        "z": "9167bcd1.0dd69",
+        "x": 2140.6666374206543,
+        "y": 3124.999797821045,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "2ea4d244.10a91e",
+        "id": "adf045e3.123d",
         "type": "set",
         "name": "set subnet-id to -1",
         "xml": "<set>\n<parameter name='subnet-id' value='-1' />\n",
         "comments": "",
-        "x": 3056.6671562194824,
-        "y": 3490.0247650146484,
-        "z": "9167bcd1.0dd69",
+        "x": 3030.6671562194824,
+        "y": 3504.000464439392,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "cb710085.b13e",
+        "id": "655717fb.4876b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2185.0001335144043,
-        "y": 3273.3572750091553,
-        "z": "9167bcd1.0dd69",
+        "x": 2159.0001335144043,
+        "y": 3287.332974433899,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "53f781b3.123d98",
-                "e074c1fb.288db"
+                "4e05f98.a5bdf08",
+                "776dc3af.6ef3ec"
             ]
         ]
     },
     {
-        "id": "fd601bae.1a1768",
+        "id": "87d327c8.e4f89",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4316.666753768921,
-        "y": 3661.691241979599,
-        "z": "9167bcd1.0dd69",
+        "x": 4290.666753768921,
+        "y": 3675.6669414043427,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "3b599124.ddda26",
-                "f1ce1b9b.c5713"
+                "cda91ba0.8167c",
+                "3842836d.d40cec"
             ]
         ]
     },
     {
-        "id": "f1ce1b9b.c5713",
+        "id": "3842836d.d40cec",
         "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": 4531.6667556762695,
-        "y": 3711.690915822983,
-        "z": "9167bcd1.0dd69",
+        "x": 4505.6667556762695,
+        "y": 3725.6666152477264,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "286c5f74.70fde"
+                "625dc384.31bfcc"
             ]
         ]
     },
     {
-        "id": "3b599124.ddda26",
+        "id": "cda91ba0.8167c",
         "type": "switchNode",
         "name": "switch tmp.address-family",
         "xml": "<switch test='`$tmp.address-family`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4533.333911895752,
-        "y": 3618.357902288437,
-        "z": "9167bcd1.0dd69",
+        "x": 4507.333911895752,
+        "y": 3632.3336017131805,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "f9adff66.6ab258",
-                "23a24dc2.1a7102"
+                "5ce62256.5b3ecc",
+                "3ec18a61.4053a6"
             ]
         ]
     },
     {
-        "id": "f9adff66.6ab258",
+        "id": "5ce62256.5b3ecc",
         "type": "outcome",
         "name": "ipv4",
         "xml": "<outcome value='ipv4'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4736.667174021402,
-        "y": 3591.6911326249437,
-        "z": "9167bcd1.0dd69",
+        "x": 4710.667174021402,
+        "y": 3605.6668320496874,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "dc9baf82.fb366"
+                "39db5660.d28ed2"
             ]
         ]
     },
     {
-        "id": "23a24dc2.1a7102",
+        "id": "3ec18a61.4053a6",
         "type": "outcome",
         "name": "ipv6",
         "xml": "<outcome value='ipv6'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4736.666847229004,
-        "y": 3638.3576600551605,
-        "z": "9167bcd1.0dd69",
+        "x": 4710.666847229004,
+        "y": 3652.333359479904,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "9777e060.2e3dc"
+                "48ff8671.c333f8"
             ]
         ]
     },
     {
-        "id": "dc9baf82.fb366",
+        "id": "39db5660.d28ed2",
         "type": "set",
         "name": "set ip-type parameter to IPv4",
         "xml": "<set>\n<parameter name='ip-type' value='IPv4' />\n",
         "comments": "",
-        "x": 4933.333660125732,
-        "y": 3590.0246064662933,
-        "z": "9167bcd1.0dd69",
+        "x": 4907.333660125732,
+        "y": 3604.000305891037,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "9777e060.2e3dc",
+        "id": "48ff8671.c333f8",
         "type": "set",
         "name": "set ip-type parameter to IPv6",
         "xml": "<set>\n<parameter name='ip-type' value='IPv6' />\n",
         "comments": "",
-        "x": 4938.33353805542,
-        "y": 3638.357679128647,
-        "z": "9167bcd1.0dd69",
+        "x": 4912.33353805542,
+        "y": 3652.3333785533905,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "7c5bee11.1ed9d",
+        "id": "3df4f091.0048b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4871.666786193848,
-        "y": 3711.357679128647,
-        "z": "9167bcd1.0dd69",
+        "x": 4845.666786193848,
+        "y": 3725.3333785533905,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "b5ad4567.eb0b98",
-                "3214e32a.ac2af4"
+                "3a1246c3.df08aa",
+                "3192bd4f.0a0cfa"
             ]
         ]
     },
     {
-        "id": "b5ad4567.eb0b98",
+        "id": "3a1246c3.df08aa",
         "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": 5050.000106811523,
-        "y": 3688.024165868759,
-        "z": "9167bcd1.0dd69",
+        "x": 5024.000106811523,
+        "y": 3701.999865293503,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "3214e32a.ac2af4",
+        "id": "3192bd4f.0a0cfa",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5035.000110626221,
-        "y": 3734.691159963608,
-        "z": "9167bcd1.0dd69",
+        "x": 5009.000110626221,
+        "y": 3748.6668593883514,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "2cb5307a.bb967",
+        "id": "95331b2d.c7076",
         "type": "switchNode",
         "name": "switch subnet-id",
         "xml": "<switch test='`$subnet-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3048.3330307006836,
-        "y": 3651.691499710083,
-        "z": "9167bcd1.0dd69",
+        "x": 3022.3330307006836,
+        "y": 3665.6671991348267,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4eaebda7.88a464"
+                "802e0846.88a4c"
             ]
         ]
     },
     {
-        "id": "4eaebda7.88a464",
+        "id": "802e0846.88a4c",
         "type": "outcome",
         "name": "-1",
         "xml": "<outcome value='-1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3204.99959564209,
-        "y": 3651.6914348602295,
-        "z": "9167bcd1.0dd69",
+        "x": 3178.99959564209,
+        "y": 3665.667134284973,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "c969c7c1.3acfe8"
+                "565a3c94.98b2b4"
             ]
         ]
     },
     {
-        "id": "c969c7c1.3acfe8",
+        "id": "565a3c94.98b2b4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3353.3327865600586,
-        "y": 3650.0244750976562,
-        "z": "9167bcd1.0dd69",
+        "x": 3327.3327865600586,
+        "y": 3664.0001745224,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "48e52ed2.21ebb",
-                "89311515.bf059"
+                "f83ab611.b83f78",
+                "db1b6914.38bb2"
             ]
         ]
     },
     {
-        "id": "48e52ed2.21ebb",
+        "id": "f83ab611.b83f78",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Not able to find VNF network subnet that contains address '\n      + $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vnfc-names[$vnfc-index].vnfc-networks.vnfc-network-data[$vnfc-network-index].vnfc-subnet[$subnet-role-index].vnfc-ip-assignments[$address-family-index].vnfc-subnet-ip[0].vnfc-ip-address\n      `\" />\n\n\n\n",
         "comments": "",
-        "x": 3521.666118621826,
-        "y": 3666.6909503936768,
-        "z": "9167bcd1.0dd69",
+        "x": 3495.666118621826,
+        "y": 3680.6666498184204,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "5fd2a555.9c69d4",
+        "id": "66e17899.8fb72",
         "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": 3159.9996757507324,
-        "y": 3728.3582706451416,
-        "z": "9167bcd1.0dd69",
+        "x": 3133.9996757507324,
+        "y": 3742.3339700698853,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "709b1630.8dd8b8",
+        "id": "758d4da0.c2995c",
         "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": 513.3332710266113,
-        "y": 3323.357508659363,
-        "z": "9167bcd1.0dd69",
+        "x": 487.3332710266113,
+        "y": 3337.3332080841064,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "286c5f74.70fde",
+        "id": "625dc384.31bfcc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4718.333358764648,
-        "y": 3711.691404104233,
-        "z": "9167bcd1.0dd69",
+        "x": 4692.333358764648,
+        "y": 3725.6671035289764,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "7c5bee11.1ed9d"
+                "3df4f091.0048b8"
             ]
         ]
     },
     {
-        "id": "d1f1e28b.e998b",
+        "id": "dceb937d.7cbe3",
         "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": 2091.666515350342,
-        "y": 2896.690969467163,
-        "z": "9167bcd1.0dd69",
+        "x": 2065.666515350342,
+        "y": 2910.6666688919067,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "6f6678f2.1bf2e",
+        "id": "3812039f.e87b54",
         "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": 1289.9999809265137,
-        "y": 4511.690697193146,
-        "z": "9167bcd1.0dd69",
+        "x": 1263.9999809265137,
+        "y": 4525.666396617889,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "726b02e.fd1c97c",
-                "21ecd530.fb8122"
+                "1f2b4bc0.e1061c",
+                "dc5a09b5.b67728"
             ]
         ]
     },
     {
-        "id": "726b02e.fd1c97c",
+        "id": "1f2b4bc0.e1061c",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1474.999927520752,
-        "y": 4486.690515995026,
-        "z": "9167bcd1.0dd69",
+        "x": 1448.999927520752,
+        "y": 4500.666215419769,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "46b7d4f1.8d2604"
+                "5c26838f.96ae2c"
             ]
         ]
     },
     {
-        "id": "21ecd530.fb8122",
+        "id": "dc5a09b5.b67728",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1473.095199584961,
-        "y": 4533.476343631744,
-        "z": "9167bcd1.0dd69",
+        "x": 1447.095199584961,
+        "y": 4547.452043056488,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "7ea5f92e.d1edb8"
+                "5a6b4010.6dca68"
             ]
         ]
     },
     {
-        "id": "46b7d4f1.8d2604",
+        "id": "5c26838f.96ae2c",
         "type": "set",
         "name": "set tmp.nfc-naming-code to DEFAULT",
         "xml": "<set>\n<parameter name='tmp.nfc-naming-code' value='DEFAULT' />\n",
         "comments": "",
-        "x": 1706.6666984558105,
-        "y": 4485.023866176605,
-        "z": "9167bcd1.0dd69",
+        "x": 1680.6666984558105,
+        "y": 4498.999565601349,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "7ea5f92e.d1edb8",
+        "id": "5a6b4010.6dca68",
         "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": 1663.333209991455,
-        "y": 4533.357364177704,
-        "z": "9167bcd1.0dd69",
+        "x": 1637.333209991455,
+        "y": 4547.3330636024475,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "c11e7bb7.050ab8",
+        "id": "c84f1dbb.f047b",
         "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": 1278.3333129882812,
-        "y": 4610.023870944977,
-        "z": "9167bcd1.0dd69",
+        "x": 1252.3333129882812,
+        "y": 4623.9995703697205,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "2d809cc8.28629c",
-                "48b0d022.df9368"
+                "77125202.fb825c",
+                "7e12ade.88495d4"
             ]
         ]
     },
     {
-        "id": "2d809cc8.28629c",
+        "id": "77125202.fb825c",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1474.9999198913574,
-        "y": 4585.023668766022,
-        "z": "9167bcd1.0dd69",
+        "x": 1448.9999198913574,
+        "y": 4598.999368190765,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "c6205636.69c938"
+                "90ebf553.d8bfb"
             ]
         ]
     },
     {
-        "id": "48b0d022.df9368",
+        "id": "7e12ade.88495d4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1473.0951919555664,
-        "y": 4631.8094964027405,
-        "z": "9167bcd1.0dd69",
+        "x": 1447.0951919555664,
+        "y": 4645.785195827484,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "6da6c28b.2af50c"
+                "f9029760.f04d1"
             ]
         ]
     },
     {
-        "id": "c6205636.69c938",
+        "id": "90ebf553.d8bfb",
         "type": "set",
         "name": "set tmp.nfc-function to DEFAULT",
         "xml": "<set>\n<parameter name='tmp.nfc-function' value='DEFAULT' />\n",
         "comments": "",
-        "x": 1686.6667022705078,
-        "y": 4583.3568778038025,
-        "z": "9167bcd1.0dd69",
+        "x": 1660.6667022705078,
+        "y": 4597.332577228546,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "6da6c28b.2af50c",
+        "id": "f9029760.f04d1",
         "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": 1644.9998321533203,
-        "y": 4631.690538883209,
-        "z": "9167bcd1.0dd69",
+        "x": 1618.9998321533203,
+        "y": 4645.666238307953,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "8bf1dfbc.51b108",
+        "id": "d11793aa.985d98",
         "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": 2918.3333015441895,
-        "y": 2266.691004753113,
-        "z": "9167bcd1.0dd69",
+        "x": 2892.3333015441895,
+        "y": 2280.6667041778564,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "5f9b54a9.c1cdd4",
+        "id": "854c8589.9f57c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2824.9998054504395,
-        "y": 2341.691004753113,
-        "z": "9167bcd1.0dd69",
+        "x": 2798.9998054504395,
+        "y": 2355.6667041778564,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "c88feb78.b7ccd",
-                "8bf1dfbc.51b108"
+                "4b1cfdbb.d134fc",
+                "d11793aa.985d98"
             ]
         ]
     },
     {
-        "id": "f6f1c5d8.dc0ab",
+        "id": "ce26b35e.dec2c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2029.9998588562012,
-        "y": 2401.6908683776855,
-        "z": "9167bcd1.0dd69",
+        "x": 2003.9998588562012,
+        "y": 2415.666567802429,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "7a69f1ed.4762a8",
-                "8bf1dfbc.51b108"
+                "fae1cd84.a9bd78",
+                "d11793aa.985d98"
             ]
         ]
     },
     {
-        "id": "4331007b.e83998",
+        "id": "e2bf8646.281a5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2291.666723251343,
-        "y": 2456.691035270691,
-        "z": "9167bcd1.0dd69",
+        "x": 2265.666723251343,
+        "y": 2470.6667346954346,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "ff44880b.925a9",
-                "8bf1dfbc.51b108"
+                "19d62bdc.450b0c",
+                "d11793aa.985d98"
             ]
         ]
     },
     {
-        "id": "36b35f12.bc0638",
+        "id": "62bb1af7.8a69a4",
         "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": 1951.6666297912598,
-        "y": 5508.6908984184265,
-        "z": "9167bcd1.0dd69",
+        "x": 1925.6666297912598,
+        "y": 5522.66659784317,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "255ff0a6.4c3e5"
+                "24a675eb.01ffea"
             ]
         ]
     },
     {
-        "id": "255ff0a6.4c3e5",
+        "id": "24a675eb.01ffea",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2150.000099182129,
-        "y": 5508.358053684235,
-        "z": "9167bcd1.0dd69",
+        "x": 2124.000099182129,
+        "y": 5522.333753108978,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a55f1caf.a65878"
+                "b1ff62bf.b7b008"
             ]
         ]
     },
     {
-        "id": "77662062.8159c",
+        "id": "4dd5a013.e9e42",
         "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": 1954.9999732971191,
-        "y": 5668.357346057892,
-        "z": "9167bcd1.0dd69",
+        "x": 1928.9999732971191,
+        "y": 5682.3330454826355,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "ec6e0033.18078"
+                "3ba6fe94.2f5ab2"
             ]
         ]
     },
     {
-        "id": "ec6e0033.18078",
+        "id": "3ba6fe94.2f5ab2",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2153.3334426879883,
-        "y": 5668.0245013237,
-        "z": "9167bcd1.0dd69",
+        "x": 2127.3334426879883,
+        "y": 5682.000200748444,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "f4be9dce.3fda3"
+                "6d38b4de.53c2e4"
             ]
         ]
     },
     {
-        "id": "61dec192.4d7148",
+        "id": "f728c8ba.23c06",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1858.3332557678223,
-        "y": 6246.6907658576965,
-        "z": "9167bcd1.0dd69",
+        "x": 1832.3332557678223,
+        "y": 6260.66646528244,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4d116331.dbe40c",
-                "31e79dcc.7e90fa"
+                "65898e8.b71e1f",
+                "c9e14db9.4027a"
             ]
         ]
     },
     {
-        "id": "5e28153d.aad85c",
+        "id": "63b023e.b6b035c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1860.0000038146973,
-        "y": 6561.690777301788,
-        "z": "9167bcd1.0dd69",
+        "x": 1834.0000038146973,
+        "y": 6575.666476726532,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "6bd05851.cda258",
-                "214cc548.9d2312"
+                "870acd7f.91e8a",
+                "bda1f786.4b7dc8"
             ]
         ]
     },
     {
-        "id": "31e79dcc.7e90fa",
+        "id": "c9e14db9.4027a",
         "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": 2075.000202178955,
-        "y": 6305.023936748505,
-        "z": "9167bcd1.0dd69",
+        "x": 2049.000202178955,
+        "y": 6318.999636173248,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "730f1cc9.69fe4c"
+                "3529b19e.5788ae"
             ]
         ]
     },
     {
-        "id": "4d927385.1d80e4",
+        "id": "24d002ee.ba7fb6",
         "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": 2750.0001258850098,
-        "y": 6305.023775577545,
-        "z": "9167bcd1.0dd69",
+        "x": 2724.0001258850098,
+        "y": 6318.999475002289,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a12b08ff.872da8",
-                "435faa21.8dd73c"
+                "fbd88616.0314c8",
+                "ad2aeb41.4c3638"
             ]
         ]
     },
     {
-        "id": "b7ae4ee8.46c8f8",
+        "id": "39abf173.99c2f6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv4-address-list relationship to cp in AAI\" />\n",
         "comments": "",
-        "x": 3308.3333473205566,
-        "y": 6298.357183933258,
-        "z": "9167bcd1.0dd69",
+        "x": 3282.3333473205566,
+        "y": 6312.332883358002,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "29ab7ac1.d4eea6",
+        "id": "ac48317f.f58318",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Not-found error updating vip-ipv4-address-list relationship to cp\" />\n",
         "comments": "",
-        "x": 3308.500316619873,
-        "y": 6348.341357648373,
-        "z": "9167bcd1.0dd69",
+        "x": 3282.500316619873,
+        "y": 6362.317057073116,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "b1889d0.1a3afe",
+        "id": "1fca7631.b2fcc2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3141.8332176208496,
-        "y": 6278.341557025909,
-        "z": "9167bcd1.0dd69",
+        "x": 3115.8332176208496,
+        "y": 6292.317256450653,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "b7ae4ee8.46c8f8",
-                "2e738df3.a266b2"
+                "39abf173.99c2f6",
+                "197c2a2b.1fd476"
             ]
         ]
     },
     {
-        "id": "84cd1c51.7c62c8",
+        "id": "34023a4a.89eb56",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3141.833293914795,
-        "y": 6331.341315746307,
-        "z": "9167bcd1.0dd69",
+        "x": 3115.833293914795,
+        "y": 6345.317015171051,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "29ab7ac1.d4eea6",
-                "2e738df3.a266b2"
+                "ac48317f.f58318",
+                "197c2a2b.1fd476"
             ]
         ]
     },
     {
-        "id": "a12b08ff.872da8",
+        "id": "fbd88616.0314c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2985.000102996826,
-        "y": 6278.357226848602,
-        "z": "9167bcd1.0dd69",
+        "x": 2959.000102996826,
+        "y": 6292.332926273346,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "b1889d0.1a3afe"
+                "1fca7631.b2fcc2"
             ]
         ]
     },
     {
-        "id": "435faa21.8dd73c",
+        "id": "ad2aeb41.4c3638",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2993.571636199951,
-        "y": 6330.9763712883,
-        "z": "9167bcd1.0dd69",
+        "x": 2967.571636199951,
+        "y": 6344.952070713043,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "84cd1c51.7c62c8"
+                "34023a4a.89eb56"
             ]
         ]
     },
     {
-        "id": "214cc548.9d2312",
+        "id": "bda1f786.4b7dc8",
         "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": 2076.6665992736816,
-        "y": 6628.357346057892,
-        "z": "9167bcd1.0dd69",
+        "x": 2050.6665992736816,
+        "y": 6642.3330454826355,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "c3545be7.a08a58"
+                "4182536a.93a47c"
             ]
         ]
     },
     {
-        "id": "8ae6c277.1259b8",
+        "id": "b51ba59a.baed7",
         "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": 2746.6665534973145,
-        "y": 6626.690128803253,
-        "z": "9167bcd1.0dd69",
+        "x": 2720.6665534973145,
+        "y": 6640.665828227997,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "5f1b56ef.56a3d",
-                "4c3ccc6a.9008ac"
+                "ac5ffd56.e1041",
+                "2f884d53.b07b72"
             ]
         ]
     },
     {
-        "id": "d0696152.132c6",
+        "id": "bc8fa4b3.94381",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv4-address-list relationship to cp in AAI\" />\n",
         "comments": "",
-        "x": 3304.9997749328613,
-        "y": 6620.023537158966,
-        "z": "9167bcd1.0dd69",
+        "x": 3278.9997749328613,
+        "y": 6633.99923658371,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "89aa2cd0.882d5",
+        "id": "d5daac81.1710d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Not-found error updating vip-ipv4-address-list relationship to cp\" />\n",
         "comments": "",
-        "x": 3305.1667442321777,
-        "y": 6670.007710874081,
-        "z": "9167bcd1.0dd69",
+        "x": 3279.1667442321777,
+        "y": 6683.983410298824,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "feaa3d1f.f068f8",
+        "id": "60859e82.35dfa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3138.4996452331543,
-        "y": 6600.007910251617,
-        "z": "9167bcd1.0dd69",
+        "x": 3112.4996452331543,
+        "y": 6613.983609676361,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "d0696152.132c6"
+                "bc8fa4b3.94381"
             ]
         ]
     },
     {
-        "id": "e2f260c.e83a22",
+        "id": "ca90c0a4.de7eb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3138.4997215270996,
-        "y": 6653.007668972015,
-        "z": "9167bcd1.0dd69",
+        "x": 3112.4997215270996,
+        "y": 6666.983368396759,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "89aa2cd0.882d5"
+                "d5daac81.1710d"
             ]
         ]
     },
     {
-        "id": "5f1b56ef.56a3d",
+        "id": "ac5ffd56.e1041",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2981.666530609131,
-        "y": 6600.02358007431,
-        "z": "9167bcd1.0dd69",
+        "x": 2955.666530609131,
+        "y": 6613.999279499054,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "feaa3d1f.f068f8"
+                "60859e82.35dfa"
             ]
         ]
     },
     {
-        "id": "4c3ccc6a.9008ac",
+        "id": "2f884d53.b07b72",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2990.238063812256,
-        "y": 6652.642724514008,
-        "z": "9167bcd1.0dd69",
+        "x": 2964.238063812256,
+        "y": 6666.618423938751,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "e2f260c.e83a22"
+                "ca90c0a4.de7eb"
             ]
         ]
     },
     {
-        "id": "730f1cc9.69fe4c",
+        "id": "3529b19e.5788ae",
         "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": 2328.3332710266113,
-        "y": 6305.023613452911,
-        "z": "9167bcd1.0dd69",
+        "x": 2302.3332710266113,
+        "y": 6318.999312877655,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "de7543a8.d36ff8"
+                "a96bcf8d.d96dc8"
             ]
         ]
     },
     {
-        "id": "de7543a8.d36ff8",
+        "id": "a96bcf8d.d96dc8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2515.000114440918,
-        "y": 6305.024100780487,
-        "z": "9167bcd1.0dd69",
+        "x": 2489.000114440918,
+        "y": 6318.999800205231,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4d927385.1d80e4"
+                "24d002ee.ba7fb6"
             ]
         ]
     },
     {
-        "id": "c3545be7.a08a58",
+        "id": "4182536a.93a47c",
         "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": 2324.9998512268066,
-        "y": 6626.690353870392,
-        "z": "9167bcd1.0dd69",
+        "x": 2298.9998512268066,
+        "y": 6640.6660532951355,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "ad4ca04.6f61ae"
+                "5f4a742e.72fbec"
             ]
         ]
     },
     {
-        "id": "ad4ca04.6f61ae",
+        "id": "5f4a742e.72fbec",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2511.6666946411133,
-        "y": 6626.6908411979675,
-        "z": "9167bcd1.0dd69",
+        "x": 2485.6666946411133,
+        "y": 6640.666540622711,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "8ae6c277.1259b8"
+                "b51ba59a.baed7"
             ]
         ]
     },
     {
-        "id": "59928182.6a1818",
+        "id": "eb0aec5b.3eb2e",
         "type": "comment",
         "name": "SELF-SERVE FORK",
         "info": "",
         "comments": "",
-        "x": 694.7142944335938,
-        "y": 915.0476245880127,
-        "z": "9167bcd1.0dd69",
+        "x": 668.7142944335938,
+        "y": 929.0233240127563,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "4f63954f.60114c",
+        "id": "b506e19a.354fc8",
         "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": 1227.749439239502,
-        "y": 959.964430809021,
-        "z": "9167bcd1.0dd69",
+        "x": 1201.749439239502,
+        "y": 973.9401302337646,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "c903ef6e.5d9028"
+                "872941b.28382c"
             ]
         ]
     },
     {
-        "id": "b3692a00.1ad058",
+        "id": "f8fb5987.004678",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Failed to create self-serve assignment for vf-module with vf-module-id=' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + ' with error: ' + $error-message`\" />\n",
         "comments": "",
-        "x": 1611.820816040039,
-        "y": 959.9643812179565,
-        "z": "9167bcd1.0dd69",
+        "x": 1585.820816040039,
+        "y": 973.9400806427002,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "c903ef6e.5d9028",
+        "id": "872941b.28382c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1448.047019958496,
-        "y": 959.4524621963501,
-        "z": "9167bcd1.0dd69",
+        "x": 1422.047019958496,
+        "y": 973.4281616210938,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "b3692a00.1ad058"
+                "f8fb5987.004678"
             ]
         ]
     },
     {
-        "id": "15551ef3.fbe519",
+        "id": "4a3a0c57.2c22ac",
         "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": 1174.6186828613281,
-        "y": 1109.809350013733,
-        "z": "9167bcd1.0dd69",
+        "x": 1148.6186828613281,
+        "y": 1123.7850494384766,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "f7ab153e.ede618",
+        "id": "52696a3e.207fdc",
         "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": 1166.6662254333496,
-        "y": 1064.3008937835693,
-        "z": "9167bcd1.0dd69",
+        "x": 1140.6662254333496,
+        "y": 1078.276593208313,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "58b9ddbd.c28154",
+        "id": "90d38352.8ab8c8",
         "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": 1237.3567428588867,
-        "y": 1013.2617883682251,
-        "z": "9167bcd1.0dd69",
+        "x": 1211.3567428588867,
+        "y": 1027.2374877929688,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "4c64ed.a697bb14",
+        "id": "58e6d3f7.f000a4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 948.4521713256836,
-        "y": 959.6425924301147,
-        "z": "9167bcd1.0dd69",
+        "x": 922.4521713256836,
+        "y": 973.6182918548584,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4f63954f.60114c",
-                "58b9ddbd.c28154",
-                "f7ab153e.ede618",
-                "15551ef3.fbe519"
+                "b506e19a.354fc8",
+                "90d38352.8ab8c8",
+                "52696a3e.207fdc",
+                "4a3a0c57.2c22ac"
             ]
         ]
     },
     {
-        "id": "ca9d6671.e0234",
+        "id": "df50609c.7dd31",
         "type": "comment",
         "name": "First, count the subnets for this address family",
         "info": "",
         "comments": "",
-        "x": 2690.0004081726074,
-        "y": 3237.9997692108154,
-        "z": "9167bcd1.0dd69",
+        "x": 2664.0004081726074,
+        "y": 3251.975468635559,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "43ee48f3.cff09",
+        "id": "478d4118.5ed98",
         "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": 3063.333095550537,
-        "y": 3533.0002727508545,
-        "z": "9167bcd1.0dd69",
+        "x": 3037.333095550537,
+        "y": 3546.975972175598,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "c2367378.e6cd3"
+                "36dfc31b.a025a4"
             ]
         ]
     },
     {
-        "id": "c2367378.e6cd3",
+        "id": "36dfc31b.a025a4",
         "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": 3289.9997215270996,
-        "y": 3533.0002727508545,
-        "z": "9167bcd1.0dd69",
+        "x": 3263.9997215270996,
+        "y": 3546.975972175598,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a41d108.beda87"
+                "6559a3a7.8910e4"
             ]
         ]
     },
     {
-        "id": "a41d108.beda87",
+        "id": "6559a3a7.8910e4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3469.999687194824,
-        "y": 3533.0006790161133,
-        "z": "9167bcd1.0dd69",
+        "x": 3443.999687194824,
+        "y": 3546.976378440857,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "bbd41071.5f5ca"
+                "6e77fb20.fa3f44"
             ]
         ]
     },
     {
-        "id": "7e827224.b98a54",
+        "id": "9a72e7d3.0207b8",
         "type": "set",
         "name": "set af-count to 0",
         "xml": "<set>\n<parameter name='af-count' value='0' />\n",
         "comments": "",
-        "x": 2544.9999809265137,
-        "y": 3279.6665210723877,
-        "z": "9167bcd1.0dd69",
+        "x": 2518.9999809265137,
+        "y": 3293.6422204971313,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "f96f4d35.ea7948",
+        "id": "8f820716.44125",
         "type": "set",
         "name": "increment af-count",
         "xml": "<set>\n<parameter name='af-count' value='`$af-count + 1`' />\n",
         "comments": "",
-        "x": 3293.3333473205566,
-        "y": 3346.3332710266113,
-        "z": "9167bcd1.0dd69",
+        "x": 3267.3333473205566,
+        "y": 3360.308970451355,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "86f838f7.8fb2d8",
+        "id": "efbac697.5d7758",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3109.9997215270996,
-        "y": 3327.9999561309814,
-        "z": "9167bcd1.0dd69",
+        "x": 3083.9997215270996,
+        "y": 3341.975655555725,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "f96f4d35.ea7948",
-                "2d2924.bfe856dc"
+                "8f820716.44125",
+                "b888ffd3.c0e17"
             ]
         ]
     },
     {
-        "id": "2d2924.bfe856dc",
+        "id": "b888ffd3.c0e17",
         "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": 3274.999767303467,
-        "y": 3301.3332691192627,
-        "z": "9167bcd1.0dd69",
+        "x": 3248.999767303467,
+        "y": 3315.3089685440063,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "158ff27d.f681fe",
+        "id": "5ab022e0.76ab7c",
         "type": "switchNode",
         "name": "switch af-count",
         "xml": "<switch test='`$af-count`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2535.0003929138184,
-        "y": 3516.3334379196167,
-        "z": "9167bcd1.0dd69",
+        "x": 2509.0003929138184,
+        "y": 3530.3091373443604,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "a0b1648c.912158",
-                "70cf3548.bbf294"
+                "908b7a86.e0ec18",
+                "56ed48ea.e8c8b"
             ]
         ]
     },
     {
-        "id": "a0b1648c.912158",
+        "id": "908b7a86.e0ec18",
         "type": "outcome",
         "name": "1",
         "xml": "<outcome value='1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2694.999912261963,
-        "y": 3414.666606903076,
-        "z": "9167bcd1.0dd69",
+        "x": 2668.999912261963,
+        "y": 3428.64230632782,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "ca4eb36c.b27be8"
+                "a5a8ac5f.13f948"
             ]
         ]
     },
     {
-        "id": "ca4eb36c.b27be8",
+        "id": "a5a8ac5f.13f948",
         "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": 2968.3332176208496,
-        "y": 3412.9999561309814,
-        "z": "9167bcd1.0dd69",
+        "x": 2942.3332176208496,
+        "y": 3426.975655555725,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "70cf3548.bbf294",
+        "id": "56ed48ea.e8c8b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2694.999828338623,
-        "y": 3616.333526611328,
-        "z": "9167bcd1.0dd69",
+        "x": 2668.999828338623,
+        "y": 3630.309226036072,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4f40f504.bc667c"
+                "c2900727.bee1c8"
             ]
         ]
     },
     {
-        "id": "4f40f504.bc667c",
+        "id": "c2900727.bee1c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2851.6664695739746,
-        "y": 3616.3332080841064,
-        "z": "9167bcd1.0dd69",
+        "x": 2825.6664695739746,
+        "y": 3630.30890750885,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "2ea4d244.10a91e",
-                "43ee48f3.cff09",
-                "2cb5307a.bb967",
-                "5fd2a555.9c69d4"
+                "adf045e3.123d",
+                "478d4118.5ed98",
+                "95331b2d.c7076",
+                "66e17899.8fb72"
             ]
         ]
     },
     {
-        "id": "bbd41071.5f5ca",
+        "id": "6e77fb20.fa3f44",
         "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": 3664.9998664855957,
-        "y": 3531.333522796631,
-        "z": "9167bcd1.0dd69",
+        "x": 3638.9998664855957,
+        "y": 3545.3092222213745,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "eb9161e6.999df8",
-                "e5973f29.60a6a8"
+                "36c23985.79899e",
+                "37a9f831.2d1a"
             ]
         ]
     },
     {
-        "id": "eb9161e6.999df8",
+        "id": "36c23985.79899e",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 3861.6667137145996,
-        "y": 3466.333133459091,
-        "z": "9167bcd1.0dd69",
+        "x": 3835.6667137145996,
+        "y": 3480.308832883835,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "9175dbd1.90db18"
+                "848c0b2c.e797c"
             ]
         ]
     },
     {
-        "id": "e5973f29.60a6a8",
+        "id": "37a9f831.2d1a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3854.7621116638184,
-        "y": 3600.61904501915,
-        "z": "9167bcd1.0dd69",
+        "x": 3828.7621116638184,
+        "y": 3614.5947444438934,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "f7225223.9cd0a"
+                "c0b64fb2.d819f"
             ]
         ]
     },
     {
-        "id": "f7225223.9cd0a",
+        "id": "c0b64fb2.d819f",
         "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": 4009.9999046325684,
-        "y": 3599.666251897812,
-        "z": "9167bcd1.0dd69",
+        "x": 3983.9999046325684,
+        "y": 3613.6419513225555,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "6dbe50b0.25663",
-                "86c99244.02a7"
+                "f156fcb4.2140f",
+                "f5392a04.2681a8"
             ]
         ]
     },
     {
-        "id": "6dbe50b0.25663",
+        "id": "f156fcb4.2140f",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 4164.999980926514,
-        "y": 3529.6665513515472,
-        "z": "9167bcd1.0dd69",
+        "x": 4138.999980926514,
+        "y": 3543.642250776291,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4ede313d.185d4"
+                "f9c5419d.ddf64"
             ]
         ]
     },
     {
-        "id": "86c99244.02a7",
+        "id": "f5392a04.2681a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4168.095777511597,
-        "y": 3662.2856385707855,
-        "z": "9167bcd1.0dd69",
+        "x": 4142.095777511597,
+        "y": 3676.261337995529,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "fd601bae.1a1768"
+                "87d327c8.e4f89"
             ]
         ]
     },
     {
-        "id": "c36c4aab.2dd96",
+        "id": "bf6a8d08.4bbdb8",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>",
         "comments": "",
         "outputs": 1,
-        "x": 2036.666591644287,
-        "y": 3136.3332080841064,
-        "z": "9167bcd1.0dd69",
+        "x": 2010.666591644287,
+        "y": 3150.30890750885,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "6c7a9e2c.5ffe28"
+                "3d6c6945.2371a6"
             ]
         ]
     },
     {
-        "id": "1a5ed4ff.cd6413",
+        "id": "c5a1b191.b9a848",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'SDNC subnet id '\n      + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].sdnc-subnet-id\n      + ' does not have network-start-address populated'`\" />\n\n\n\n",
         "comments": "",
-        "x": 4170.000217437744,
-        "y": 3481.332970380783,
-        "z": "9167bcd1.0dd69",
+        "x": 4144.000217437744,
+        "y": 3495.3086698055267,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "9175dbd1.90db18",
+        "id": "848c0b2c.e797c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4006.6666412353516,
-        "y": 3466.332900762558,
-        "z": "9167bcd1.0dd69",
+        "x": 3980.6666412353516,
+        "y": 3480.3086001873016,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "1a5ed4ff.cd6413",
-                "89311515.bf059"
+                "c5a1b191.b9a848",
+                "db1b6914.38bb2"
             ]
         ]
     },
     {
-        "id": "f75c2653.dd05c",
+        "id": "6849b69.ce201c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'SDNC subnet id '\n      + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-network-index].subnets-data.subnet-data[$subnet-data-index].sdnc-subnet-id\n      + ' does not have cidr-mask populated'`\" />\n\n\n\n",
         "comments": "",
-        "x": 4475.000072479248,
-        "y": 3542.9998376369476,
-        "z": "9167bcd1.0dd69",
+        "x": 4449.000072479248,
+        "y": 3556.9755370616913,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "4ede313d.185d4",
+        "id": "f9c5419d.ddf64",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4311.6664962768555,
-        "y": 3527.9997680187225,
-        "z": "9167bcd1.0dd69",
+        "x": 4285.6664962768555,
+        "y": 3541.975467443466,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "f75c2653.dd05c",
-                "89311515.bf059"
+                "6849b69.ce201c8",
+                "db1b6914.38bb2"
             ]
         ]
     },
     {
-        "id": "8c5c11fb.d4aaf",
+        "id": "5eefb8ff.6d6f5",
         "type": "comment",
         "name": "Ignore address families with no addresses",
         "info": "",
         "comments": "",
-        "x": 2310.9999656677246,
-        "y": 3066.6667041778564,
-        "z": "9167bcd1.0dd69",
+        "x": 2284.9999656677246,
+        "y": 3080.6424036026,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "dc86b143.7bc0f",
+        "id": "1a6fc532.9edecb",
         "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": 1281.666805267334,
-        "y": 4696.333082199097,
-        "z": "9167bcd1.0dd69",
+        "x": 1255.666805267334,
+        "y": 4710.30878162384,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4ff032c9.ac47cc",
-                "4f1d070c.cbefd8"
+                "48f89263.45560c",
+                "45a4171.c74a8e8"
             ]
         ]
     },
     {
-        "id": "4ff032c9.ac47cc",
+        "id": "48f89263.45560c",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1463.3332176208496,
-        "y": 4672.999711990356,
-        "z": "9167bcd1.0dd69",
+        "x": 1437.3332176208496,
+        "y": 4686.9754114151,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "9c0ccfc9.82e09"
+                "7e20832d.b83624"
             ]
         ]
     },
     {
-        "id": "4f1d070c.cbefd8",
+        "id": "45a4171.c74a8e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1461.4284896850586,
-        "y": 4719.785539627075,
-        "z": "9167bcd1.0dd69",
+        "x": 1435.4284896850586,
+        "y": 4733.761239051819,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "bf5629c7.b8c548"
+                "d289e33f.82de9"
             ]
         ]
     },
     {
-        "id": "9c0ccfc9.82e09",
+        "id": "7e20832d.b83624",
         "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": 1624.999843597412,
-        "y": 4674.666704177856,
-        "z": "9167bcd1.0dd69",
+        "x": 1598.999843597412,
+        "y": 4688.6424036026,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "57f9125a.f4f11c",
-                "c29ebd4.1b8af4"
+                "bf47efb9.ef7f",
+                "569de2d6.f82d54"
             ]
         ]
     },
     {
-        "id": "cfe429db.9ee878",
+        "id": "bd911df4.417368",
         "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": 560.7141952514648,
-        "y": 304.9047336578369,
-        "z": "9167bcd1.0dd69",
+        "x": 534.7141952514648,
+        "y": 318.88043308258057,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "f0f44cd.5ed593",
-                "311a0c57.6a3054"
+                "a704dae0.46866",
+                "a2326081.5ee988"
             ]
         ]
     },
     {
-        "id": "f0f44cd.5ed593",
+        "id": "a704dae0.46866",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 744.0475692749023,
-        "y": 274.9047222137451,
-        "z": "9167bcd1.0dd69",
+        "x": 718.0475692749023,
+        "y": 288.88042163848877,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "baeca66d.f8d568"
+                "4b4d3d88.c7ca9c"
             ]
         ]
     },
     {
-        "id": "311a0c57.6a3054",
+        "id": "a2326081.5ee988",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 743.8094749450684,
-        "y": 315.85721588134766,
-        "z": "9167bcd1.0dd69",
+        "x": 717.8094749450684,
+        "y": 329.8329153060913,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "ecc33023.4b1938"
+                "e4643fbe.9b324"
             ]
         ]
     },
     {
-        "id": "baeca66d.f8d568",
+        "id": "4b4d3d88.c7ca9c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 879.0475234985352,
-        "y": 273.2380619049072,
-        "z": "9167bcd1.0dd69",
+        "x": 853.0475234985352,
+        "y": 287.2137613296509,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "ecc33023.4b1938",
+        "id": "e4643fbe.9b324",
         "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": 960.7141799926758,
-        "y": 314.9047431945801,
-        "z": "9167bcd1.0dd69",
+        "x": 934.7141799926758,
+        "y": 328.88044261932373,
+        "z": "f3a72141.88f688",
         "wires": []
     },
     {
-        "id": "59c722cd.d5e3ac",
+        "id": "5e3595bc.cfed8c",
         "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": 592.3015670776367,
-        "y": 856.2980642318726,
-        "z": "9167bcd1.0dd69",
+        "x": 566.3015670776367,
+        "y": 870.2737636566162,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "9ed32d4f.dbd058",
+        "id": "5eb11d31.97f244",
         "type": "switchNode",
         "name": "switch ss.self-serve-flag",
         "xml": "<switch test=\"`$ss.self-serve-flag`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 550.4443054199219,
-        "y": 1083.2981328964233,
-        "z": "9167bcd1.0dd69",
+        "x": 524.4443054199219,
+        "y": 1097.273832321167,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "21546dae.57be42",
-                "174b6de2.72fdb2"
+                "e392bb12.8c4bc",
+                "1c65532b.b915dd"
             ]
         ]
     },
     {
-        "id": "21546dae.57be42",
+        "id": "e392bb12.8c4bc",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 771.158504486084,
-        "y": 1200.869031906128,
-        "z": "9167bcd1.0dd69",
+        "x": 745.158504486084,
+        "y": 1214.8447313308716,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "43e1e208.1c9204"
+                "cdb40a91.68e35"
             ]
         ]
     },
     {
-        "id": "174b6de2.72fdb2",
+        "id": "1c65532b.b915dd",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 771.7299575805664,
-        "y": 959.7266693115234,
-        "z": "9167bcd1.0dd69",
+        "x": 745.7299575805664,
+        "y": 973.7023687362671,
+        "z": "f3a72141.88f688",
         "wires": [
             [
-                "4c64ed.a697bb14"
+                "58e6d3f7.f000a4"
             ]
         ]
     },
     {
-        "id": "6f90d0a3.4f5888",
+        "id": "ee77fdb8.d87748",
         "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": 501,
-        "y": 7285,
-        "z": "9167bcd1.0dd69",
+        "x": 475,
+        "y": 7298.975699424744,
+        "z": "f3a72141.88f688",
         "wires": [
             []
         ]
     },
     {
-        "id": "484ad130.562eb8",
+        "id": "5e5e8a4e.e5fc5c",
         "type": "comment",
         "name": "'Old' version of DG, called for flows where SO does not expect async response (so-sdnc-adapter)",
         "info": "",
         "comments": "",
-        "x": 433,
-        "y": 88,
-        "z": "9167bcd1.0dd69",
+        "x": 407,
+        "y": 101.97569942474365,
+        "z": "f3a72141.88f688",
+        "wires": []
+    },
+    {
+        "id": "557cfb68.ef7394",
+        "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": 622,
+        "y": 225,
+        "z": "f3a72141.88f688",
+        "wires": [
+            [
+                "1bc02874.c16ff8"
+            ]
+        ]
+    },
+    {
+        "id": "1bc02874.c16ff8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 942,
+        "y": 227,
+        "z": "f3a72141.88f688",
+        "wires": [
+            [
+                "4a0c8b5d.038a3c"
+            ]
+        ]
+    },
+    {
+        "id": "4a0c8b5d.038a3c",
+        "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": 1313,
+        "y": 223,
+        "z": "f3a72141.88f688",
         "wires": []
     }
-]
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.json
index fa28f0dc..9149bac4 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "1c63830b.6dad15",
+        "id": "4661c184.ec1f28",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 158,
-        "y": 122.74699592590332,
-        "z": "652cf04d.917e78",
+        "x": 123,
+        "y": 136,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "d0207df4.e744a8"
+                "1a1c365c.1bc24a"
             ]
         ]
     },
     {
-        "id": "d0207df4.e744a8",
+        "id": "1a1c365c.1bc24a",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,5833 +22,5877 @@
         "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": 273.28570556640625,
-        "y": 164.65177536010742,
-        "z": "652cf04d.917e78",
+        "x": 238.28570556640625,
+        "y": 177.9047794342041,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "3222238a.bde594"
+                "16e76479.f473f4"
             ]
         ]
     },
     {
-        "id": "3222238a.bde594",
+        "id": "16e76479.f473f4",
         "type": "method",
         "name": "method vnf-topology-operation-assign-async",
         "xml": "<method rpc='vnf-topology-operation-assign-async' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 246.09530639648438,
-        "y": 207.41365909576416,
-        "z": "652cf04d.917e78",
+        "x": 211.09530639648438,
+        "y": 220.66666316986084,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "525bcd69.d52c4c"
+                "bf83b00.ffd5dd"
             ]
         ]
     },
     {
-        "id": "4bbdf4dc.9acd64",
+        "id": "aecec26e.e0692",
         "type": "comment",
         "name": "vnf-topology-operation-assign-async",
         "info": "",
         "comments": "",
-        "x": 522.0115356445312,
-        "y": 45,
-        "z": "652cf04d.917e78",
+        "x": 487.01153564453125,
+        "y": 58.25300407409668,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "65b55bf0.e17c94",
+        "id": "d8bf5428.1ff1",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 554.3809661865234,
-        "y": 518.3898124694824,
-        "z": "652cf04d.917e78",
+        "x": 519.3809661865234,
+        "y": 531.6428165435791,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "676025ce.ceaed4",
-                "fac05067.e39a6"
+                "431069fb.8761",
+                "5dbaa5aa.6ad9b4"
             ]
         ]
     },
     {
-        "id": "676025ce.ceaed4",
+        "id": "431069fb.8761",
         "type": "outcome",
         "name": "CreateVnfInstance",
         "xml": "<outcome value='CreateVnfInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 808.0952606201172,
-        "y": 495.53269386291504,
-        "z": "652cf04d.917e78",
+        "x": 773.0952606201172,
+        "y": 508.7856979370117,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "a9df7def.2e87a"
+                "19923e90.84dc49"
             ]
         ]
     },
     {
-        "id": "fac05067.e39a6",
+        "id": "5dbaa5aa.6ad9b4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 770.0952262878418,
-        "y": 541.2470216751099,
-        "z": "652cf04d.917e78",
+        "x": 735.0952262878418,
+        "y": 554.5000257492065,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "2d48d63d.1a5b82"
+                "188d06d.21abdf9"
             ]
         ]
     },
     {
-        "id": "a9df7def.2e87a",
+        "id": "19923e90.84dc49",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 992.9523887634277,
-        "y": 495.53272342681885,
-        "z": "652cf04d.917e78",
+        "x": 957.9523887634277,
+        "y": 508.7857275009155,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "73e62b5e.2d2d24",
+        "id": "14788654.ce330a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 215.73814392089844,
-        "y": 3404.7708625793457,
-        "z": "652cf04d.917e78",
-        "wires": [
-            [
-                "4ea0676c.f3c5",
-                "d807e3bf.6821",
-                "7dbd70b1.1d952",
-                "c802fc95.1aed4",
-                "ba6b2f3.81ff65",
-                "84242802.438068",
-                "40b03c35.066374",
-                "978c06f5.c51b38",
-                "a2246d8d.309948",
-                "d1226d82.dd4ba",
-                "42aca120.8663b",
-                "27992a30.77ac86",
-                "ba745244.bd0468",
-                "32a417de.843a",
-                "60220dbd.cbb274",
-                "aeeecb5d.b95ac8",
-                "bd2f9d29.6f4cd",
-                "d4235437.829c38",
-                "d7771a1c.3c6348",
-                "6a3932df.a191e4",
-                "ba43d064.2bf358",
-                "54b8c442.c1469c",
-                "f4822626.6784a",
-                "c0f7e6fd.82944",
-                "b69c7bea.5b8f98",
-                "779ef85a.752e58",
-                "b8b61871.289a38",
-                "f7b6f1fc.97c858",
-                "d350e16f.3e261",
-                "93239a74.eab46",
-                "a88c2f3d.bf4fa8",
-                "3e36f71.f2f0b88",
-                "b3a3b6d8.b3b1a",
-                "aac69396.6ddb18",
-                "634a4090.ff27d",
-                "9ec4fd36.2e31c8",
-                "1fec3768.f512f1",
-                "4ba8fd3f.c818fc",
-                "d2d8ec6e.e92468",
-                "2957e806.869ab"
-            ]
-        ]
-    },
-    {
-        "id": "c29453e1.d0b3d8",
+        "x": 180.73814392089844,
+        "y": 3418.0238666534424,
+        "z": "f54d3783.41afe",
+        "wires": [
+            [
+                "c04129d2.227c68",
+                "9b868b8e.0ba8a8",
+                "8731f91d.91242",
+                "1022e029.863328",
+                "ba2df5c1.747cf8",
+                "52345019.2351b8",
+                "192e1482.449c03",
+                "2c1ef18a.330b3e",
+                "e3faec1c.a59a",
+                "fcb95713.a4e8a8",
+                "5bbd9dd1.6c7d5c",
+                "143efc8a.25e1cb",
+                "409c22ae.a3bf9c",
+                "23583b8f.949ba4",
+                "c6168431.a00f5",
+                "790e4f79.58723",
+                "b9894f42.70a4f8",
+                "854ae13c.f926a",
+                "e553a1ad.69aae8",
+                "3c1e9c3a.58c014",
+                "59441881.83eba8",
+                "b2968f47.d2ae78",
+                "84464174.3953f",
+                "355ef255.69a646",
+                "f9d2efbe.08a05",
+                "f2183011.286a98",
+                "d9a36927.f2271",
+                "ec714a9b.c38d8",
+                "d780c8df.23f2d",
+                "e4a614d.2b0f1e8",
+                "ce494650.e8a068",
+                "42a167cf.392ce",
+                "f94face8.c5b278",
+                "a5911152.d7aeb",
+                "a2884948.862f8",
+                "5d5f2dd1.10210c",
+                "f5df60ce.d84ac8",
+                "3367c076.389b7",
+                "d71dd728.42aa",
+                "dac2571d.72305"
+            ]
+        ]
+    },
+    {
+        "id": "c4069bd9.1face",
         "type": "get-resource",
         "name": "get-resource VF_MODEL",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n  pfx='db.vf-model'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 566.7142715454102,
-        "y": 609.5326824188232,
-        "z": "652cf04d.917e78",
+        "x": 531.7142715454102,
+        "y": 622.7856864929199,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "1eae0e0a.4b77c2",
-                "72cc49c6.447b08"
+                "1869c2be.7fa70d",
+                "79d22567.c1617c"
             ]
         ]
     },
     {
-        "id": "1eae0e0a.4b77c2",
+        "id": "1869c2be.7fa70d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 767.4999694824219,
-        "y": 589.913519859314,
-        "z": "652cf04d.917e78",
+        "x": 732.4999694824219,
+        "y": 603.1665239334106,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "17544ab9.984c5d"
+                "513e881c.9b735"
             ]
         ]
     },
     {
-        "id": "72cc49c6.447b08",
+        "id": "79d22567.c1617c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 776.0713996887207,
-        "y": 634.1992330551147,
-        "z": "652cf04d.917e78",
+        "x": 741.0713996887207,
+        "y": 647.4522371292114,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "9a95814.c6dd98"
+                "77a122cf.38f42c"
             ]
         ]
     },
     {
-        "id": "4ea0676c.f3c5",
+        "id": "c04129d2.227c68",
         "type": "switchNode",
         "name": "switch service-data.vnfs.vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 590.3809204101562,
-        "y": 1197.9851322174072,
-        "z": "652cf04d.917e78",
+        "x": 555.3809204101562,
+        "y": 1211.238136291504,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "7fa001b2.5a02a",
-                "2784fe24.f3ffba"
+                "1423036f.c07405",
+                "efcdd596.dadaa8"
             ]
         ]
     },
     {
-        "id": "7fa001b2.5a02a",
+        "id": "1423036f.c07405",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 816.0952491760254,
-        "y": 1165.1279201507568,
-        "z": "652cf04d.917e78",
+        "x": 781.0952491760254,
+        "y": 1178.3809242248535,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "7f419c89.2e0014"
+                "4e9c3502.517244"
             ]
         ]
     },
     {
-        "id": "7f419c89.2e0014",
+        "id": "4e9c3502.517244",
         "type": "set",
         "name": "set vnf-index=0",
         "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
         "comments": "",
-        "x": 980.3809700012207,
-        "y": 1164.1279983520508,
-        "z": "652cf04d.917e78",
+        "x": 945.3809700012207,
+        "y": 1177.3810024261475,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "2784fe24.f3ffba",
+        "id": "efcdd596.dadaa8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 817.523811340332,
-        "y": 1229.4137382507324,
-        "z": "652cf04d.917e78",
+        "x": 782.523811340332,
+        "y": 1242.666742324829,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "6b01bbf.e34dbc4"
+                "a8b5b199.d340a"
             ]
         ]
     },
     {
-        "id": "741efbb8.5b8a44",
+        "id": "4084f52d.1d8c5c",
         "type": "set",
         "name": "set vnf-index = vnf_length",
         "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
         "comments": "",
-        "x": 1235.3809661865234,
-        "y": 1207.699426651001,
-        "z": "652cf04d.917e78",
+        "x": 1200.3809661865234,
+        "y": 1220.9524307250977,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "5f2528be.bf7e48",
+        "id": "869d4b3f.d6d0e8",
         "type": "for",
         "name": "for each existing VNF",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1220.8094787597656,
-        "y": 1253.6993656158447,
-        "z": "652cf04d.917e78",
+        "x": 1185.8094787597656,
+        "y": 1266.9523696899414,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "4af50057.0f1aa8"
+                "4250c05c.e09ef8"
             ]
         ]
     },
     {
-        "id": "6b01bbf.e34dbc4",
+        "id": "a8b5b199.d340a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 991.2380714416504,
-        "y": 1229.413703918457,
-        "z": "652cf04d.917e78",
+        "x": 956.2380714416504,
+        "y": 1242.6667079925537,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "741efbb8.5b8a44",
-                "5f2528be.bf7e48"
+                "4084f52d.1d8c5c",
+                "869d4b3f.d6d0e8"
             ]
         ]
     },
     {
-        "id": "4af50057.0f1aa8",
+        "id": "4250c05c.e09ef8",
         "type": "switchNode",
         "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1575.0952453613281,
-        "y": 1253.270845413208,
-        "z": "652cf04d.917e78",
+        "x": 1540.0952453613281,
+        "y": 1266.5238494873047,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "25f009f8.2d893e"
+                "67224b8a.b94c34"
             ]
         ]
     },
     {
-        "id": "25f009f8.2d893e",
+        "id": "67224b8a.b94c34",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1869.3810005187988,
-        "y": 1252.8423299789429,
-        "z": "652cf04d.917e78",
+        "x": 1834.3810005187988,
+        "y": 1266.0953340530396,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "dcfb1529.fec6a8"
+                "fb90666f.a03358"
             ]
         ]
     },
     {
-        "id": "8724aa2.889b6d8",
+        "id": "46cfab20.22887c",
         "type": "comment",
         "name": "make sure this VNF doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1562.2379760742188,
-        "y": 1210.8422756195068,
-        "z": "652cf04d.917e78",
+        "x": 1527.2379760742188,
+        "y": 1224.0952796936035,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "d807e3bf.6821",
+        "id": "9b868b8e.0ba8a8",
         "type": "set",
         "name": "set vnf-topology data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-id'\n value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-type'\n value='`$vnf-topology-operation-input.vnf-information.vnf-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-type'\n value='`$db.vf-model.nf-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-role'\n value='`$db.vf-model.nf-role`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-function'\n value='`$db.vf-model.nf-function`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-code'\n value='`$db.vf-model.nf-code`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.tenant'\n value='`$vnf-topology-operation-input.vnf-request-input.tenant`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-cloud-region'\n value='`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`' />\n \n",
         "comments": "",
-        "x": 556.0952033996582,
-        "y": 1729.6518993377686,
-        "z": "652cf04d.917e78",
+        "x": 521.0952033996582,
+        "y": 1742.9049034118652,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "7dbd70b1.1d952",
+        "id": "8731f91d.91242",
         "type": "switchNode",
         "name": "switch input vnf-name",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 568.5952224731445,
-        "y": 2091.770956993103,
-        "z": "652cf04d.917e78",
+        "x": 533.5952224731445,
+        "y": 2105.0239610671997,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "241fabfe.69fa2c",
-                "f80604c.1fec1f8"
+                "52dafc17.f6736c",
+                "7d58c1cc.73ce7"
             ]
         ]
     },
     {
-        "id": "c802fc95.1aed4",
+        "id": "1022e029.863328",
         "type": "get-resource",
         "name": "get-resource cloud region",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"cloud-region\" \n\t\tkey=\"cloud-region.cloud-owner = $prop.cloud-region.cloud-owner AND \n\t\t     cloud-region.cloud-region-id = $vnf-topology-operation-input.vnf-request-input.aic-cloud-region AND\n\t\t     depth='all'\"\n        pfx='aai.cloud-region' local-only='false' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 600.738166809082,
-        "y": 2987.7706928253174,
-        "z": "652cf04d.917e78",
+        "x": 565.738166809082,
+        "y": 3001.023696899414,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "50e5753c.35a0ec",
-                "60c43013.41eb78"
+                "ffadf4a4.50abb8",
+                "daf194d0.8551a"
             ]
         ]
     },
     {
-        "id": "60c43013.41eb78",
+        "id": "daf194d0.8551a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 808.8414840698242,
-        "y": 3006.921399116516,
-        "z": "652cf04d.917e78",
+        "x": 773.8414840698242,
+        "y": 3020.174403190613,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "f968cb62.56775"
+                "67a22798.d81588"
             ]
         ]
     },
     {
-        "id": "50e5753c.35a0ec",
+        "id": "ffadf4a4.50abb8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 817.7700805664062,
-        "y": 2964.2071323394775,
-        "z": "652cf04d.917e78",
+        "x": 782.7700805664062,
+        "y": 2977.460136413574,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "2be0da40.0d7806"
+                "5d5eddf8.f77b84"
             ]
         ]
     },
     {
-        "id": "ba6b2f3.81ff65",
+        "id": "ba2df5c1.747cf8",
         "type": "get-resource",
         "name": "get-resource VF_TO_NETWORK_ROLE_MAPPING",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VF_TO_NETWORK_ROLE_MAPPING WHERE vf_customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n  pfx='db.vf-network-role-mapping[]'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 665.9762496948242,
-        "y": 3298.8182125091553,
-        "z": "652cf04d.917e78",
+        "x": 630.9762496948242,
+        "y": 3312.071216583252,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "1edaf2dd.6abca5",
-                "8c805d73.d5428"
+                "f02723c3.a381b8",
+                "54125380.e0951c"
             ]
         ]
     },
     {
-        "id": "1edaf2dd.6abca5",
+        "id": "f02723c3.a381b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 961.7619209289551,
-        "y": 3277.532377243042,
-        "z": "652cf04d.917e78",
+        "x": 926.7619209289551,
+        "y": 3290.7853813171387,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "7ef20c7d.b3d83c"
+                "48f3f890.8517f8"
             ]
         ]
     },
     {
-        "id": "8c805d73.d5428",
+        "id": "54125380.e0951c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 970.3333511352539,
-        "y": 3321.818090438843,
-        "z": "652cf04d.917e78",
+        "x": 935.3333511352539,
+        "y": 3335.0710945129395,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c3672ff4.a17f"
+                "6a48e0c.284292"
             ]
         ]
     },
     {
-        "id": "febef76b.d8c79",
+        "id": "c302bb2b.5f6d08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1066.9049491882324,
-        "y": 4415.460702896118,
-        "z": "652cf04d.917e78",
+        "x": 1031.9049491882324,
+        "y": 4428.713706970215,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "69a52c45.9d3a2c",
-                "1b8f8e9a.44ecf9",
-                "b81c1659.1acf38",
-                "c7e3943d.2b1af",
-                "e1eddf21.903d78",
-                "886b4211.4bd9a",
-                "5621d64.66c8228",
-                "680457ce.355c7",
-                "f1e14dbb.a2c47"
+                "a360a46d.3c70b",
+                "796e072e.7461a",
+                "2ec19c6c.a13ee4",
+                "f7ab2775.d01c4",
+                "e518bda4.6b6118",
+                "e56d0bf4.28331",
+                "441a09f7.0fe6e8",
+                "125c5567.a44893",
+                "f38e05b8.78f318"
             ]
         ]
     },
     {
-        "id": "b81c1659.1acf38",
+        "id": "2ec19c6c.a13ee4",
         "type": "get-resource",
         "name": "get-resource l3-network",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"l3-networks\" \n\t\tkey=\"l3-network.network-role = $db.vf-network-role-mapping[$role-index].network-role\"\n        pfx='aai.l3-network' local-only='false'\n>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1316.6191482543945,
-        "y": 3505.8417415618896,
-        "z": "652cf04d.917e78",
+        "x": 1281.6191482543945,
+        "y": 3519.0947456359863,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "69f68ea2.5d7068",
-                "8f733aa1.cdcf6"
+                "1b964abe.a8bf65",
+                "73b445f9.d1da54"
             ]
         ]
     },
     {
-        "id": "8f733aa1.cdcf6",
+        "id": "73b445f9.d1da54",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1522.0954627990723,
-        "y": 3535.1273441314697,
-        "z": "652cf04d.917e78",
+        "x": 1487.0954627990723,
+        "y": 3548.3803482055664,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "11a704cb.ec6e1b"
+                "76d0200d.fc0188"
             ]
         ]
     },
     {
-        "id": "69f68ea2.5d7068",
+        "id": "1b964abe.a8bf65",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1529.595458984375,
-        "y": 3486.2703142166138,
-        "z": "652cf04d.917e78",
+        "x": 1494.595458984375,
+        "y": 3499.5233182907104,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ddfbfd5a.f170a"
+                "c82ac0d8.cc5e38"
             ]
         ]
     },
     {
-        "id": "69a52c45.9d3a2c",
+        "id": "a360a46d.3c70b",
         "type": "set",
         "name": "set vnf-network data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-role'\n    value='`$db.vf-network-role-mapping[$role-index].network-role`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-name'\n    value='`$aai.l3-network.l3-network[$db-network-index].network-name`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].neutron-id'\n    value='`$aai.l3-network.l3-network[$db-network-index].neutron-network-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].network-id'\n    value='`$aai.l3-network.l3-network[$db-network-index].network-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].contrail-network-fqdn'\n    value='`$aai.l3-network.l3-network[$db-network-index].contrail-network-fqdn`' />\n",
         "comments": "",
-        "x": 1312.9526138305664,
-        "y": 4311.413550376892,
-        "z": "652cf04d.917e78",
+        "x": 1277.9526138305664,
+        "y": 4324.666554450989,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "a2246d8d.309948",
+        "id": "e3faec1c.a59a",
         "type": "for",
         "name": "for each cloud-region availability zone",
         "xml": "<for index='idx' start='0' end='`$aai.cloud-region.availability-zones.availability-zone_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 533.3336524963379,
-        "y": 5558.532527923584,
-        "z": "652cf04d.917e78",
+        "x": 498.3336524963379,
+        "y": 5571.785531997681,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "87ffb6ef.f80298"
+                "adba82bf.e3f3a8"
             ]
         ]
     },
     {
-        "id": "bc615b55.663bf",
+        "id": "12d3265f.5dba1a",
         "type": "set",
         "name": "set availability-zone",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.availability-zones.availability-zone[$idx]'\n  value='`$aai.cloud-region.availability-zones.availability-zone[$idx].availability-zone-name`' />\n",
         "comments": "",
-        "x": 995.0003356933594,
-        "y": 5527.865942001343,
-        "z": "652cf04d.917e78",
+        "x": 960.0003356933594,
+        "y": 5541.118946075439,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "d1226d82.dd4ba",
+        "id": "fcb95713.a4e8a8",
         "type": "set",
         "name": "set vnf-parameters-data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.'\n  value='vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.' />\n",
         "comments": "",
-        "x": 492.952579498291,
-        "y": 5408.484888076782,
-        "z": "652cf04d.917e78",
+        "x": 457.952579498291,
+        "y": 5421.737892150879,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "c91f5f57.248b18",
+        "id": "b65e5ff3.d14f98",
         "type": "save",
         "name": "save generic-vnf l3-network relationships",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"generic-vnf:relationship-list\"\n   key=\"generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$vnf-nw-index].network-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 959.524112701416,
-        "y": 5702.29474067688,
-        "z": "652cf04d.917e78",
+        "x": 924.524112701416,
+        "y": 5715.547744750977,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "70b9d92d.cfcaf",
-                "8019290f.d9e57"
+                "ee487aee.96931",
+                "a9a85016.7d2db8"
             ]
         ]
     },
     {
-        "id": "ba745244.bd0468",
+        "id": "409c22ae.a3bf9c",
         "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": 446.29785919189453,
-        "y": 6598.056180000305,
-        "z": "652cf04d.917e78",
+        "x": 411.29785919189453,
+        "y": 6611.309184074402,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "27992a30.77ac86",
+        "id": "143efc8a.25e1cb",
         "type": "set",
         "name": "set vnf-level-oper-status to PendingCreate",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
         "comments": "",
-        "x": 548.8255958557129,
-        "y": 6071.500453948975,
-        "z": "652cf04d.917e78",
+        "x": 513.8255958557129,
+        "y": 6084.753458023071,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "40b03c35.066374",
+        "id": "192e1482.449c03",
         "type": "for",
         "name": "for each network-role",
         "xml": "<for silentFailure='true' index='role-index' start='0' end='`$db.vf-network-role-mapping_length`'>",
         "comments": "",
         "outputs": 1,
-        "x": 526.9048843383789,
-        "y": 4388.794371604919,
-        "z": "652cf04d.917e78",
+        "x": 491.9048843383789,
+        "y": 4402.047375679016,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "f73eb405.e256b8"
+                "83a5f952.36e31"
             ]
         ]
     },
     {
-        "id": "84242802.438068",
+        "id": "52345019.2351b8",
         "type": "set",
         "name": "set network-index = 0",
         "xml": "<set>\n<parameter name='network-index' value='0' />\n",
         "comments": "",
-        "x": 568.4047470092773,
-        "y": 3352.8660068511963,
-        "z": "652cf04d.917e78",
+        "x": 533.4047470092773,
+        "y": 3366.119010925293,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "1b8f8e9a.44ecf9",
+        "id": "796e072e.7461a",
         "type": "set",
         "name": "increment network-index",
         "xml": "<set>\n<parameter name='network-index' value='`$network-index + 1`' />\n",
         "comments": "",
-        "x": 1294.9526023864746,
-        "y": 5359.175491333008,
-        "z": "652cf04d.917e78",
+        "x": 1259.9526023864746,
+        "y": 5372.4284954071045,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "978c06f5.c51b38",
+        "id": "2c1ef18a.330b3e",
         "type": "set",
         "name": "set vnf-network_length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network_length'\n  value='`$network-index`' />\n",
         "comments": "",
-        "x": 491.80966567993164,
-        "y": 5358.484931945801,
-        "z": "652cf04d.917e78",
+        "x": 456.80966567993164,
+        "y": 5371.7379360198975,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "42aca120.8663b",
+        "id": "5bbd9dd1.6c7d5c",
         "type": "set",
         "name": "copy input data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",
         "comments": "",
-        "x": 458.095401763916,
-        "y": 6017.913442611694,
-        "z": "652cf04d.917e78",
+        "x": 423.095401763916,
+        "y": 6031.166446685791,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "32a417de.843a",
+        "id": "23583b8f.949ba4",
         "type": "for",
         "name": "for each vnf-network",
         "xml": "<for index='vnf-nw-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 482.52402114868164,
-        "y": 5701.29465675354,
-        "z": "652cf04d.917e78",
+        "x": 447.52402114868164,
+        "y": 5714.547660827637,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "80153f67.955468"
+                "d0f022e5.c88068"
             ]
         ]
     },
     {
-        "id": "80153f67.955468",
+        "id": "d0f022e5.c88068",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 686.1906623840332,
-        "y": 5701.294617652893,
-        "z": "652cf04d.917e78",
+        "x": 651.1906623840332,
+        "y": 5714.54762172699,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c91f5f57.248b18"
+                "b65e5ff3.d14f98"
             ]
         ]
     },
     {
-        "id": "60220dbd.cbb274",
+        "id": "c6168431.a00f5",
         "type": "set",
         "name": "set new vnf_length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",
         "comments": "",
-        "x": 539.0238418579102,
-        "y": 1250.0090227127075,
-        "z": "652cf04d.917e78",
+        "x": 504.02384185791016,
+        "y": 1263.2620267868042,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "aeeecb5d.b95ac8",
+        "id": "790e4f79.58723",
         "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": 613.5952911376953,
-        "y": 3075.008864402771,
-        "z": "652cf04d.917e78",
+        "x": 578.5952911376953,
+        "y": 3088.2618684768677,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "af9376a1.5b3178"
+                "8d6ad368.291ba"
             ]
         ]
     },
     {
-        "id": "af9376a1.5b3178",
+        "id": "8d6ad368.291ba",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$aai.cloud-region.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 861.2738342285156,
-        "y": 3074.7587938308716,
-        "z": "652cf04d.917e78",
+        "x": 826.2738342285156,
+        "y": 3088.0117979049683,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "b05c52b5.57078"
+                "e3747594.cd166"
             ]
         ]
     },
     {
-        "id": "b05c52b5.57078",
+        "id": "e3747594.cd166",
         "type": "outcome",
         "name": "complex",
         "xml": "<outcome value='complex'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1030.7381553649902,
-        "y": 3074.1516160964966,
-        "z": "652cf04d.917e78",
+        "x": 995.7381553649902,
+        "y": 3087.4046201705933,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "8b3ae97b.251a1"
+                "824c58c6.f6519"
             ]
         ]
     },
     {
-        "id": "d417f4d3.21848",
+        "id": "62adf90d.0208a",
         "type": "set",
         "name": "set aic-clli",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-clli'\n  value='`$aai-uid-split[$aai-uid-split_length - 1]`' />\n",
         "comments": "",
-        "x": 1408.3095397949219,
-        "y": 3072.389811515808,
-        "z": "652cf04d.917e78",
+        "x": 1373.3095397949219,
+        "y": 3085.642815589905,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "bd2f9d29.6f4cd",
+        "id": "b9894f42.70a4f8",
         "type": "switchNode",
         "name": "switch aic-clli",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-clli`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 546.6429176330566,
-        "y": 3188.1039962768555,
-        "z": "652cf04d.917e78",
+        "x": 511.64291763305664,
+        "y": 3201.357000350952,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "7ec6f0ba.5529d8"
+                "e46a7171.697a2"
             ]
         ]
     },
     {
-        "id": "7ec6f0ba.5529d8",
+        "id": "e46a7171.697a2",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 694.7857513427734,
-        "y": 3188.103979110718,
-        "z": "652cf04d.917e78",
+        "x": 659.7857513427734,
+        "y": 3201.3569831848145,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "5c62b00e.a7cd48"
+                "8a243db.c5662c"
             ]
         ]
     },
     {
-        "id": "30224228.963f36",
+        "id": "cbfc20ba.1ec18",
         "type": "set",
         "name": "set from DB",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'\n  value='`$db.vf-model.invariant-uuid`' />\n",
         "comments": "",
-        "x": 973.0954627990723,
-        "y": 2546.9612531661987,
-        "z": "652cf04d.917e78",
+        "x": 938.0954627990723,
+        "y": 2560.2142572402954,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "f5318147.69e14",
+        "id": "9fefd3f8.db8f98",
         "type": "for",
         "name": "for each l3-network",
         "xml": "<for index='db-network-index' start='0' end='`$aai.l3-network.l3-network_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1433.2145919799805,
-        "y": 4135.984929084778,
-        "z": "652cf04d.917e78",
+        "x": 1398.2145919799805,
+        "y": 4149.2379331588745,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "852f0b12.336648"
+                "614c8409.56f694"
             ]
         ]
     },
     {
-        "id": "b772b2db.6bf188",
+        "id": "387ea551.d97d92",
         "type": "switchNode",
         "name": "switch orchestration-status",
         "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].orchestration-status`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1851.7857627868652,
-        "y": 4070.556393623352,
-        "z": "652cf04d.917e78",
+        "x": 1816.7857627868652,
+        "y": 4083.8093976974487,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "2013144f.4b7fd4",
-                "bd45a651.d4fc18",
-                "6b197918.4b35",
-                "d8961e04.47a09",
-                "d20d55e5.845528"
+                "9d95d4f1.af8f28",
+                "6e67295b.083bd8",
+                "c841f358.cc44e",
+                "9931da25.1af06",
+                "a2d8e726.f731e"
             ]
         ]
     },
     {
-        "id": "2013144f.4b7fd4",
+        "id": "9d95d4f1.af8f28",
         "type": "outcome",
         "name": "Pending Delete",
         "xml": "<outcome value='Pending Delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2092.4526329040527,
-        "y": 4112.222897529602,
-        "z": "652cf04d.917e78",
+        "x": 2057.4526329040527,
+        "y": 4125.475901603699,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "65cc69a1.7d4018"
+                "111ca475.bfcb9c"
             ]
         ]
     },
     {
-        "id": "bd45a651.d4fc18",
+        "id": "6e67295b.083bd8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2065.309772491455,
-        "y": 4163.222878456116,
-        "z": "652cf04d.917e78",
+        "x": 2030.309772491455,
+        "y": 4176.475882530212,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "9c0a541e.0b30c8"
+                "f1a29c9.7d328e"
             ]
         ]
     },
     {
-        "id": "81eba499.0af278",
+        "id": "48ea8c97.939764",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2601.0240745544434,
-        "y": 4108.460795402527,
-        "z": "652cf04d.917e78",
+        "x": 2566.0240745544434,
+        "y": 4121.7137994766235,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "65278a7b.2864d4",
-                "29d3dc98.16bcd4"
+                "eb1468.3f791b98",
+                "9d09f6f3.62b358"
             ]
         ]
     },
     {
-        "id": "9c0a541e.0b30c8",
+        "id": "f1a29c9.7d328e",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='db-rel-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2235.309684753418,
-        "y": 4162.794255256653,
-        "z": "652cf04d.917e78",
+        "x": 2200.309684753418,
+        "y": 4176.0472593307495,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "e8b88764.0e454"
+                "ebfe35e9.d51238"
             ]
         ]
     },
     {
-        "id": "65278a7b.2864d4",
+        "id": "eb1468.3f791b98",
         "type": "outcome",
         "name": "cloud-region",
         "xml": "<outcome value='cloud-region'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2775.309860229492,
-        "y": 4131.365619659424,
-        "z": "652cf04d.917e78",
+        "x": 2740.309860229492,
+        "y": 4144.6186237335205,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "bfe4f75a.234cc8"
+                "e8ab049.a8a56f8"
             ]
         ]
     },
     {
-        "id": "bfe4f75a.234cc8",
+        "id": "e8ab049.a8a56f8",
         "type": "for",
         "name": "for each relationship data",
         "xml": "<for silentFailure='true' index='db-data-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2972.4525604248047,
-        "y": 4131.794087409973,
-        "z": "652cf04d.917e78",
+        "x": 2937.4525604248047,
+        "y": 4145.04709148407,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "9def1818.13c9f8"
+                "c1b3c066.a9955"
             ]
         ]
     },
     {
-        "id": "9def1818.13c9f8",
+        "id": "c1b3c066.a9955",
         "type": "switchNode",
         "name": "switch relationship-key",
         "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-key`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3203.881160736084,
-        "y": 4131.365462303162,
-        "z": "652cf04d.917e78",
+        "x": 3168.881160736084,
+        "y": 4144.618466377258,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "29799bf8.7888e4"
+                "e9bc1c2.e51706"
             ]
         ]
     },
     {
-        "id": "29799bf8.7888e4",
+        "id": "e9bc1c2.e51706",
         "type": "outcome",
         "name": "cloud-region.cloud-region-id",
         "xml": "<outcome value='cloud-region.cloud-region-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3445.309726715088,
-        "y": 4131.365558624268,
-        "z": "652cf04d.917e78",
+        "x": 3410.309726715088,
+        "y": 4144.618562698364,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "a1567e58.8a3128"
+                "fbd49a32.93afa8"
             ]
         ]
     },
     {
-        "id": "a1567e58.8a3128",
+        "id": "fbd49a32.93afa8",
         "type": "switchNode",
         "name": "switch relationship-value == cloud-region-id",
         "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-value == $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3749.595645904541,
-        "y": 4131.22261428833,
-        "z": "652cf04d.917e78",
+        "x": 3714.595645904541,
+        "y": 4144.475618362427,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "7b8c98d4.2676d8"
+                "ddf73f3.4f64ac"
             ]
         ]
     },
     {
-        "id": "7b8c98d4.2676d8",
+        "id": "ddf73f3.4f64ac",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3454.5957832336426,
-        "y": 4248.865568161011,
-        "z": "652cf04d.917e78",
+        "x": 3419.5957832336426,
+        "y": 4262.118572235107,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "393f0cf4.4aabc4"
+                "a878b424.24494"
             ]
         ]
     },
     {
-        "id": "c7e3943d.2b1af",
+        "id": "f7ab2775.d01c4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1269.4287643432617,
-        "y": 4067.270573616028,
-        "z": "652cf04d.917e78",
+        "x": 1234.4287643432617,
+        "y": 4080.5235776901245,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "f5318147.69e14",
-                "16ed0d4.c25bbf3"
+                "9fefd3f8.db8f98",
+                "60ffa0a.88fbae"
             ]
         ]
     },
     {
-        "id": "e1eddf21.903d78",
+        "id": "e518bda4.6b6118",
         "type": "set",
         "name": "set l3-network-id = -1",
         "xml": "<set>\n<parameter name='l3-network-id' value='-1' />\n",
         "comments": "",
-        "x": 1313.7621231079102,
-        "y": 3939.175227165222,
-        "z": "652cf04d.917e78",
+        "x": 1278.7621231079102,
+        "y": 3952.428231239319,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "393f0cf4.4aabc4",
+        "id": "a878b424.24494",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3600.4287605285645,
-        "y": 4248.341676712036,
-        "z": "652cf04d.917e78",
+        "x": 3565.4287605285645,
+        "y": 4261.594680786133,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "4729b379.1be23c",
-                "54222992.1960d8",
-                "5189f56d.e57b74"
+                "9cd55b24.1c69b8",
+                "6ea80d98.19177c",
+                "f903bb12.78282"
             ]
         ]
     },
     {
-        "id": "4729b379.1be23c",
+        "id": "9cd55b24.1c69b8",
         "type": "set",
         "name": "set l3-network-id = this l3-network",
         "xml": "<set>\n<parameter name='l3-network-id' value='`$aai.l3-network.l3-network[$db-network-index].network-id`' />\n",
         "comments": "",
-        "x": 3835.666763305664,
-        "y": 4210.484645843506,
-        "z": "652cf04d.917e78",
+        "x": 3800.666763305664,
+        "y": 4223.7376499176025,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "886b4211.4bd9a",
+        "id": "e56d0bf4.28331",
         "type": "switchNode",
         "name": "switch l3-network-id",
         "xml": "<switch test='`$l3-network-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1310.7620468139648,
-        "y": 4262.842268943787,
-        "z": "652cf04d.917e78",
+        "x": 1275.7620468139648,
+        "y": 4276.095273017883,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "74e3a542.ce5c34"
+                "b5902ad4.0ee7f"
             ]
         ]
     },
     {
-        "id": "74e3a542.ce5c34",
+        "id": "b5902ad4.0ee7f",
         "type": "outcome",
         "name": "-1",
         "xml": "<outcome value='-1'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1480.7619972229004,
-        "y": 4262.842024803162,
-        "z": "652cf04d.917e78",
+        "x": 1445.7619972229004,
+        "y": 4276.095028877258,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c374836e.37fed8"
+                "d3e41f3b.440478"
             ]
         ]
     },
     {
-        "id": "d4235437.829c38",
+        "id": "854ae13c.f926a",
         "type": "switchNode",
         "name": "switch input model-invariant-uuid",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 616.9525375366211,
-        "y": 2569.7856969833374,
-        "z": "652cf04d.917e78",
+        "x": 581.9525375366211,
+        "y": 2583.038701057434,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ff6622a4.df1be",
-                "cb85aa4.8fd2d58"
+                "78e93e80.eb3758",
+                "92899c0f.845368"
             ]
         ]
     },
     {
-        "id": "ff6622a4.df1be",
+        "id": "78e93e80.eb3758",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 822.6192092895508,
-        "y": 2546.9286603927612,
-        "z": "652cf04d.917e78",
+        "x": 787.6192092895508,
+        "y": 2560.181664466858,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "30224228.963f36"
+                "cbfc20ba.1ec18"
             ]
         ]
     },
     {
-        "id": "cb85aa4.8fd2d58",
+        "id": "92899c0f.845368",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 824.0478057861328,
-        "y": 2591.2142515182495,
-        "z": "652cf04d.917e78",
+        "x": 789.0478057861328,
+        "y": 2604.467255592346,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "5a4f9595.634e9c"
+                "d83d8af0.833c68"
             ]
         ]
     },
     {
-        "id": "5a4f9595.634e9c",
+        "id": "d83d8af0.833c68",
         "type": "set",
         "name": "set from input",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n",
         "comments": "",
-        "x": 978.3335418701172,
-        "y": 2590.6428236961365,
-        "z": "652cf04d.917e78",
+        "x": 943.3335418701172,
+        "y": 2603.895827770233,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "1a70dac.17cd8a5",
+        "id": "551d3619.97d4a",
         "type": "set",
         "name": "set from DB",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'\n  value='`$db.vf-model.uuid`' />\n",
         "comments": "",
-        "x": 974.0477333068848,
-        "y": 2635.4999294281006,
-        "z": "652cf04d.917e78",
+        "x": 939.0477333068848,
+        "y": 2648.7529335021973,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "d7771a1c.3c6348",
+        "id": "e553a1ad.69aae8",
         "type": "switchNode",
         "name": "switch input model-uuid",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 589.5715560913086,
-        "y": 2658.3244342803955,
-        "z": "652cf04d.917e78",
+        "x": 554.5715560913086,
+        "y": 2671.577438354492,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c16c7be1.296e98",
-                "37c94a54.90c536"
+                "8caf4514.78bf88",
+                "be07810c.32c568"
             ]
         ]
     },
     {
-        "id": "c16c7be1.296e98",
+        "id": "8caf4514.78bf88",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 823.5715293884277,
-        "y": 2635.467366218567,
-        "z": "652cf04d.917e78",
+        "x": 788.5715293884277,
+        "y": 2648.7203702926636,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "1a70dac.17cd8a5"
+                "551d3619.97d4a"
             ]
         ]
     },
     {
-        "id": "37c94a54.90c536",
+        "id": "be07810c.32c568",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 825.0001258850098,
-        "y": 2679.752957344055,
-        "z": "652cf04d.917e78",
+        "x": 790.0001258850098,
+        "y": 2693.005961418152,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "857b4df6.43f238"
+                "17d2700c.c69678"
             ]
         ]
     },
     {
-        "id": "857b4df6.43f238",
+        "id": "17d2700c.c69678",
         "type": "set",
         "name": "set from input",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n",
         "comments": "",
-        "x": 979.2858619689941,
-        "y": 2679.181529521942,
-        "z": "652cf04d.917e78",
+        "x": 944.2858619689941,
+        "y": 2692.434533596039,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "2709bb13.2feecc",
+        "id": "84eb2be6.d05dd8",
         "type": "set",
         "name": "set from DB",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'\n  value='`$db.vf-model.version`' />\n",
         "comments": "",
-        "x": 971.1906661987305,
-        "y": 2724.3571367263794,
-        "z": "652cf04d.917e78",
+        "x": 936.1906661987305,
+        "y": 2737.610140800476,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "6a3932df.a191e4",
+        "id": "3c1e9c3a.58c014",
         "type": "switchNode",
         "name": "switch input model-version",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 597.714427947998,
-        "y": 2747.1815814971924,
-        "z": "652cf04d.917e78",
+        "x": 562.714427947998,
+        "y": 2760.434585571289,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "cc5bd4f7.75a8d",
-                "d224df1c.f2e0d8"
+                "c7cffc9c.c74c18",
+                "749f7daf.7828bc"
             ]
         ]
     },
     {
-        "id": "cc5bd4f7.75a8d",
+        "id": "c7cffc9c.c74c18",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 820.714412689209,
-        "y": 2724.324543952942,
-        "z": "652cf04d.917e78",
+        "x": 785.714412689209,
+        "y": 2737.5775480270386,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "2709bb13.2feecc"
+                "84eb2be6.d05dd8"
             ]
         ]
     },
     {
-        "id": "d224df1c.f2e0d8",
+        "id": "749f7daf.7828bc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 822.143009185791,
-        "y": 2768.61013507843,
-        "z": "652cf04d.917e78",
+        "x": 787.143009185791,
+        "y": 2781.863139152527,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "8204943d.4c85a"
+                "7f3261c9.80b3c"
             ]
         ]
     },
     {
-        "id": "8204943d.4c85a",
+        "id": "7f3261c9.80b3c",
         "type": "set",
         "name": "set from input",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`' />\n",
         "comments": "",
-        "x": 976.4287452697754,
-        "y": 2768.038707256317,
-        "z": "652cf04d.917e78",
+        "x": 941.4287452697754,
+        "y": 2781.291711330414,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "1f9db65f.71417a",
+        "id": "35947427.d97814",
         "type": "set",
         "name": "set from DB",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'\n  value='`$db.vf-model.name`' />\n",
         "comments": "",
-        "x": 971.1906661987305,
-        "y": 2811.4999589920044,
-        "z": "652cf04d.917e78",
+        "x": 936.1906661987305,
+        "y": 2824.752963066101,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "ba43d064.2bf358",
+        "id": "59441881.83eba8",
         "type": "switchNode",
         "name": "switch input model-name",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 592.714427947998,
-        "y": 2834.3244037628174,
-        "z": "652cf04d.917e78",
+        "x": 557.714427947998,
+        "y": 2847.577407836914,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "e920eacf.c85db",
-                "62906e0a.a907e"
+                "3209e79f.964218",
+                "186b2860.bca8f"
             ]
         ]
     },
     {
-        "id": "e920eacf.c85db",
+        "id": "3209e79f.964218",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 820.714412689209,
-        "y": 2811.467366218567,
-        "z": "652cf04d.917e78",
+        "x": 785.714412689209,
+        "y": 2824.7203702926636,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "1f9db65f.71417a"
+                "35947427.d97814"
             ]
         ]
     },
     {
-        "id": "62906e0a.a907e",
+        "id": "186b2860.bca8f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 822.143009185791,
-        "y": 2855.752957344055,
-        "z": "652cf04d.917e78",
+        "x": 787.143009185791,
+        "y": 2869.005961418152,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ced1f56b.7c6248"
+                "179f336a.4f2225"
             ]
         ]
     },
     {
-        "id": "ced1f56b.7c6248",
+        "id": "179f336a.4f2225",
         "type": "set",
         "name": "set from input",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`' />\n",
         "comments": "",
-        "x": 976.4287452697754,
-        "y": 2855.181529521942,
-        "z": "652cf04d.917e78",
+        "x": 941.4287452697754,
+        "y": 2868.434533596039,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "65cc69a1.7d4018",
+        "id": "111ca475.bfcb9c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2245.6667251586914,
-        "y": 4112.999774932861,
-        "z": "652cf04d.917e78",
+        "x": 2210.6667251586914,
+        "y": 4126.252779006958,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "d20d55e5.845528",
+        "id": "a2d8e726.f731e",
         "type": "outcome",
         "name": "PendingDelete",
         "xml": "<outcome value='PendingDelete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2090.333366394043,
-        "y": 4067.999689102173,
-        "z": "652cf04d.917e78",
+        "x": 2055.333366394043,
+        "y": 4081.2526931762695,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "b98d1a52.3774"
+                "4fa7e935.46f178"
             ]
         ]
     },
     {
-        "id": "b98d1a52.3774",
+        "id": "4fa7e935.46f178",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2245.5474586486816,
-        "y": 4068.776566505432,
-        "z": "652cf04d.917e78",
+        "x": 2210.5474586486816,
+        "y": 4082.029570579529,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "d8961e04.47a09",
+        "id": "9931da25.1af06",
         "type": "outcome",
         "name": "Pending Create",
         "xml": "<outcome value='Pending Create'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2092.333366394043,
-        "y": 4024.666193008423,
-        "z": "652cf04d.917e78",
+        "x": 2057.333366394043,
+        "y": 4037.9191970825195,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "4552f1d0.132aa"
+                "ac4a5448.bd0b28"
             ]
         ]
     },
     {
-        "id": "4552f1d0.132aa",
+        "id": "ac4a5448.bd0b28",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2245.5474586486816,
-        "y": 4025.443070411682,
-        "z": "652cf04d.917e78",
+        "x": 2210.5474586486816,
+        "y": 4038.696074485779,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "6b197918.4b35",
+        "id": "c841f358.cc44e",
         "type": "outcome",
         "name": "PendingCreate",
         "xml": "<outcome value='PendingCreate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2092.333366394043,
-        "y": 3981.332941055298,
-        "z": "652cf04d.917e78",
+        "x": 2057.333366394043,
+        "y": 3994.5859451293945,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "1c2107f2.1dd77"
+                "88f5dd03.1382b8"
             ]
         ]
     },
     {
-        "id": "1c2107f2.1dd77",
+        "id": "88f5dd03.1382b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2245.5474586486816,
-        "y": 3982.109818458557,
-        "z": "652cf04d.917e78",
+        "x": 2210.5474586486816,
+        "y": 3995.362822532654,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "5bf4954f.7a431c",
+        "id": "13a2f07f.5d3d1",
         "type": "for",
         "name": "for each A&AI subnet",
         "xml": "<for index='subnet-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1778.7143936157227,
-        "y": 4402.047110080719,
-        "z": "652cf04d.917e78",
+        "x": 1743.7143936157227,
+        "y": 4415.300114154816,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "cefc1963.652428"
+                "9e9b89f7.9bdbf"
             ]
         ]
     },
     {
-        "id": "48890473.4cc4e4",
+        "id": "af0595f.ee72a68",
         "type": "set",
         "name": "set subnet_length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data_length'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet_length`' />\n",
         "comments": "",
-        "x": 1767.380958557129,
-        "y": 4447.04719209671,
-        "z": "652cf04d.917e78",
+        "x": 1732.380958557129,
+        "y": 4460.300196170807,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "54b8c442.c1469c",
+        "id": "b2968f47.d2ae78",
         "type": "set",
         "name": "set availability-zones.max-count and length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.availability-zones.max-count'\n   value='`$db.vf-model.avail-zone-max-count`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.availability-zones.availability-zone_length'\n   value='`$aai.cloud-region.availability-zones.availability-zone_length`' />\n",
         "comments": "",
-        "x": 553.0001564025879,
-        "y": 5646.547995567322,
-        "z": "652cf04d.917e78",
+        "x": 518.0001564025879,
+        "y": 5659.8009996414185,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "f4822626.6784a",
+        "id": "84464174.3953f",
         "type": "set",
         "name": "set vnf-name",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-name'\n   value='`$tmp.vnf-name`' />\n",
         "comments": "",
-        "x": 553.8333511352539,
-        "y": 2503.8334608078003,
-        "z": "652cf04d.917e78",
+        "x": 518.8333511352539,
+        "y": 2517.086464881897,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "c0f7e6fd.82944",
+        "id": "355ef255.69a646",
         "type": "save",
         "name": "update generic-vnf",
         "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"generic-vnf\"\n   key=\"generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"vnf-name\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-name`\" />\n<parameter name=\"prov-status\" value=\"PREPROV\" />\n<!-- <parameter name=\"operational-status\" value=\"out-of-service-path\" /> -->\n<parameter name=\"equipment-role\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-role`\" />\n<parameter name=\"model-invariant-id\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid`\" />\n<parameter name=\"model-version-id\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid`\" />\n<parameter name=\"model-customization-id\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid`\" />\n<parameter name=\"in-maint\" value=\"true\" />\n<parameter name=\"selflink\" value=\"`$vnf-object-path`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 473.33342361450195,
-        "y": 5856.213758468628,
-        "z": "652cf04d.917e78",
+        "x": 438.33342361450195,
+        "y": 5869.466762542725,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "7a955a19.a2beec",
-                "8245dddc.98b7b8"
+                "3613a912.ba7d8e",
+                "988ba27a.13d4"
             ]
         ]
     },
     {
-        "id": "b69c7bea.5b8f98",
+        "id": "f9d2efbe.08a05",
         "type": "set",
         "name": "set vnf-object-path",
         "xml": "<set>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vnf-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vnf-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
         "comments": "",
-        "x": 473.3334617614746,
-        "y": 5786.214241027832,
-        "z": "652cf04d.917e78",
+        "x": 438.3334617614746,
+        "y": 5799.467245101929,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "779ef85a.752e58",
+        "id": "f2183011.286a98",
         "type": "set",
         "name": "set vnf-id",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id'\n   value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n",
         "comments": "",
-        "x": 542.1666946411133,
-        "y": 2455.5000038146973,
-        "z": "652cf04d.917e78",
+        "x": 507.1666946411133,
+        "y": 2468.753007888794,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "b8b61871.289a38",
+        "id": "d9a36927.f2271",
         "type": "execute",
         "name": "printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vnf.log' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 447.8454360961914,
-        "y": 6422.226758003235,
-        "z": "652cf04d.917e78",
+        "x": 412.8454360961914,
+        "y": 6435.4797620773315,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "70b9d92d.cfcaf",
+        "id": "ee487aee.96931",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1209.3574676513672,
-        "y": 5679.833315849304,
-        "z": "652cf04d.917e78",
+        "x": 1174.3574676513672,
+        "y": 5693.086319923401,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "e0daa6a.dcf31d8"
+                "b28581b0.5712a"
             ]
         ]
     },
     {
-        "id": "8019290f.d9e57",
+        "id": "a9a85016.7d2db8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1217.928897857666,
-        "y": 5724.119029045105,
-        "z": "652cf04d.917e78",
+        "x": 1182.928897857666,
+        "y": 5737.372033119202,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ca1e10f7.f5af08"
+                "1b732815.14e07"
             ]
         ]
     },
     {
-        "id": "7a955a19.a2beec",
+        "id": "3613a912.ba7d8e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 647.6907539367676,
-        "y": 5834.833353996277,
-        "z": "652cf04d.917e78",
+        "x": 612.6907539367676,
+        "y": 5848.0863580703735,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "2e13fdd8.c6ad92"
+                "8d790e64.fbc6b8"
             ]
         ]
     },
     {
-        "id": "8245dddc.98b7b8",
+        "id": "988ba27a.13d4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 656.2621841430664,
-        "y": 5879.119067192078,
-        "z": "652cf04d.917e78",
+        "x": 621.2621841430664,
+        "y": 5892.372071266174,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "eba4fe8c.3ea98"
+                "86656044.af7ea"
             ]
         ]
     },
     {
-        "id": "f7b6f1fc.97c858",
+        "id": "ec714a9b.c38d8",
         "type": "set",
         "name": "set model-customization-uuid",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n",
         "comments": "",
-        "x": 605.5000152587891,
-        "y": 2907.1666078567505,
-        "z": "652cf04d.917e78",
+        "x": 570.5000152587891,
+        "y": 2920.419611930847,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "8379176c.854518",
+        "id": "412ad16a.97e598",
         "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": 1427.6903991699219,
-        "y": 3027.1517295837402,
-        "z": "652cf04d.917e78",
+        "x": 1392.6903991699219,
+        "y": 3040.404733657837,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "8b3ae97b.251a1",
+        "id": "824c58c6.f6519",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1213.3571014404297,
-        "y": 3073.8185176849365,
-        "z": "652cf04d.917e78",
+        "x": 1178.3571014404297,
+        "y": 3087.071521759033,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "8379176c.854518",
-                "d417f4d3.21848",
-                "7176fd8c.2fbd64"
+                "412ad16a.97e598",
+                "62adf90d.0208a",
+                "8b5daaff.9a7c6"
             ]
         ]
     },
     {
-        "id": "7176fd8c.2fbd64",
+        "id": "8b5daaff.9a7c6",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 1397.357063293457,
-        "y": 3117.1518144607544,
-        "z": "652cf04d.917e78",
+        "x": 1362.357063293457,
+        "y": 3130.404818534851,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "87ffb6ef.f80298",
+        "id": "adba82bf.e3f3a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 785.0000953674316,
-        "y": 5557.628111839294,
-        "z": "652cf04d.917e78",
+        "x": 750.0000953674316,
+        "y": 5570.881115913391,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "bc615b55.663bf",
-                "54f75326.6021ac"
+                "12d3265f.5dba1a",
+                "9f1eceb5.e698c"
             ]
         ]
     },
     {
-        "id": "54f75326.6021ac",
+        "id": "9f1eceb5.e698c",
         "type": "save",
         "name": "save generic-vnf availability-zone relationship",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"generic-vnf:relationship-list\"\n   key=\"generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"availability-zone\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"cloud-region.cloud-owner\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.cloud-region.cloud-owner`\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"cloud-region.cloud-region-id\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value=\"`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-key\" value=\"availability-zone.availability-zone-name\" />\n    <parameter name=\"relationship-list.relationship[0].relationship-data[2].relationship-value\" value=\"`$aai.cloud-region.availability-zones.availability-zone[$idx].availability-zone-name`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1078.3334846496582,
-        "y": 5580.9615659713745,
-        "z": "652cf04d.917e78",
+        "x": 1043.3334846496582,
+        "y": 5594.214570045471,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "43faed04.0b6094",
-                "82cc2525.32135"
+                "53715461.bc7134",
+                "6c10af82.f8022"
             ]
         ]
     },
     {
-        "id": "43faed04.0b6094",
+        "id": "53715461.bc7134",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1343.1667366027832,
-        "y": 5561.833388328552,
-        "z": "652cf04d.917e78",
+        "x": 1308.1667366027832,
+        "y": 5575.086392402649,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "662f403a.490a78"
+                "6293928d.4f10b4"
             ]
         ]
     },
     {
-        "id": "82cc2525.32135",
+        "id": "6c10af82.f8022",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1351.738166809082,
-        "y": 5606.119101524353,
-        "z": "652cf04d.917e78",
+        "x": 1316.738166809082,
+        "y": 5619.37210559845,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "bf452558.9a9008"
+                "6db07962.51fbc8"
             ]
         ]
     },
     {
-        "id": "c3672ff4.a17f",
+        "id": "6a48e0c.284292",
         "type": "set",
         "name": "set mapping rows to 0",
         "xml": "<set>\n<parameter name='db.vf-network-role-mapping_length' value='0' />\n",
         "comments": "",
-        "x": 1164.3094863891602,
-        "y": 3321.437578201294,
-        "z": "652cf04d.917e78",
+        "x": 1129.3094863891602,
+        "y": 3334.6905822753906,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "d350e16f.3e261",
+        "id": "d780c8df.23f2d",
         "type": "switchNode",
         "name": "switch AAI availability-zone_length",
         "xml": "<switch test='`$aai.cloud-region.availability-zones.availability-zone_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 525.7143821716309,
-        "y": 5461.437698364258,
-        "z": "652cf04d.917e78",
+        "x": 490.71438217163086,
+        "y": 5474.6907024383545,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c37c195.a21eb68"
+                "d8729b98.95027"
             ]
         ]
     },
     {
-        "id": "c37c195.a21eb68",
+        "id": "d8729b98.95027",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 744.2858009338379,
-        "y": 5461.009107589722,
-        "z": "652cf04d.917e78",
+        "x": 709.2858009338379,
+        "y": 5474.262111663818,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "8b2d772a.c6035"
+                "2f2de77d.f8076"
             ]
         ]
     },
     {
-        "id": "609ae975.3eddb8",
+        "id": "31d3db7d.e44bd4",
         "type": "set",
         "name": "set availability-zone_length to 0",
         "xml": "<set>\n<parameter name='aai.cloud-region.availability-zones.availability-zone_length' value='0' />\n",
         "comments": "",
-        "x": 1345.714443206787,
-        "y": 5479.580345153809,
-        "z": "652cf04d.917e78",
+        "x": 1310.714443206787,
+        "y": 5492.833349227905,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "8b2d772a.c6035",
+        "id": "2f2de77d.f8076",
         "type": "switchNode",
         "name": "switch AZ max count > 0",
         "xml": "<switch test='`$db.vf-model.avail-zone-max-count &gt; 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 932.8572731018066,
-        "y": 5461.43741941452,
-        "z": "652cf04d.917e78",
+        "x": 897.8572731018066,
+        "y": 5474.690423488617,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "e3d0a053.f7b56",
-                "cc1abe7a.9fa1e8"
+                "bc335e49.ca576",
+                "4dbb85e4.b65d54"
             ]
         ]
     },
     {
-        "id": "e3d0a053.f7b56",
+        "id": "bc335e49.ca576",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1135.7143802642822,
-        "y": 5435.723169326782,
-        "z": "652cf04d.917e78",
+        "x": 1100.7143802642822,
+        "y": 5448.976173400879,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "cf09642d.dcd6b"
+                "9c4ebd50.5f47c"
             ]
         ]
     },
     {
-        "id": "cc1abe7a.9fa1e8",
+        "id": "4dbb85e4.b65d54",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1137.1430015563965,
-        "y": 5480.008916854858,
-        "z": "652cf04d.917e78",
+        "x": 1102.1430015563965,
+        "y": 5493.261920928955,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "609ae975.3eddb8"
+                "31d3db7d.e44bd4"
             ]
         ]
     },
     {
-        "id": "b0ee28b4.7573a8",
+        "id": "b05338be.f1a848",
         "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": 563.5357437133789,
-        "y": 240.4255886077881,
-        "z": "652cf04d.917e78",
+        "x": 528.5357437133789,
+        "y": 253.67859268188477,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "241fabfe.69fa2c",
+        "id": "52dafc17.f6736c",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 770.6190414428711,
-        "y": 1905.2470073699951,
-        "z": "652cf04d.917e78",
+        "x": 735.6190414428711,
+        "y": 1918.5000114440918,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "f0c5497d.1fa168"
+                "24abbaae.a59486"
             ]
         ]
     },
     {
-        "id": "15d4f6ac.d5e021",
+        "id": "80c67434.3bcca",
         "type": "switchNode",
         "name": "switch ecomp-naming",
         "xml": "<switch test='`$db.vf-model.ecomp-generated-naming`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1148.2384300231934,
-        "y": 1805.961443901062,
-        "z": "652cf04d.917e78",
+        "x": 1113.2384300231934,
+        "y": 1819.2144479751587,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "711480e9.dbef28",
-                "2199667e.3808aa",
-                "eaee02d.8418f"
+                "befd2849.9672a8",
+                "3d767b69.f885a4",
+                "4c7fffc9.d01d6"
             ]
         ]
     },
     {
-        "id": "f0c5497d.1fa168",
+        "id": "24abbaae.a59486",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 916.3335418701172,
-        "y": 1905.247124671936,
-        "z": "652cf04d.917e78",
+        "x": 881.3335418701172,
+        "y": 1918.5001287460327,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "15d4f6ac.d5e021",
-                "319f96a9.08ead2"
+                "80c67434.3bcca",
+                "20fbaa2f.336f4e"
             ]
         ]
     },
     {
-        "id": "2199667e.3808aa",
+        "id": "3d767b69.f885a4",
         "type": "outcome",
         "name": "N",
         "xml": "<outcome value='N'>",
         "comments": "",
         "outputs": 1,
-        "x": 1334.6668167114258,
-        "y": 1806.4375705718994,
-        "z": "652cf04d.917e78",
+        "x": 1299.6668167114258,
+        "y": 1819.690574645996,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ad1b7833.2d89a"
+                "75700df9.afdc2c"
             ]
         ]
     },
     {
-        "id": "711480e9.dbef28",
+        "id": "befd2849.9672a8",
         "type": "outcome",
         "name": "Y",
         "xml": "<outcome value='Y'>",
         "comments": "",
         "outputs": 1,
-        "x": 1334.6668090820312,
-        "y": 1765.0090246200562,
-        "z": "652cf04d.917e78",
+        "x": 1299.6668090820312,
+        "y": 1778.2620286941528,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "72fee52.6ade19c"
+                "73807db9.b39cd4"
             ]
         ]
     },
     {
-        "id": "eaee02d.8418f",
+        "id": "4c7fffc9.d01d6",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1334.6667556762695,
-        "y": 1849.2947025299072,
-        "z": "652cf04d.917e78",
+        "x": 1299.6667556762695,
+        "y": 1862.547706604004,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ad1b7833.2d89a"
+                "75700df9.afdc2c"
             ]
         ]
     },
     {
-        "id": "72fee52.6ade19c",
+        "id": "73807db9.b39cd4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1471.809726715088,
-        "y": 1765.151891708374,
-        "z": "652cf04d.917e78",
+        "x": 1436.809726715088,
+        "y": 1778.4048957824707,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "f80604c.1fec1f8",
+        "id": "7d58c1cc.73ce7",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 755.8097686767578,
-        "y": 2259.866183280945,
-        "z": "652cf04d.917e78",
+        "x": 720.8097686767578,
+        "y": 2273.1191873550415,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "1d97b077.4371"
+                "2c3bfc73.59862c"
             ]
         ]
     },
     {
-        "id": "1d97b077.4371",
+        "id": "2c3bfc73.59862c",
         "type": "set",
         "name": "set tmp.vnf-name",
         "xml": "<set>\n<parameter name='tmp.vnf-name' value=\"`$vnf-topology-operation-input.vnf-information.vnf-name`\" />\n",
         "comments": "",
-        "x": 921.5717315673828,
-        "y": 2258.7234535217285,
-        "z": "652cf04d.917e78",
+        "x": 886.5717315673828,
+        "y": 2271.976457595825,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "2b8a3d28.12eada",
+        "id": "66cbf6f1.b54768",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:generate-unique-name",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1806.643009185791,
-        "y": 1955.0089440345764,
-        "z": "652cf04d.917e78",
+        "x": 1771.643009185791,
+        "y": 1968.261948108673,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "59b40ce2.443a14",
-                "b8f390d9.9644b"
+                "f151915e.0725c8",
+                "1228e373.2d33f5"
             ]
         ]
     },
     {
-        "id": "59b40ce2.443a14",
+        "id": "f151915e.0725c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2083.7858123779297,
-        "y": 1928.5804772377014,
-        "z": "652cf04d.917e78",
+        "x": 2048.7858123779297,
+        "y": 1941.833481311798,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "841445e5.523fe"
+                "8993a315.cb4e88"
             ]
         ]
     },
     {
-        "id": "b8f390d9.9644b",
+        "id": "1228e373.2d33f5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2088.5475578308105,
-        "y": 1973.9613881111145,
-        "z": "652cf04d.917e78",
+        "x": 2053.5475578308105,
+        "y": 1987.2143921852112,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c9312147.c268c8"
+                "e8d7ccba.64afc8"
             ]
         ]
     },
     {
-        "id": "cdd8e1f0.243448",
+        "id": "92724c8a.47d3",
         "type": "set",
         "name": "set variables for generating unique name",
         "xml": "<set>\n<parameter name='generate-unique-name-input.action' value='ASSIGN' />\n<parameter name='generate-unique-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='generate-unique-name-input.index-table-name' value='VNF_NAME_INDEX' />\n<parameter name='generate-unique-name-input.index-table-prefix-column' value='vnf_name_prefix' />\n<parameter name='generate-unique-name-input.name-table-type' value='VNF_INSTANCE' />\n<parameter name='generate-unique-name-input.prefix' value=\"`'z' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + $db.vf-model.nf-code`\" />\n",
         "comments": "",
-        "x": 1761.6432609558105,
-        "y": 1906.1042637825012,
-        "z": "652cf04d.917e78",
+        "x": 1726.6432609558105,
+        "y": 1919.357267856598,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "c9312147.c268c8",
+        "id": "e8d7ccba.64afc8",
         "type": "set",
         "name": "set tmp.vnf-name to generated name",
         "xml": "<set>\n<parameter name='tmp.vnf-name' value='`$generate-unique-name-output.generated-name`' />\n",
         "comments": "",
-        "x": 2311.4519538879395,
-        "y": 1973.4374632835388,
-        "z": "652cf04d.917e78",
+        "x": 2276.4519538879395,
+        "y": 1986.6904673576355,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "319f96a9.08ead2",
+        "id": "20fbaa2f.336f4e",
         "type": "switchNode",
         "name": "switch naming-policy",
         "xml": "<switch test='`$db.vf-model.naming-policy`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1146.024013519287,
-        "y": 2014.2470607757568,
-        "z": "652cf04d.917e78",
+        "x": 1111.024013519287,
+        "y": 2027.5000648498535,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "8a5a017e.752c18",
-                "a132177.4ea1768"
+                "9d83806b.62f038",
+                "8fa1b1d0.fbecf8"
             ]
         ]
     },
     {
-        "id": "8a5a017e.752c18",
+        "id": "9d83806b.62f038",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1336.0239448547363,
-        "y": 1935.675615310669,
-        "z": "652cf04d.917e78",
+        "x": 1301.0239448547363,
+        "y": 1948.9286193847656,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "bffcbc52.3223c"
+                "3d12e035.00bfc8"
             ]
         ]
     },
     {
-        "id": "a132177.4ea1768",
+        "id": "8fa1b1d0.fbecf8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1336.2621841430664,
-        "y": 2063.056559562683,
-        "z": "652cf04d.917e78",
+        "x": 1301.2621841430664,
+        "y": 2076.30956363678,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "a0656517.5bca38"
+                "e2becadc.fd296"
             ]
         ]
     },
     {
-        "id": "bffcbc52.3223c",
+        "id": "3d12e035.00bfc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1488.8812141418457,
-        "y": 1934.2470817565918,
-        "z": "652cf04d.917e78",
+        "x": 1453.8812141418457,
+        "y": 1947.5000858306885,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "cdd8e1f0.243448",
-                "2b8a3d28.12eada"
+                "92724c8a.47d3",
+                "66cbf6f1.b54768"
             ]
         ]
     },
     {
-        "id": "7998869c.3c0bd",
+        "id": "47c613e1.e72334",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:naming-policy-generate-name",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1827.9291381835938,
-        "y": 2078.770941257477,
-        "z": "652cf04d.917e78",
+        "x": 1792.9291381835938,
+        "y": 2092.0239453315735,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "57af4cbf.e1b474",
-                "d28171a6.a4093"
+                "1b457d52.c65d7b",
+                "eb015d86.9668b8"
             ]
         ]
     },
     {
-        "id": "a0656517.5bca38",
+        "id": "e2becadc.fd296",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1490.786033630371,
-        "y": 2063.056559562683,
-        "z": "652cf04d.917e78",
+        "x": 1455.786033630371,
+        "y": 2076.30956363678,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "db8c85e7.7b71c8",
-                "7998869c.3c0bd"
+                "aa15df09.7a7e5",
+                "47c613e1.e72334"
             ]
         ]
     },
     {
-        "id": "db8c85e7.7b71c8",
+        "id": "aa15df09.7a7e5",
         "type": "set",
         "name": "set variables for generating name",
         "xml": "<set>\n<parameter name='naming-policy-generate-name-input.policy-instance-name' value='`$db.vf-model.naming-policy`' />\n<parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\n<parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='naming-policy-generate-name-input.action' value='ASSIGN' />\n<parameter name='naming-policy-generate-name-input.query-parameter' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />",
         "comments": "",
-        "x": 1737.929054260254,
-        "y": 2033.05659532547,
-        "z": "652cf04d.917e78",
+        "x": 1702.929054260254,
+        "y": 2046.3095993995667,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "b52c81d4.1a1f08",
+        "id": "388c672c.281b68",
         "type": "set",
         "name": "set tmp.vnf-name to generated name",
         "xml": "<set>\n<parameter name='tmp.vnf-name' value='`$naming-policy-generate-name-output.vnf-name`' />\n",
         "comments": "",
-        "x": 2387.7861099243164,
-        "y": 2098.770751953125,
-        "z": "652cf04d.917e78",
+        "x": 2352.7861099243164,
+        "y": 2112.0237560272217,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "e74586be.b8e6f8",
+        "id": "fe30a9c6.049198",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1954.0475997924805,
-        "y": 6545.819259643555,
-        "z": "652cf04d.917e78",
+        "x": 1919.0475997924805,
+        "y": 6559.072263717651,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "fcbc941a.75b4b8",
-                "5e0caa6d.e903f4",
-                "fef2b74e.207f2",
-                "ae834aa6.55d6c"
+                "7af5e0af.8b4d6",
+                "fcd8b4d3.ba6f18",
+                "574c5265.459624",
+                "6358f1ef.44078"
             ]
         ]
     },
     {
-        "id": "57af4cbf.e1b474",
+        "id": "1b457d52.c65d7b",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2126.095184326172,
-        "y": 2053.6994485855103,
-        "z": "652cf04d.917e78",
+        "x": 2091.095184326172,
+        "y": 2066.952452659607,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "95c2eab0.a4313"
+                "f2317901.0924b"
             ]
         ]
     },
     {
-        "id": "d28171a6.a4093",
+        "id": "eb015d86.9668b8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2130.8569297790527,
-        "y": 2099.0803594589233,
-        "z": "652cf04d.917e78",
+        "x": 2095.8569297790527,
+        "y": 2112.33336353302,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "b52c81d4.1a1f08"
+                "388c672c.281b68"
             ]
         ]
     },
     {
-        "id": "1677d157.c65a77",
+        "id": "45352996.bfa54",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 781.3332824707031,
-        "y": 1408.666666984558,
-        "z": "652cf04d.917e78",
+        "x": 746.3332824707031,
+        "y": 1421.9196710586548,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "e4f063d3.c2f668",
-                "d72cd4af.95669"
+                "de5d4aa6.20d26",
+                "c53dd783.637e6"
             ]
         ]
     },
     {
-        "id": "93239a74.eab46",
+        "id": "e4a614d.2b0f1e8",
         "type": "for",
         "name": "for each instance group id",
         "xml": "<for silentFailure='true' index='inst-group-index' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 564.6666297912598,
-        "y": 1409.333312034607,
-        "z": "652cf04d.917e78",
+        "x": 529.6666297912598,
+        "y": 1422.5863161087036,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "1677d157.c65a77"
+                "45352996.bfa54"
             ]
         ]
     },
     {
-        "id": "e4f063d3.c2f668",
+        "id": "de5d4aa6.20d26",
         "type": "get-resource",
         "name": "get-resource instance-group",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"instance-group\" \n\t\tkey=\"instance-group.id = $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id\"\n        pfx='aai.instance-group' local-only='false' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1009.3333206176758,
-        "y": 1340.3334255218506,
-        "z": "652cf04d.917e78",
+        "x": 974.3333206176758,
+        "y": 1353.5864295959473,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "2d4e4bf5.37f93c",
-                "27b813e1.4ee81c"
+                "b24bd114.d8ff3",
+                "a6647c71.e5f9"
             ]
         ]
     },
     {
-        "id": "27b813e1.4ee81c",
+        "id": "a6647c71.e5f9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1226.912612915039,
-        "y": 1371.8174781799316,
-        "z": "652cf04d.917e78",
+        "x": 1191.912612915039,
+        "y": 1385.0704822540283,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "4e3d9218.a643dc"
+                "46fc6653.09995"
             ]
         ]
     },
     {
-        "id": "2d4e4bf5.37f93c",
+        "id": "b24bd114.d8ff3",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1235.8414459228516,
-        "y": 1308.4366302490234,
-        "z": "652cf04d.917e78",
+        "x": 1200.8414459228516,
+        "y": 1321.6896343231201,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "961d4497.b1f5b"
+                "7b566e9a.02ffe"
             ]
         ]
     },
     {
-        "id": "d72cd4af.95669",
+        "id": "c53dd783.637e6",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$aai.instance-group.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 986.3332977294922,
-        "y": 1480.3333644866943,
-        "z": "652cf04d.917e78",
+        "x": 951.3332977294922,
+        "y": 1493.586368560791,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "b3fe8ef5.7f7b08"
+                "992c473e.dcde48"
             ]
         ]
     },
     {
-        "id": "b3fe8ef5.7f7b08",
+        "id": "992c473e.dcde48",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$aai.instance-group.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1199.6667404174805,
-        "y": 1480.333303451538,
-        "z": "652cf04d.917e78",
+        "x": 1164.6667404174805,
+        "y": 1493.5863075256348,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "6c3837b.20f1348"
+                "9474d3b2.f2f408"
             ]
         ]
     },
     {
-        "id": "6c3837b.20f1348",
+        "id": "9474d3b2.f2f408",
         "type": "outcome",
         "name": "collection",
         "xml": "<outcome value='collection'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1371.3333778381348,
-        "y": 1480.3333854675293,
-        "z": "652cf04d.917e78",
+        "x": 1336.3333778381348,
+        "y": 1493.586389541626,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "d9f8f3cd.64b7b8"
+                "9ec9a27e.af20a8"
             ]
         ]
     },
     {
-        "id": "d9f8f3cd.64b7b8",
+        "id": "9ec9a27e.af20a8",
         "type": "get-resource",
         "name": "get-resource collection",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"collection\" \n\t\tkey=\"collection.collection-id = $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n        pfx='aai.collection' local-only='false' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1591.3332824707031,
-        "y": 1478.6666469573975,
-        "z": "652cf04d.917e78",
+        "x": 1556.3332824707031,
+        "y": 1491.9196510314941,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "f170a79a.1b1ac",
-                "9189a100.b52d78",
-                "e1621aae.8a7778"
+                "6afa0da9.883b94",
+                "c7b84394.fef178",
+                "97a3f465.07e9e8"
             ]
         ]
     },
     {
-        "id": "9189a100.b52d78",
+        "id": "c7b84394.fef178",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1805.579475402832,
-        "y": 1430.1508359909058,
-        "z": "652cf04d.917e78",
+        "x": 1770.579475402832,
+        "y": 1443.4038400650024,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "966a3052.be8b78"
+                "61ef806e.0df108"
             ]
         ]
     },
     {
-        "id": "f170a79a.1b1ac",
+        "id": "6afa0da9.883b94",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1814.508071899414,
-        "y": 1388.4365692138672,
-        "z": "652cf04d.917e78",
+        "x": 1779.508071899414,
+        "y": 1401.6895732879639,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "e5dc44b5.d3f17"
+                "716a6bd7.84c124"
             ]
         ]
     },
     {
-        "id": "e1621aae.8a7778",
+        "id": "97a3f465.07e9e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1824.666790008545,
-        "y": 1591.9999542236328,
-        "z": "652cf04d.917e78",
+        "x": 1789.666790008545,
+        "y": 1605.2529582977295,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "23c6675b.1dfc4"
+                "47a63afa.594c84"
             ]
         ]
     },
     {
-        "id": "23c6675b.1dfc4",
+        "id": "47a63afa.594c84",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1977.9999313354492,
-        "y": 1591.3332500457764,
-        "z": "652cf04d.917e78",
+        "x": 1942.9999313354492,
+        "y": 1604.586254119873,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "9e02f3b5.206e98",
-                "8992318d.0d7de",
-                "748a871e.ccc29",
-                "22797e19.563542",
-                "1a7acef5.2220b1"
+                "fc8d9768.f53038",
+                "3e08b9aa.83f4fe",
+                "a229c3f8.cee178",
+                "5c88403d.8f70c",
+                "b9100950.4719b"
             ]
         ]
     },
     {
-        "id": "9e02f3b5.206e98",
+        "id": "fc8d9768.f53038",
         "type": "for",
         "name": "for each network-instance-group",
         "xml": "<for silentFailure='true' index='nig-index' start='0' end='`$service-data.network-instance-groups.network-instance-group_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2290.619071960449,
-        "y": 1540.5715045928955,
-        "z": "652cf04d.917e78",
+        "x": 2255.619071960449,
+        "y": 1553.8245086669922,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ff455704.dd71a8"
+                "f598f42.cc12d88"
             ]
         ]
     },
     {
-        "id": "8992318d.0d7de",
+        "id": "3e08b9aa.83f4fe",
         "type": "set",
         "name": "set found-network-instance-group to false",
         "xml": "<set>\n<parameter name='found-network-instance-group' value='false' />\n",
         "comments": "",
-        "x": 2320.6190338134766,
-        "y": 1493.9048767089844,
-        "z": "652cf04d.917e78",
+        "x": 2285.6190338134766,
+        "y": 1507.157880783081,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "ff455704.dd71a8",
+        "id": "f598f42.cc12d88",
         "type": "switchNode",
         "name": "network-instance-group-id matches?",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id\n  == $service-data.network-instance-groups.network-instance-group[$nig-index].network-instance-group-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2607.2855834960938,
-        "y": 1540.5715036392212,
-        "z": "652cf04d.917e78",
+        "x": 2572.2855834960938,
+        "y": 1553.8245077133179,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "add4fb90.7b64c"
+                "1e6ccb0d.3ab915"
             ]
         ]
     },
     {
-        "id": "add4fb90.7b64c",
+        "id": "1e6ccb0d.3ab915",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2828.952362060547,
-        "y": 1540.5714683532715,
-        "z": "652cf04d.917e78",
+        "x": 2793.952362060547,
+        "y": 1553.8244724273682,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c85d2956.aba338"
+                "af6921dc.843bf8"
             ]
         ]
     },
     {
-        "id": "c85d2956.aba338",
+        "id": "af6921dc.843bf8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2958.952392578125,
-        "y": 1540.5715446472168,
-        "z": "652cf04d.917e78",
+        "x": 2923.952392578125,
+        "y": 1553.8245487213135,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "40850f47.7a7e78",
-                "52b6fff4.bf5a48"
+                "99fc5b9.3b391a8",
+                "8ddc955c.4fd378"
             ]
         ]
     },
     {
-        "id": "40850f47.7a7e78",
+        "id": "99fc5b9.3b391a8",
         "type": "set",
         "name": "set found-network-instance-group to true",
         "xml": "<set>\n<parameter name='found-network-instance-group' value='true' />\n",
         "comments": "",
-        "x": 3232.285758972168,
-        "y": 1515.5715236663818,
-        "z": "652cf04d.917e78",
+        "x": 3197.285758972168,
+        "y": 1528.8245277404785,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "52b6fff4.bf5a48",
+        "id": "8ddc955c.4fd378",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3125.619373321533,
-        "y": 1563.904893875122,
-        "z": "652cf04d.917e78",
+        "x": 3090.619373321533,
+        "y": 1577.1578979492188,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "748a871e.ccc29",
+        "id": "a229c3f8.cee178",
         "type": "switchNode",
         "name": "switch found-network-instance-group",
         "xml": "<switch test='`$found-network-instance-group`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2302.285690307617,
-        "y": 1590.5714855194092,
-        "z": "652cf04d.917e78",
+        "x": 2267.285690307617,
+        "y": 1603.8244895935059,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "88c71dfb.666f4"
+                "69302a2b.72ec7c"
             ]
         ]
     },
     {
-        "id": "88c71dfb.666f4",
+        "id": "69302a2b.72ec7c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2523.952537536621,
-        "y": 1590.5715079307556,
-        "z": "652cf04d.917e78",
+        "x": 2488.952537536621,
+        "y": 1603.8245120048523,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "19fba1ff.3d7996"
+                "8e578fe.a90fc7"
             ]
         ]
     },
     {
-        "id": "a88c2f3d.bf4fa8",
+        "id": "ce494650.e8a068",
         "type": "set",
         "name": "set tmp.vnf-network-collection_length to 0",
         "xml": "<set>\n<parameter name='tmp.vnf-network-collection_length' value='0' />\n",
         "comments": "",
-        "x": 612.9999694824219,
-        "y": 1360.3334436416626,
-        "z": "652cf04d.917e78",
+        "x": 577.9999694824219,
+        "y": 1373.5864477157593,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "22797e19.563542",
+        "id": "5c88403d.8f70c",
         "type": "set",
         "name": "set vnf-network-collection data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-network-collections.vnf-network-collection[$tmp.vnf-network-collection_length].network-instance-group-function'\n  value='`$aai.instance-group.instance-group-function`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-network-collections.vnf-network-collection[$tmp.vnf-network-collection_length].network-instance-group-id'\n  value='`$aai.instance-group.id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-network-collections.vnf-network-collection[$tmp.vnf-network-collection_length].network-collection-service-instance-id'\n  value='`$service-data.network-instance-groups.network-instance-group[$nig-index].service-instance-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-network-collections.vnf-network-collection[$tmp.vnf-network-collection_length].network-collection-customization-uuid'\n  value='`$aai.collection.collection-customization-id`' />\n",
         "comments": "",
-        "x": 2282.2860145568848,
-        "y": 1638.904821395874,
-        "z": "652cf04d.917e78",
+        "x": 2247.2860145568848,
+        "y": 1652.1578254699707,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "1a7acef5.2220b1",
+        "id": "b9100950.4719b",
         "type": "set",
         "name": "increment tmp.vnf-network-collection_length",
         "xml": "<set>\n<parameter name='tmp.vnf-network-collection_length' value='`$tmp.vnf-network-collection_length + 1`' />\n",
         "comments": "",
-        "x": 2323.95272064209,
-        "y": 1685.5714893341064,
-        "z": "652cf04d.917e78",
+        "x": 2288.95272064209,
+        "y": 1698.8244934082031,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "3e36f71.f2f0b88",
+        "id": "42a167cf.392ce",
         "type": "set",
         "name": "set vnf-network-collection_length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-network-collections.vnf-network-collection_length'\n  value='`$tmp.vnf-network-collection_length`' />\n",
         "comments": "",
-        "x": 592.1666641235352,
-        "y": 1617.8333930969238,
-        "z": "652cf04d.917e78",
+        "x": 557.1666641235352,
+        "y": 1631.0863971710205,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "6e06d5a1.039e24",
+        "id": "e2a99281.564c38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 710.0000457763672,
-        "y": 5950.80961894989,
-        "z": "652cf04d.917e78",
+        "x": 675.0000457763672,
+        "y": 5964.062623023987,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "15f88503.d536cb"
+                "d6f181ce.7c619"
             ]
         ]
     },
     {
-        "id": "b3a3b6d8.b3b1a",
+        "id": "f94face8.c5b278",
         "type": "for",
         "name": "for each instance group id",
         "xml": "<for silentFailure='true' index='inst-group-index' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 493.3333930969238,
-        "y": 5951.476263999939,
-        "z": "652cf04d.917e78",
+        "x": 458.3333930969238,
+        "y": 5964.729268074036,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "6e06d5a1.039e24"
+                "e2a99281.564c38"
             ]
         ]
     },
     {
-        "id": "15f88503.d536cb",
+        "id": "d6f181ce.7c619",
         "type": "save",
         "name": "save generic-vnf relationship to instance-group",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n   resource=\"generic-vnf:relationship-list\"\n   key=\"generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-information.vnf-id\"\n   force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"relationship-list.relationship[0].related-to\" value=\"instance-group\" />\n    <parameter name=\"relationship-list.relationship[0].related-link\"\n      value=\"`'/aai/v$/network/instance-groups/instance-group/'\n        + $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 993.3333740234375,
-        "y": 5950.333299636841,
-        "z": "652cf04d.917e78",
+        "x": 958.3333740234375,
+        "y": 5963.5863037109375,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ab9ecf4.f4a9ab",
-                "7760b70d.6ce06"
+                "4be229a4.6bace8",
+                "6d8aaab7.01cacc"
             ]
         ]
     },
     {
-        "id": "ab9ecf4.f4a9ab",
+        "id": "4be229a4.6bace8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1252.6905975341797,
-        "y": 5927.285715103149,
-        "z": "652cf04d.917e78",
+        "x": 1217.6905975341797,
+        "y": 5940.538719177246,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "1ce1d0e3.b09f8f"
+                "df50542d.c5f3b8"
             ]
         ]
     },
     {
-        "id": "7760b70d.6ce06",
+        "id": "6d8aaab7.01cacc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1261.2620277404785,
-        "y": 5971.57142829895,
-        "z": "652cf04d.917e78",
+        "x": 1226.2620277404785,
+        "y": 5984.824432373047,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "85592822.f54ce"
+                "1108a556.80c593"
             ]
         ]
     },
     {
-        "id": "5621d64.66c8228",
+        "id": "441a09f7.0fe6e8",
         "type": "switchNode",
         "name": "switch subnet_length",
         "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1314.9047927856445,
-        "y": 4383.428667068481,
-        "z": "652cf04d.917e78",
+        "x": 1279.9047927856445,
+        "y": 4396.681671142578,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "590fbfa.56ffd4",
-                "55fd7e77.380188",
-                "5c002b3b.bf14dc"
+                "74592fe8.651",
+                "2e10a2f1.6aa266",
+                "be4baf78.88dfd"
             ]
         ]
     },
     {
-        "id": "590fbfa.56ffd4",
+        "id": "74592fe8.651",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1487.7619552612305,
-        "y": 4346.285726547241,
-        "z": "652cf04d.917e78",
+        "x": 1452.7619552612305,
+        "y": 4359.538730621338,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c908a6ad.557b18"
+                "100a9f4a.252ff9"
             ]
         ]
     },
     {
-        "id": "55fd7e77.380188",
+        "id": "2e10a2f1.6aa266",
         "type": "outcome",
         "name": "0",
         "xml": "<outcome value='0'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1489.1905250549316,
-        "y": 4384.856889724731,
-        "z": "652cf04d.917e78",
+        "x": 1454.1905250549316,
+        "y": 4398.109893798828,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c908a6ad.557b18"
+                "100a9f4a.252ff9"
             ]
         ]
     },
     {
-        "id": "5c002b3b.bf14dc",
+        "id": "be4baf78.88dfd",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1487.7619895935059,
-        "y": 4423.428281784058,
-        "z": "652cf04d.917e78",
+        "x": 1452.7619895935059,
+        "y": 4436.681285858154,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "42d5e987.8ca46"
+                "189f5e1c.6f1062"
             ]
         ]
     },
     {
-        "id": "42d5e987.8ca46",
+        "id": "189f5e1c.6f1062",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1609.190544128418,
-        "y": 4423.428548812866,
-        "z": "652cf04d.917e78",
+        "x": 1574.190544128418,
+        "y": 4436.681552886963,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "5bf4954f.7a431c",
-                "48890473.4cc4e4"
+                "13a2f07f.5d3d1",
+                "af0595f.ee72a68"
             ]
         ]
     },
     {
-        "id": "c908a6ad.557b18",
+        "id": "100a9f4a.252ff9",
         "type": "set",
         "name": "set subnet_length to 0",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data_length'\n   value='0' />\n",
         "comments": "",
-        "x": 1680.6191482543945,
-        "y": 4354.856889724731,
-        "z": "652cf04d.917e78",
+        "x": 1645.6191482543945,
+        "y": 4368.109893798828,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "525bcd69.d52c4c",
+        "id": "bf83b00.ffd5dd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 298.0793991088867,
-        "y": 420.11908626556396,
-        "z": "652cf04d.917e78",
+        "x": 263.0793991088867,
+        "y": 433.37209033966064,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "b0ee28b4.7573a8",
-                "65b55bf0.e17c94",
-                "c29453e1.d0b3d8",
-                "3f69e8e3.cf5be8",
-                "819ca24a.f2412",
-                "4ce50465.9ccc0c",
-                "5369940c.e48364"
+                "b05338be.f1a848",
+                "d8bf5428.1ff1",
+                "c4069bd9.1face",
+                "77593791.068cb",
+                "cfb0be93.de4aa8",
+                "5f72fb15.e2e8f4",
+                "7e13039d.149664",
+                "caa8d84a.f0775"
             ]
         ]
     },
     {
-        "id": "cefc1963.652428",
+        "id": "9e9b89f7.9bdbf",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1950.3810005187988,
-        "y": 4402.032744407654,
-        "z": "652cf04d.917e78",
+        "x": 1915.3810005187988,
+        "y": 4415.2857484817505,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "bfb8729.d25369",
-                "1546bd44.dac763",
-                "c11ff570.face3",
-                "b2dc37a2.39945"
+                "27478f81.0dd9e",
+                "8b199eff.6505a8",
+                "221ad9cb.af5a46",
+                "436d4bc.d154434"
             ]
         ]
     },
     {
-        "id": "680457ce.355c7",
+        "id": "125c5567.a44893",
         "type": "set",
         "name": "clear aai.l3-network",
         "xml": "<set>\n<parameter name='aai.l3-network.' value='' />\n",
         "comments": "",
-        "x": 1301.8095703125,
-        "y": 3456.3182973861694,
-        "z": "652cf04d.917e78",
+        "x": 1266.8095703125,
+        "y": 3469.571301460266,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "54222992.1960d8",
+        "id": "6ea80d98.19177c",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3750.6663818359375,
-        "y": 4302.032426834106,
-        "z": "652cf04d.917e78",
+        "x": 3715.6663818359375,
+        "y": 4315.285430908203,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "16ed0d4.c25bbf3",
+        "id": "60ffa0a.88fbae",
         "type": "set",
         "name": "set found-network to false",
         "xml": "<set>\n<parameter name='found-network' value='false' />\n",
         "comments": "",
-        "x": 1450.380973815918,
-        "y": 4007.7468309402466,
-        "z": "652cf04d.917e78",
+        "x": 1415.380973815918,
+        "y": 4020.9998350143433,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "e8b88764.0e454",
+        "id": "ebfe35e9.d51238",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2422.0952796936035,
-        "y": 4162.032627105713,
-        "z": "652cf04d.917e78",
+        "x": 2387.0952796936035,
+        "y": 4175.28563117981,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "81eba499.0af278",
-                "8cc5b790.718ca"
+                "48ea8c97.939764",
+                "e9ad3c1f.8ebed"
             ]
         ]
     },
     {
-        "id": "8cc5b790.718ca",
+        "id": "e9ad3c1f.8ebed",
         "type": "switchNode",
         "name": "switch found-network",
         "xml": "<switch test='`$found-network`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2613.523826599121,
-        "y": 4192.032681465149,
-        "z": "652cf04d.917e78",
+        "x": 2578.523826599121,
+        "y": 4205.285685539246,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "8e56c1e2.9c47b"
+                "2df9a3e.c617b5c"
             ]
         ]
     },
     {
-        "id": "5189f56d.e57b74",
+        "id": "f903bb12.78282",
         "type": "set",
         "name": "set found-network to true",
         "xml": "<set>\n<parameter name='found-network' value='true' />\n",
         "comments": "",
-        "x": 3806.381259918213,
-        "y": 4256.3181076049805,
-        "z": "652cf04d.917e78",
+        "x": 3771.381259918213,
+        "y": 4269.571111679077,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "8e56c1e2.9c47b",
+        "id": "2df9a3e.c617b5c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2782.095317840576,
-        "y": 4192.0326108932495,
-        "z": "652cf04d.917e78",
+        "x": 2747.095317840576,
+        "y": 4205.285614967346,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "56545bb.806fe24"
+                "7ff93171.83a9c"
             ]
         ]
     },
     {
-        "id": "56545bb.806fe24",
+        "id": "7ff93171.83a9c",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2912.095386505127,
-        "y": 4190.604004859924,
-        "z": "652cf04d.917e78",
+        "x": 2877.095386505127,
+        "y": 4203.857008934021,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "852f0b12.336648",
+        "id": "614c8409.56f694",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1622.3809967041016,
-        "y": 4135.746905326843,
-        "z": "652cf04d.917e78",
+        "x": 1587.3809967041016,
+        "y": 4148.99990940094,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "b772b2db.6bf188",
-                "aaa6bab8.ec80f"
+                "387ea551.d97d92",
+                "abe39a5e.75319"
             ]
         ]
     },
     {
-        "id": "aaa6bab8.ec80f",
+        "id": "abe39a5e.75319",
         "type": "switchNode",
         "name": "switch found-network",
         "xml": "<switch test='`$found-network`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1832.3809509277344,
-        "y": 4207.746788978577,
-        "z": "652cf04d.917e78",
+        "x": 1797.3809509277344,
+        "y": 4220.999793052673,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ae15eed2.e4fa88"
+                "4c383345.aa66a4"
             ]
         ]
     },
     {
-        "id": "ae15eed2.e4fa88",
+        "id": "4c383345.aa66a4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2000.9524421691895,
-        "y": 4207.746718406677,
-        "z": "652cf04d.917e78",
+        "x": 1965.9524421691895,
+        "y": 4220.999722480774,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "290a5acd.b811fe"
+                "ce5f59f.7f086a8"
             ]
         ]
     },
     {
-        "id": "290a5acd.b811fe",
+        "id": "ce5f59f.7f086a8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2130.9525108337402,
-        "y": 4206.318112373352,
-        "z": "652cf04d.917e78",
+        "x": 2095.9525108337402,
+        "y": 4219.571116447449,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "c11ff570.face3",
+        "id": "221ad9cb.af5a46",
         "type": "set",
         "name": "set subnet data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].ip-version'\n   value='`$tmp.ip-version`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].subnet-id'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].neutron-subnet-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].sdnc-subnet-id'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].subnet-role'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].subnet-name'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-name`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].network-start-address'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].network-start-address`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].gateway-address'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].gateway-address`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].cidr-mask'\n   value='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].cidr-mask`' />\n",
         "comments": "",
-        "x": 2104.6667671203613,
-        "y": 4432.714490890503,
-        "z": "652cf04d.917e78",
+        "x": 2069.6667671203613,
+        "y": 4445.9674949646,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "b2dc37a2.39945",
+        "id": "436d4bc.d154434",
         "type": "switchNode",
         "name": "switch dhcp-enabled",
         "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].dhcp-enabled`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2119.1905479431152,
-        "y": 4485.557444572449,
-        "z": "652cf04d.917e78",
+        "x": 2084.1905479431152,
+        "y": 4498.810448646545,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "cd2523f4.0b1db8",
-                "2a325c94.48677c"
+                "d5f84fa.0e1b6b",
+                "a9a99866.3c80c8"
             ]
         ]
     },
     {
-        "id": "cd2523f4.0b1db8",
+        "id": "d5f84fa.0e1b6b",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2282.047712598528,
-        "y": 4464.1288022994995,
-        "z": "652cf04d.917e78",
+        "x": 2247.047712598528,
+        "y": 4477.381806373596,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "5385445e.1587b4"
+                "e9f0968.3130768"
             ]
         ]
     },
     {
-        "id": "2a325c94.48677c",
+        "id": "a9a99866.3c80c8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2280.6190452575684,
-        "y": 4509.843228340149,
-        "z": "652cf04d.917e78",
+        "x": 2245.6190452575684,
+        "y": 4523.096232414246,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "83b7359e.e55738"
+                "97ff2f93.5af418"
             ]
         ]
     },
     {
-        "id": "5385445e.1587b4",
+        "id": "e9f0968.3130768",
         "type": "set",
         "name": "set dhcp-enabled to Y",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].dhcp-enabled'\n   value='Y' />\n",
         "comments": "",
-        "x": 2454.9049110412598,
-        "y": 4462.700198173523,
-        "z": "652cf04d.917e78",
+        "x": 2419.9049110412598,
+        "y": 4475.95320224762,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "83b7359e.e55738",
+        "id": "97ff2f93.5af418",
         "type": "set",
         "name": "set dhcp-enabled to N",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].subnets-data.subnet-data[$subnet-index].dhcp-enabled'\n   value='N' />\n",
         "comments": "",
-        "x": 2452.047679901123,
-        "y": 4509.843228340149,
-        "z": "652cf04d.917e78",
+        "x": 2417.047679901123,
+        "y": 4523.096232414246,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "bfb8729.d25369",
+        "id": "27478f81.0dd9e",
         "type": "switchNode",
         "name": "switch subnet-role",
         "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2119.666717529297,
-        "y": 4314.605116844177,
-        "z": "652cf04d.917e78",
+        "x": 2084.666717529297,
+        "y": 4327.858120918274,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "b3461715.a1c54"
+                "bb5883df.25b6c"
             ]
         ]
     },
     {
-        "id": "b3461715.a1c54",
+        "id": "bb5883df.25b6c",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 2286.333320617676,
-        "y": 4314.604768753052,
-        "z": "652cf04d.917e78",
+        "x": 2251.333320617676,
+        "y": 4327.857772827148,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "3b809c11.157b54"
+                "54f77f42.c0543"
             ]
         ]
     },
     {
-        "id": "3b809c11.157b54",
+        "id": "54f77f42.c0543",
         "type": "set",
         "name": "set subnet-role to NONE",
         "xml": "<set>\n<parameter name='aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role' value='NONE' />\n",
         "comments": "",
-        "x": 2468.0001068115234,
-        "y": 4313.93842124939,
-        "z": "652cf04d.917e78",
+        "x": 2433.0001068115234,
+        "y": 4327.191425323486,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "1546bd44.dac763",
+        "id": "8b199eff.6505a8",
         "type": "switchNode",
         "name": "switch ip-version",
         "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].ip-version`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2114.9050521850586,
-        "y": 4379.096222877502,
-        "z": "652cf04d.917e78",
+        "x": 2079.9050521850586,
+        "y": 4392.349226951599,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "d33d7dba.02ad08",
-                "9e9034a9.798778"
+                "eacc43b8.98473",
+                "dddbd62a.34648"
             ]
         ]
     },
     {
-        "id": "d33d7dba.02ad08",
+        "id": "eacc43b8.98473",
         "type": "outcome",
         "name": "4",
         "xml": "<outcome value='4'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2280.6191940307617,
-        "y": 4360.524620056152,
-        "z": "652cf04d.917e78",
+        "x": 2245.6191940307617,
+        "y": 4373.777624130249,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "b8e9d995.95c2a8"
+                "9599a2f4.865eb8"
             ]
         ]
     },
     {
-        "id": "9e9034a9.798778",
+        "id": "dddbd62a.34648",
         "type": "outcome",
         "name": "6",
         "xml": "<outcome value='6'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2280.619155883789,
-        "y": 4401.953363418579,
-        "z": "652cf04d.917e78",
+        "x": 2245.619155883789,
+        "y": 4415.206367492676,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "6716e11d.548a3"
+                "a3d9012f.d50af"
             ]
         ]
     },
     {
-        "id": "b8e9d995.95c2a8",
+        "id": "9599a2f4.865eb8",
         "type": "set",
         "name": "set tmp.ip-version to ipv4",
         "xml": "<set>\n<parameter name='tmp.ip-version' value='ipv4' />\n",
         "comments": "",
-        "x": 2467.7619590759277,
-        "y": 4359.667547225952,
-        "z": "652cf04d.917e78",
+        "x": 2432.7619590759277,
+        "y": 4372.920551300049,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "6716e11d.548a3",
+        "id": "a3d9012f.d50af",
         "type": "set",
         "name": "set tmp.ip-version to ipv6",
         "xml": "<set>\n<parameter name='tmp.ip-version' value='ipv6' />\n",
         "comments": "",
-        "x": 2466.333511352539,
-        "y": 4401.953365325928,
-        "z": "652cf04d.917e78",
+        "x": 2431.333511352539,
+        "y": 4415.206369400024,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "f73eb405.e256b8",
+        "id": "83a5f952.36e31",
         "type": "switchNode",
         "name": "switch network-role",
         "xml": "<switch test='`$db.vf-network-role-mapping[$role-index].network-role`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 747.3332443237305,
-        "y": 4387.333273887634,
-        "z": "652cf04d.917e78",
+        "x": 712.3332443237305,
+        "y": 4400.586277961731,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "a1e4bd7f.d5ea9",
-                "a8f001ac.33558",
-                "7a9134fc.396d14",
-                "39a7a020.ba1f58"
+                "785a1f35.a43408",
+                "3d7e83e8.a71994",
+                "67ddcd30.ef6e14",
+                "47ca43a8.5c2a5c"
             ]
         ]
     },
     {
-        "id": "a1e4bd7f.d5ea9",
+        "id": "785a1f35.a43408",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 915.4285087585449,
-        "y": 4285.66668510437,
-        "z": "652cf04d.917e78",
+        "x": 880.4285087585449,
+        "y": 4298.919689178467,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c630c62f.2e4b88"
+                "1a917aea.74fb6d"
             ]
         ]
     },
     {
-        "id": "a8f001ac.33558",
+        "id": "3d7e83e8.a71994",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 913.999885559082,
-        "y": 4413.999873161316,
-        "z": "652cf04d.917e78",
+        "x": 878.999885559082,
+        "y": 4427.252877235413,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "febef76b.d8c79"
+                "c302bb2b.5f6d08"
             ]
         ]
     },
     {
-        "id": "c630c62f.2e4b88",
+        "id": "1a917aea.74fb6d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1052.8095169067383,
-        "y": 4325.42826461792,
-        "z": "652cf04d.917e78",
+        "x": 1017.8095169067383,
+        "y": 4338.681268692017,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "f1e14dbb.a2c47",
+        "id": "f38e05b8.78f318",
         "type": "get-resource",
         "name": "get-resource VNF_RELATED_NETWORK_ROLE",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from VNF_RELATED_NETWORK_ROLE where vnf_customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid\n    and network_role = $db.vf-network-role-mapping[$role-index].network-role'\n  pfx='db.vnf-related-network-role[]'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1409.333339691162,
-        "y": 4717.079788208008,
-        "z": "652cf04d.917e78",
+        "x": 1374.333339691162,
+        "y": 4730.3327922821045,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "3772719.a8f170e",
-                "3270a935.e0fa9e"
+                "3f948b0e.690e64",
+                "e998b851.1c7048"
             ]
         ]
     },
     {
-        "id": "3772719.a8f170e",
+        "id": "3f948b0e.690e64",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1678.0000038146973,
-        "y": 4547.746629714966,
-        "z": "652cf04d.917e78",
+        "x": 1643.0000038146973,
+        "y": 4560.9996337890625,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "aac9396.609d348"
+                "62e01756.b02ec8"
             ]
         ]
     },
     {
-        "id": "3270a935.e0fa9e",
+        "id": "e998b851.1c7048",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1681.0000343322754,
-        "y": 4910.41314125061,
-        "z": "652cf04d.917e78",
+        "x": 1646.0000343322754,
+        "y": 4923.666145324707,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "bec6dac4.be5be"
+                "413c86fa.9792c8"
             ]
         ]
     },
     {
-        "id": "bec6dac4.be5be",
+        "id": "413c86fa.9792c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1847.333339691162,
-        "y": 4908.412796020508,
-        "z": "652cf04d.917e78",
+        "x": 1812.333339691162,
+        "y": 4921.6658000946045,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "70df31da.fe5458",
-                "10dd5c97.f83c3b",
-                "93b3be63.c398e",
-                "8d286d93.2f6ff",
-                "ad5b3ac9.e19098",
-                "8ca661f6.f5d5f8",
-                "d71dcbd8.8dc7f",
-                "32376f69.700f08",
-                "96681242.82e6c"
+                "f6a89539.411ba8",
+                "197488cf.5f2577",
+                "30161879.c0da28",
+                "95e1983d.defa7",
+                "885fafcd.073ea",
+                "d639c6e8.5989d",
+                "aa946eba.37b0e",
+                "d24fdba9.53c6",
+                "e48d6b1e.9814e"
             ]
         ]
     },
     {
-        "id": "29d3dc98.16bcd4",
+        "id": "9d09f6f3.62b358",
         "type": "outcome",
         "name": "service-instance",
         "xml": "<outcome value='service-instance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2785.618808746338,
-        "y": 4080.651467323303,
-        "z": "652cf04d.917e78",
+        "x": 2750.618808746338,
+        "y": 4093.9044713974,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "4ccf1527.e6d86c"
+                "deec3bbc.f5b66"
             ]
         ]
     },
     {
-        "id": "4ccf1527.e6d86c",
+        "id": "deec3bbc.f5b66",
         "type": "for",
         "name": "for each relationship data",
         "xml": "<for silentFailure='true' index='db-data-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3011.0946464538574,
-        "y": 4081.0800971984863,
-        "z": "652cf04d.917e78",
+        "x": 2976.0946464538574,
+        "y": 4094.333101272583,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "7aafe2ec.322514"
+                "c800e855.3f04b"
             ]
         ]
     },
     {
-        "id": "7aafe2ec.322514",
+        "id": "c800e855.3f04b",
         "type": "switchNode",
         "name": "switch relationship-key",
         "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-key`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3246.3332176208496,
-        "y": 4079.413528442383,
-        "z": "652cf04d.917e78",
+        "x": 3211.3332176208496,
+        "y": 4092.6665325164795,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "9d6550c4.3622f8"
+                "995bbfc.ce0f9c"
             ]
         ]
     },
     {
-        "id": "9d6550c4.3622f8",
+        "id": "995bbfc.ce0f9c",
         "type": "outcome",
         "name": "service-instance.service-instance-id",
         "xml": "<outcome value='service-instance.service-instance-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3512.761577606201,
-        "y": 4079.413592338562,
-        "z": "652cf04d.917e78",
+        "x": 3477.761577606201,
+        "y": 4092.6665964126587,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "7003f69f.877238"
+                "26694f48.9bd148"
             ]
         ]
     },
     {
-        "id": "7003f69f.877238",
+        "id": "26694f48.9bd148",
         "type": "set",
         "name": "set network-service-instance-id",
         "xml": "<set>\n<parameter name='network-service-instance-id'\n  value='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].relationship-data[$db-data-index].relationship-value`' />\n",
         "comments": "",
-        "x": 3806.3333625793457,
-        "y": 4077.747007369995,
-        "z": "652cf04d.917e78",
+        "x": 3771.3333625793457,
+        "y": 4091.000011444092,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "70df31da.fe5458",
+        "id": "f6a89539.411ba8",
         "type": "execute",
         "name": "generate network-topology-identifier-structure url",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.network-topology-identifier-structure`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.part\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$network-service-instance-id`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2166.6665077209473,
-        "y": 4604.080429077148,
-        "z": "652cf04d.917e78",
+        "x": 2131.6665077209473,
+        "y": 4617.333433151245,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "93b3be63.c398e",
+        "id": "30161879.c0da28",
         "type": "execute",
         "name": "execute RestApiCallNode - get network-topology-identifier-structure",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ntis-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ntis\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2223.666301727295,
-        "y": 4707.509169578552,
-        "z": "652cf04d.917e78",
+        "x": 2188.666301727295,
+        "y": 4720.762173652649,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ad3ea158.a938e8"
+                "f550e672.9125f8"
             ]
         ]
     },
     {
-        "id": "10dd5c97.f83c3b",
+        "id": "197488cf.5f2577",
         "type": "execute",
         "name": "generate network-topology-identifier-structure url (part 2)",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.part`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ntis-url\"/>\n    <parameter name=\"target\" value=\"{network-id}\"/>\n    <parameter name=\"replacement\" value=\"`$l3-network-id`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2188.333095550537,
-        "y": 4647.413772583008,
-        "z": "652cf04d.917e78",
+        "x": 2153.333095550537,
+        "y": 4660.6667766571045,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "aac69396.6ddb18",
+        "id": "a5911152.d7aeb",
         "type": "execute",
         "name": "printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vnfa.log' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 493.6667137145996,
-        "y": 4554.079788208008,
-        "z": "652cf04d.917e78",
+        "x": 458.6667137145996,
+        "y": 4567.3327922821045,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "ad3ea158.a938e8",
+        "id": "f550e672.9125f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2552.775489807129,
-        "y": 4707.259647369385,
-        "z": "652cf04d.917e78",
+        "x": 2517.775489807129,
+        "y": 4720.512651443481,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "3ecadd51.2a79da"
+                "5682a799.32827"
             ]
         ]
     },
     {
-        "id": "8d286d93.2f6ff",
+        "id": "95e1983d.defa7",
         "type": "set",
         "name": "set is-trunked and segmentation-id in vnf-network",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].is-trunked'\n    value='`$mdsal-ntis.network-topology-identifier-structure.is-trunked`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].segmentation-id'\n    value='`$mdsal-ntis.network-topology-identifier-structure.segmentation-id`' />\n    ",
         "comments": "",
-        "x": 2166.333324432373,
-        "y": 4767.746793746948,
-        "z": "652cf04d.917e78",
+        "x": 2131.333324432373,
+        "y": 4780.999797821045,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "8ca661f6.f5d5f8",
+        "id": "d639c6e8.5989d",
         "type": "save",
         "name": "custom query: get owning entity",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n      resource=\"custom-query\"\n      key=\"format = 'resource'\"\n      force=\"true\"\n      local-only=\"false\"\n      pfx=\"tmp.AnAI-data.oe\">\n<parameter name=\"start[0]\" value=\"`'nodes/service-instances/service-instance?service-instance-id=' + $network-service-instance-id `\" />\n<parameter name=\"start_length\" value=\"1\" />\n<parameter name=\"query\" value=\"/query/owning-entity-fromService-instance\" /> \n",
         "comments": "",
         "outputs": 1,
-        "x": 2107.3332176208496,
-        "y": 4843.080276489258,
-        "z": "652cf04d.917e78",
+        "x": 2072.3332176208496,
+        "y": 4856.3332805633545,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "cb08c447.df52e8",
-                "3df62a76.46167e"
+                "e2718d88.f97c7",
+                "8daa1e44.ac1f"
             ]
         ]
     },
     {
-        "id": "cb08c447.df52e8",
+        "id": "e2718d88.f97c7",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2317.5712661743164,
-        "y": 4821.74663066864,
-        "z": "652cf04d.917e78",
+        "x": 2282.5712661743164,
+        "y": 4834.999634742737,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "bd008d18.af7e28"
+                "3cb8f8f8.397e8"
             ]
         ]
     },
     {
-        "id": "3df62a76.46167e",
+        "id": "8daa1e44.ac1f",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2324.7141609191895,
-        "y": 4867.460855484009,
-        "z": "652cf04d.917e78",
+        "x": 2289.7141609191895,
+        "y": 4880.7138595581055,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "e973673a.4d16f8"
+                "9441abd.ea4d958"
             ]
         ]
     },
     {
-        "id": "57855376.396fb4",
+        "id": "e0ebd076.a4ab3",
         "type": "save",
         "name": "custom query: get tenant network",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\"\n      resource=\"custom-query\"\n      key=\"format = 'resource'\"\n      force=\"true\"\n      local-only=\"false\"\n      pfx=\"tmp.AnAI-data.get-networks\">\n<parameter name=\"start[0]\" value=\"`'/business/owning-entities/owning-entity/' + $tmp.AnAI-data.oe.results[0].owning-entity.owning-entity-id `\" />\n<parameter name=\"start_length\" value=\"1\" />\n<parameter name=\"query\" value=\"`'/query/getNetworks?networkRole=' + $db.vnf-related-network-role[$rel-network-role-index].related-network-role\n  + '&amp;cloudRegionId=' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`\" /> \n",
         "comments": "",
         "outputs": 1,
-        "x": 2557.0000343322754,
-        "y": 5016.080413818359,
-        "z": "652cf04d.917e78",
+        "x": 2522.0000343322754,
+        "y": 5029.333417892456,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "43d389bc.8dd5c",
-                "ba0b7d99.7e8938"
+                "759dfef0.b441c8",
+                "46842451.33c984"
             ]
         ]
     },
     {
-        "id": "43d389bc.8dd5c",
+        "id": "759dfef0.b441c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2770.238082885742,
-        "y": 4994.746912956238,
-        "z": "652cf04d.917e78",
+        "x": 2735.238082885742,
+        "y": 5007.9999170303345,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "1b6474fa.c07123"
+                "b524c65d.e8c7c"
             ]
         ]
     },
     {
-        "id": "ba0b7d99.7e8938",
+        "id": "46842451.33c984",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2777.3809776306152,
-        "y": 5040.461137771606,
-        "z": "652cf04d.917e78",
+        "x": 2742.3809776306152,
+        "y": 5053.714141845703,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "10aba7ed.de916"
+                "c4b783d3.51c55"
             ]
         ]
     },
     {
-        "id": "17456206.9d075e",
+        "id": "4732a97e.71d8e8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.AnAI-data.get-networks.results[0].l3-network.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2524.0000343322754,
-        "y": 5142.0805587768555,
-        "z": "652cf04d.917e78",
+        "x": 2489.0000343322754,
+        "y": 5155.333562850952,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ce79340.35758d"
+                "a9774c08.3a0168"
             ]
         ]
     },
     {
-        "id": "ce79340.35758d",
+        "id": "a9774c08.3a0168",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.AnAI-data.get-networks.results[0].l3-network.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2722.0000343322754,
-        "y": 5142.0805587768555,
-        "z": "652cf04d.917e78",
+        "x": 2687.0000343322754,
+        "y": 5155.333562850952,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "fa4ca619.db292"
+                "2124036b.f6de24"
             ]
         ]
     },
     {
-        "id": "fa4ca619.db292",
+        "id": "2124036b.f6de24",
         "type": "outcome",
         "name": "vlan-tag",
         "xml": "<outcome value='vlan-tag'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2892.0000343322754,
-        "y": 5142.0805587768555,
-        "z": "652cf04d.917e78",
+        "x": 2857.0000343322754,
+        "y": 5155.333562850952,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "4c7222a4.15e9ac"
+                "735e3d41.846f44"
             ]
         ]
     },
     {
-        "id": "4c7222a4.15e9ac",
+        "id": "735e3d41.846f44",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3060.0000343322754,
-        "y": 5140.0805587768555,
-        "z": "652cf04d.917e78",
+        "x": 3025.0000343322754,
+        "y": 5153.333562850952,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "43474b1d.d7ef7c",
-                "2b8c993e.dd7eb6",
-                "81bc4129.bb1c1"
+                "f6994075.bfe0e8",
+                "e29b5013.2064d8",
+                "2c31386.b0914c8"
             ]
         ]
     },
     {
-        "id": "43474b1d.d7ef7c",
+        "id": "f6994075.bfe0e8",
         "type": "set",
         "name": "set vlan-tag-id",
         "xml": "<set>\n<parameter name='vlan-tag-id' value='`$tmp.AnAI-data.get-networks.results[0].l3-network.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value`' />\n",
         "comments": "",
-        "x": 3236.0000343322754,
-        "y": 5100.0805587768555,
-        "z": "652cf04d.917e78",
+        "x": 3201.0000343322754,
+        "y": 5113.333562850952,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "2b8c993e.dd7eb6",
+        "id": "e29b5013.2064d8",
         "type": "get-resource",
         "name": "get-resource vlan-tag",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"vlan-tag\" \n\t\tkey=\"vlan-tag.vlan-tag-id = $vlan-tag-id\"\n        pfx='aai.vlan-tag' local-only='false'\n>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3258.0000343322754,
-        "y": 5158.0805587768555,
-        "z": "652cf04d.917e78",
+        "x": 3223.0000343322754,
+        "y": 5171.333562850952,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "799d4f7d.0c1778",
-                "6628ce12.4c6d38"
+                "a74c83c0.264378",
+                "29531950.5c7366"
             ]
         ]
     },
     {
-        "id": "799d4f7d.0c1778",
+        "id": "a74c83c0.264378",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3438.0476417541504,
-        "y": 5140.2236251831055,
-        "z": "652cf04d.917e78",
+        "x": 3403.0476417541504,
+        "y": 5153.476629257202,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "6c186302.6806a4"
+                "b7613405.a57bf"
             ]
         ]
     },
     {
-        "id": "ad5b3ac9.e19098",
+        "id": "885fafcd.073ea",
         "type": "for",
         "name": "for each related network role",
         "xml": "<for index='rel-network-role-index' start='0' end='`$db.vnf-related-network-role_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2094.9999656677246,
-        "y": 5072.414123535156,
-        "z": "652cf04d.917e78",
+        "x": 2059.9999656677246,
+        "y": 5085.667127609253,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "742a4410.9dd994"
+                "bf4945d0.47b928"
             ]
         ]
     },
     {
-        "id": "742a4410.9dd994",
+        "id": "bf4945d0.47b928",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2299.9999656677246,
-        "y": 5073.747268676758,
-        "z": "652cf04d.917e78",
+        "x": 2264.9999656677246,
+        "y": 5087.0002727508545,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "57855376.396fb4",
-                "17456206.9d075e",
-                "7f19e15e.2c2ee8"
+                "e0ebd076.a4ab3",
+                "4732a97e.71d8e8",
+                "54bbb42c.475e6c"
             ]
         ]
     },
     {
-        "id": "32376f69.700f08",
+        "id": "d24fdba9.53c6",
         "type": "switchNode",
         "name": "switch rn-index",
         "xml": "<switch test='`$rn-index`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2055.9999656677246,
-        "y": 4962.080276489258,
-        "z": "652cf04d.917e78",
+        "x": 2020.9999656677246,
+        "y": 4975.3332805633545,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "681bd084.d720e8"
+                "aaedd012.f0d238"
             ]
         ]
     },
     {
-        "id": "d71dcbd8.8dc7f",
+        "id": "aa946eba.37b0e",
         "type": "set",
         "name": "set rn-index to related network length",
         "xml": "<set>\n<parameter name='rn-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network_length`' />\n",
         "comments": "",
-        "x": 2124.6665534973145,
-        "y": 4913.080129623413,
-        "z": "652cf04d.917e78",
+        "x": 2089.6665534973145,
+        "y": 4926.33313369751,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "681bd084.d720e8",
+        "id": "aaedd012.f0d238",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 2219.9999656677246,
-        "y": 4962.080276489258,
-        "z": "652cf04d.917e78",
+        "x": 2184.9999656677246,
+        "y": 4975.3332805633545,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "a757207e.80691"
+                "5a38498e.8f3fd8"
             ]
         ]
     },
     {
-        "id": "a757207e.80691",
+        "id": "5a38498e.8f3fd8",
         "type": "set",
         "name": "set rn-index to 0",
         "xml": "<set>\n<parameter name='rn-index' value='0' />\n",
         "comments": "",
-        "x": 2379.9999656677246,
-        "y": 4962.080276489258,
-        "z": "652cf04d.917e78",
+        "x": 2344.9999656677246,
+        "y": 4975.3332805633545,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "7f19e15e.2c2ee8",
+        "id": "54bbb42c.475e6c",
         "type": "set",
         "name": "set related-network data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].network-id'\n  value='`$tmp.AnAI-data.get-networks.results[0].l3-network.network-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].network-role'\n  value='`$tmp.AnAI-data.get-networks.results[0].l3-network.network-role`' />\n",
         "comments": "",
-        "x": 2527.6666221618652,
-        "y": 5072.747100830078,
-        "z": "652cf04d.917e78",
+        "x": 2492.6666221618652,
+        "y": 5086.000104904175,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "96681242.82e6c",
+        "id": "e48d6b1e.9814e",
         "type": "set",
         "name": "set new related network length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network_length'\n  value='`$rn-index + 1`' />\n",
         "comments": "",
-        "x": 2090.0000343322754,
-        "y": 5216.080413818359,
-        "z": "652cf04d.917e78",
+        "x": 2055.0000343322754,
+        "y": 5229.333417892456,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "6628ce12.4c6d38",
+        "id": "29531950.5c7366",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3440.0000343322754,
-        "y": 5188.080413818359,
-        "z": "652cf04d.917e78",
+        "x": 3405.0000343322754,
+        "y": 5201.333417892456,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ee974e83.057d3"
+                "d512370d.fd34e"
             ]
         ]
     },
     {
-        "id": "ee974e83.057d3",
+        "id": "d512370d.fd34e",
         "type": "set",
         "name": "set related-network data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].vlan-tags.vlan-interface'\n  value='`$aai.vlan-tag.vlan-tag-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].vlan-tags.upper-tag-id'\n  value='`$aai.vlan-tag.vlan-id-outer`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].vlan-tags.lower-tag-id'\n  value='`$aai.vlan-tag.vlan-id-inner`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-resource-assignments.vnf-networks.vnf-network[$network-index].related-networks.related-network[$rn-index].vlan-tags.is-private'\n  value='`$aai.vlan-tag.is-private`' />\n",
         "comments": "",
-        "x": 3632.0000343322754,
-        "y": 5188.080413818359,
-        "z": "652cf04d.917e78",
+        "x": 3597.0000343322754,
+        "y": 5201.333417892456,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "81bc4129.bb1c1",
+        "id": "2c31386.b0914c8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3210.0000343322754,
-        "y": 5226.080413818359,
-        "z": "652cf04d.917e78",
+        "x": 3175.0000343322754,
+        "y": 5239.333417892456,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "50d3999e.8bb34",
+        "id": "a62d7699.385658",
         "type": "comment",
         "name": "temporary data issue: also ignore string \"null\" and \"NULL\"",
         "info": "",
         "comments": "",
-        "x": 886.3333473205566,
-        "y": 4245.842397689819,
-        "z": "652cf04d.917e78",
+        "x": 851.3333473205566,
+        "y": 4259.095401763916,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "7a9134fc.396d14",
+        "id": "67ddcd30.ef6e14",
         "type": "outcome",
         "name": "null",
         "xml": "<outcome value='null'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 913.4761695861816,
-        "y": 4328.69953918457,
-        "z": "652cf04d.917e78",
+        "x": 878.4761695861816,
+        "y": 4341.952543258667,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c630c62f.2e4b88"
+                "1a917aea.74fb6d"
             ]
         ]
     },
     {
-        "id": "39a7a020.ba1f58",
+        "id": "47ca43a8.5c2a5c",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value='NULL'>",
         "comments": "",
         "outputs": 1,
-        "x": 913.4761791229248,
-        "y": 4371.556611061096,
-        "z": "652cf04d.917e78",
+        "x": 878.4761791229248,
+        "y": 4384.809615135193,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c630c62f.2e4b88"
+                "1a917aea.74fb6d"
             ]
         ]
     },
     {
-        "id": "3f69e8e3.cf5be8",
+        "id": "77593791.068cb",
         "type": "switchNode",
         "name": "switch input cloud-owner",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.cloud-owner`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 563.0000381469727,
-        "y": 419.4136428833008,
-        "z": "652cf04d.917e78",
+        "x": 528.0000381469727,
+        "y": 432.66664695739746,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "f596a79e.8e433",
-                "4667755e.d66424"
+                "48881f21.46201",
+                "5851d57b.cc764c"
             ]
         ]
     },
     {
-        "id": "f596a79e.8e433",
+        "id": "48881f21.46201",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 746.3334121704102,
-        "y": 389.413631439209,
-        "z": "652cf04d.917e78",
+        "x": 711.3334121704102,
+        "y": 402.66663551330566,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "a299c564.3dfdb8"
+                "bc40050b.2016e"
             ]
         ]
     },
     {
-        "id": "4667755e.d66424",
+        "id": "5851d57b.cc764c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 746.0953178405762,
-        "y": 430.3661251068115,
-        "z": "652cf04d.917e78",
+        "x": 711.0953178405762,
+        "y": 443.6191291809082,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ee8be88f.ffc97"
+                "243b5b47.2a1984"
             ]
         ]
     },
     {
-        "id": "a299c564.3dfdb8",
+        "id": "bc40050b.2016e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 881.333366394043,
-        "y": 387.7469711303711,
-        "z": "652cf04d.917e78",
+        "x": 846.333366394043,
+        "y": 400.9999752044678,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "ee8be88f.ffc97",
+        "id": "243b5b47.2a1984",
         "type": "set",
         "name": "set prop.cloud-region.cloud-owner",
         "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$vnf-topology-operation-input.vnf-request-input.cloud-owner`' />\n",
         "comments": "",
-        "x": 963.0000228881836,
-        "y": 429.41365242004395,
-        "z": "652cf04d.917e78",
+        "x": 928.0000228881836,
+        "y": 442.6666564941406,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "819ca24a.f2412",
+        "id": "cfb0be93.de4aa8",
         "type": "call",
         "name": "call self-serve-vnf-forking-logic",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-forking-logic' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 580.8571624755859,
-        "y": 740.2142810821533,
-        "z": "652cf04d.917e78",
+        "x": 545.8571624755859,
+        "y": 753.46728515625,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "4ce50465.9ccc0c",
+        "id": "5f72fb15.e2e8f4",
         "type": "switchNode",
         "name": "switch ss.self-serve-flag",
         "xml": "<switch test=\"`$ss.self-serve-flag`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 560.9998779296875,
-        "y": 905.7857685089111,
-        "z": "652cf04d.917e78",
+        "x": 525.9998779296875,
+        "y": 919.0387725830078,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "b05ed7a0.f4e1f8",
-                "8e5a3910.2353a"
+                "ca7ff4c7.06bb68",
+                "d536a3b3.031e68"
             ]
         ]
     },
     {
-        "id": "b05ed7a0.f4e1f8",
+        "id": "ca7ff4c7.06bb68",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 772.7140350341797,
-        "y": 979.0710525512695,
-        "z": "652cf04d.917e78",
+        "x": 737.7140350341797,
+        "y": 992.3240566253662,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "73e62b5e.2d2d24"
+                "14788654.ce330a"
             ]
         ]
     },
     {
-        "id": "8e5a3910.2353a",
+        "id": "d536a3b3.031e68",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 772.2855529785156,
-        "y": 842.6428861618042,
-        "z": "652cf04d.917e78",
+        "x": 737.2855529785156,
+        "y": 855.8958902359009,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "7c56b4f9.aca0c4"
+                "9f86838a.03451"
             ]
         ]
     },
     {
-        "id": "2d48d63d.1a5b82",
+        "id": "188d06d.21abdf9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 952.4444923400879,
-        "y": 541.3888673782349,
-        "z": "652cf04d.917e78",
+        "x": 917.4444923400879,
+        "y": 554.6418714523315,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "d6025c47.4904b",
-                "73468fad.c71778"
+                "18b80053.220bd8",
+                "7a46cfea.c20b2"
             ]
         ]
     },
     {
-        "id": "17544ab9.984c5d",
+        "id": "513e881c.9b735",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 952.4444923400879,
-        "y": 589.9603090286255,
-        "z": "652cf04d.917e78",
+        "x": 917.4444923400879,
+        "y": 603.2133131027222,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c6456146.0f2668",
-                "73468fad.c71778"
+                "29ad4bd6.7a918c",
+                "7a46cfea.c20b2"
             ]
         ]
     },
     {
-        "id": "9a95814.c6dd98",
+        "id": "77a122cf.38f42c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 955.3016090393066,
-        "y": 634.2460145950317,
-        "z": "652cf04d.917e78",
+        "x": 920.3016090393066,
+        "y": 647.4990186691284,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "557c512a.eddd3",
-                "73468fad.c71778"
+                "b70b1c9b.b0005",
+                "7a46cfea.c20b2"
             ]
         ]
     },
     {
-        "id": "d6025c47.4904b",
+        "id": "18b80053.220bd8",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"If svc-action is 'assign' then request-action must be 'CreateVnfInstance'\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1188.8730735778809,
-        "y": 541.3888578414917,
-        "z": "652cf04d.917e78",
+        "x": 1153.8730735778809,
+        "y": 554.6418619155884,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "c6456146.0f2668",
+        "id": "29ad4bd6.7a918c",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error reading VF_MODEL table\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1187.4444847106934,
-        "y": 590.1031522750854,
-        "z": "652cf04d.917e78",
+        "x": 1152.4444847106934,
+        "y": 603.3561563491821,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "557c512a.eddd3",
+        "id": "b70b1c9b.b0005",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No model found for VNF customization UUID ' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1187.4444847106934,
-        "y": 634.2460050582886,
-        "z": "652cf04d.917e78",
+        "x": 1152.4444847106934,
+        "y": 647.4990091323853,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "75930576.a93ef4",
+        "id": "a23e97a1.879b88",
         "type": "call",
         "name": "call self-serve-vnf-assign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-assign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1223.3211402893066,
-        "y": 740.1072311401367,
-        "z": "652cf04d.917e78",
+        "x": 1188.3211402893066,
+        "y": 753.3602352142334,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "8d844173.607528"
+                "464f1d64.e9ee74"
             ]
         ]
     },
     {
-        "id": "b4a1df9a.51e5b8",
+        "id": "5ab38ea3.87a95",
         "type": "comment",
         "name": "SELF-SERVE FORK",
         "info": "",
         "comments": "",
-        "x": 942.7618942260742,
-        "y": 793.5119113922119,
-        "z": "652cf04d.917e78",
+        "x": 907.7618942260742,
+        "y": 806.7649154663086,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "8d844173.607528",
+        "id": "464f1d64.e9ee74",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1428.6187210083008,
-        "y": 739.5952625274658,
-        "z": "652cf04d.917e78",
+        "x": 1393.6187210083008,
+        "y": 752.8482666015625,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "a0be875f.ade8a"
+                "16426f3a.7a3f71"
             ]
         ]
     },
     {
-        "id": "9f565fa.4dc342",
+        "id": "1c4a1d53.f78c8b",
         "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": 1198.5635070800781,
-        "y": 988.789656996727,
-        "z": "652cf04d.917e78",
+        "x": 1163.5635070800781,
+        "y": 1002.0426610708237,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "be242702.8a5c",
+        "id": "a9871a52.4c62c8",
         "type": "set",
         "name": "set vnf-level-oper-status to PendingCreate",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
         "comments": "",
-        "x": 1286.432487487793,
-        "y": 791.599271774292,
-        "z": "652cf04d.917e78",
+        "x": 1251.432487487793,
+        "y": 804.8522758483887,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "b92958a4.6d80e",
+        "id": "2e89c9f5.0a4c26",
         "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": 1185.6348037719727,
-        "y": 842.0390481948853,
-        "z": "652cf04d.917e78",
+        "x": 1150.6348037719727,
+        "y": 855.2920522689819,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "7c56b4f9.aca0c4",
+        "id": "9f86838a.03451",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 962.8727645874023,
-        "y": 842.4999408721924,
-        "z": "652cf04d.917e78",
+        "x": 927.8727645874023,
+        "y": 855.7529449462891,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "75930576.a93ef4",
-                "be242702.8a5c",
-                "b92958a4.6d80e",
-                "9f565fa.4dc342",
-                "d8dc3738.9ff7d",
-                "61c39fe5.7ecd2"
+                "a23e97a1.879b88",
+                "a9871a52.4c62c8",
+                "2e89c9f5.0a4c26",
+                "1c4a1d53.f78c8b",
+                "8d27e9d2.f1e978",
+                "97334262.a10fc"
             ]
         ]
     },
     {
-        "id": "73468fad.c71778",
+        "id": "7a46cfea.c20b2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1804.3176345825195,
-        "y": 819.2462577819824,
-        "z": "652cf04d.917e78",
+        "x": 1769.3176345825195,
+        "y": 832.4992618560791,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "6ffa4d06.cd8f6c",
-                "ce39ee80.3e9ff"
+                "c1ed3b4.b543348",
+                "282b78b6.aebb7"
             ]
         ]
     },
     {
-        "id": "a0be875f.ade8a",
+        "id": "16426f3a.7a3f71",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1604.635009765625,
-        "y": 739.785698890686,
-        "z": "652cf04d.917e78",
+        "x": 1569.635009765625,
+        "y": 753.0387029647827,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "62341ef1.f30f5",
-                "73468fad.c71778"
+                "70af52d1.53ad84",
+                "7a46cfea.c20b2"
             ]
         ]
     },
     {
-        "id": "62341ef1.f30f5",
+        "id": "70af52d1.53ad84",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Failed to create self-serve assignment for vnf with vnf-id=' + $vnf-topology-operation-input.vnf-information.vnf-id + ' with error: ' + $error-message`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1816.162956237793,
-        "y": 681.690544128418,
-        "z": "652cf04d.917e78",
+        "x": 1781.162956237793,
+        "y": 694.9435482025146,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "4efb64bb.616d74",
+        "id": "ded883f9.922bb",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists'`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2246.999954223633,
-        "y": 1253.666597366333,
-        "z": "652cf04d.917e78",
+        "x": 2211.999954223633,
+        "y": 1266.9196014404297,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "53faa32e.0504dc",
+        "id": "472848ae.4b4ee",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Cannot find instance group id ' +\n      $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id\n      + ' in AAI'`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1624.0950775146484,
-        "y": 1308.476245880127,
-        "z": "652cf04d.917e78",
+        "x": 1589.0950775146484,
+        "y": 1321.7292499542236,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "411cfc3a.01153c",
+        "id": "6baa8775.ce8748",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error retrieving instance-group from AAI\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1624.0950393676758,
-        "y": 1371.619031906128,
-        "z": "652cf04d.917e78",
+        "x": 1589.0950393676758,
+        "y": 1384.8720359802246,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "53de08e6.af6ff8",
+        "id": "7b340405.85b91c",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Unable to find AAI relationship from collection '\n      + $aai.instance-group.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\n      + ' to service instance'`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2218.6665420532227,
-        "y": 1387.9523315429688,
-        "z": "652cf04d.917e78",
+        "x": 2183.6665420532227,
+        "y": 1401.2053356170654,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "2dfa859a.9ef8aa",
+        "id": "4b527620.59446",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Failed to get network service instance '\n      + $network-service-instance + ' from MD-SAL'`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2220.1427841186523,
-        "y": 1429.666732788086,
-        "z": "652cf04d.917e78",
+        "x": 2185.1427841186523,
+        "y": 1442.9197368621826,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "4baafedf.40884",
+        "id": "d4c1cf70.ed432",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Could not find network instance group ' +\n      $vnf-topology-operation-input.vnf-request-input.vnf-network-instance-group-ids[$inst-group-index].vnf-network-instance-group-id\n      + ' in MD-SAL service instance '\n      + $network-service-instance`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2904.666893005371,
-        "y": 1588.1904573440552,
-        "z": "652cf04d.917e78",
+        "x": 2869.666893005371,
+        "y": 1601.4434614181519,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "d9837d5e.fb9228",
+        "id": "17df96cb.754441",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2930.6786499023438,
-        "y": 1892.3692474365234,
-        "z": "652cf04d.917e78",
+        "x": 2895.6786499023438,
+        "y": 1905.6222515106201,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "85f543a5.3e0c48",
-                "5d5d1ee3.ba096"
+                "e733881a.ac1f4",
+                "3dd98612.ab55e2"
             ]
         ]
     },
     {
-        "id": "dcfb1529.fec6a8",
+        "id": "fb90666f.a03358",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2041.9998321533203,
-        "y": 1251.9998836517334,
-        "z": "652cf04d.917e78",
+        "x": 2006.9998321533203,
+        "y": 1265.25288772583,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "4efb64bb.616d74",
-                "d9837d5e.fb9228"
+                "ded883f9.922bb",
+                "17df96cb.754441"
             ]
         ]
     },
     {
-        "id": "961d4497.b1f5b",
+        "id": "7b566e9a.02ffe",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1412.3333206176758,
-        "y": 1308.6664772033691,
-        "z": "652cf04d.917e78",
+        "x": 1377.3333206176758,
+        "y": 1321.9194812774658,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "53faa32e.0504dc",
-                "d9837d5e.fb9228"
+                "472848ae.4b4ee",
+                "17df96cb.754441"
             ]
         ]
     },
     {
-        "id": "4e3d9218.a643dc",
+        "id": "46fc6653.09995",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1412.9996948242188,
-        "y": 1371.3331823349,
-        "z": "652cf04d.917e78",
+        "x": 1377.9996948242188,
+        "y": 1384.5861864089966,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "411cfc3a.01153c",
-                "d9837d5e.fb9228"
+                "6baa8775.ce8748",
+                "17df96cb.754441"
             ]
         ]
     },
     {
-        "id": "e5dc44b5.d3f17",
+        "id": "716a6bd7.84c124",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2001.3332138061523,
-        "y": 1388.3333625793457,
-        "z": "652cf04d.917e78",
+        "x": 1966.3332138061523,
+        "y": 1401.5863666534424,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "53de08e6.af6ff8",
-                "d9837d5e.fb9228"
+                "7b340405.85b91c",
+                "17df96cb.754441"
             ]
         ]
     },
     {
-        "id": "966a3052.be8b78",
+        "id": "61ef806e.0df108",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1999.6665878295898,
-        "y": 1430.333251953125,
-        "z": "652cf04d.917e78",
+        "x": 1964.6665878295898,
+        "y": 1443.5862560272217,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "2dfa859a.9ef8aa",
-                "d9837d5e.fb9228"
+                "4b527620.59446",
+                "17df96cb.754441"
             ]
         ]
     },
     {
-        "id": "19fba1ff.3d7996",
+        "id": "8e578fe.a90fc7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2693.9524307250977,
-        "y": 1588.9047193527222,
-        "z": "652cf04d.917e78",
+        "x": 2658.9524307250977,
+        "y": 1602.1577234268188,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "4baafedf.40884",
-                "d9837d5e.fb9228"
+                "d4c1cf70.ed432",
+                "17df96cb.754441"
             ]
         ]
     },
     {
-        "id": "ad1b7833.2d89a",
+        "id": "75700df9.afdc2c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1500.3808898925781,
-        "y": 1823.9046249389648,
-        "z": "652cf04d.917e78",
+        "x": 1465.3808898925781,
+        "y": 1837.1576290130615,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "939de763.66009",
-                "1a90432.93512bd"
+                "e9702d46.26adb8",
+                "15cf10ee.e25e07"
             ]
         ]
     },
     {
-        "id": "939de763.66009",
+        "id": "e9702d46.26adb8",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"No vnf-name was received but ecomp-generated-naming is not Y\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1730.2381210327148,
-        "y": 1824.3329601287842,
-        "z": "652cf04d.917e78",
+        "x": 1695.2381210327148,
+        "y": 1837.5859642028809,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "841445e5.523fe",
+        "id": "8993a315.cb4e88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2253.2380142211914,
-        "y": 1927.7618045806885,
-        "z": "652cf04d.917e78",
+        "x": 2218.2380142211914,
+        "y": 1941.0148086547852,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "262e48b9.36be4",
-                "1a90432.93512bd"
+                "fdb7a51d.af4ee8",
+                "15cf10ee.e25e07"
             ]
         ]
     },
     {
-        "id": "262e48b9.36be4",
+        "id": "fdb7a51d.af4ee8",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`$generate-unique-name-output.error-message`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2461.380889892578,
-        "y": 1927.3331956863403,
-        "z": "652cf04d.917e78",
+        "x": 2426.380889892578,
+        "y": 1940.586199760437,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "95c2eab0.a4313",
+        "id": "f2317901.0924b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2301.809440612793,
-        "y": 2053.9045372009277,
-        "z": "652cf04d.917e78",
+        "x": 2266.809440612793,
+        "y": 2067.1575412750244,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "cd9d840e.6d9e2",
-                "1a90432.93512bd"
+                "856de475.45ba98",
+                "15cf10ee.e25e07"
             ]
         ]
     },
     {
-        "id": "cd9d840e.6d9e2",
+        "id": "856de475.45ba98",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Unable to generate VNF name\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2524.6664962768555,
-        "y": 2054.3332080841064,
-        "z": "652cf04d.917e78",
+        "x": 2489.6664962768555,
+        "y": 2067.586212158203,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "1a90432.93512bd",
+        "id": "15cf10ee.e25e07",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2576.5480422973633,
-        "y": 2309.333641052246,
-        "z": "652cf04d.917e78",
+        "x": 2541.5480422973633,
+        "y": 2322.586645126343,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "82edd673.f84e28",
-                "d16813f7.4f256"
+                "f22d0ab9.1bb94",
+                "bebfeeed.4ae468"
             ]
         ]
     },
     {
-        "id": "2be0da40.0d7806",
+        "id": "5d5eddf8.f77b84",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 994.1904449462891,
-        "y": 2964.2857341766357,
-        "z": "652cf04d.917e78",
+        "x": 959.1904449462891,
+        "y": 2977.5387382507324,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c3e06ca1.959fc",
-                "b2ea455b.480508"
+                "c08f5c29.3f9638",
+                "3000afa5.73af78"
             ]
         ]
     },
     {
-        "id": "c3e06ca1.959fc",
+        "id": "c08f5c29.3f9638",
         "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": 1192.7617874145508,
-        "y": 2930.0000200271606,
-        "z": "652cf04d.917e78",
+        "x": 1157.7617874145508,
+        "y": 2943.2530241012573,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "f968cb62.56775",
+        "id": "67a22798.d81588",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 997.523796081543,
-        "y": 3007.619020462036,
-        "z": "652cf04d.917e78",
+        "x": 962.523796081543,
+        "y": 3020.872024536133,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "705aa9d.1a68858",
-                "b2ea455b.480508"
+                "c412f231.3450f",
+                "3000afa5.73af78"
             ]
         ]
     },
     {
-        "id": "705aa9d.1a68858",
+        "id": "c412f231.3450f",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error retrieving cloud region from AAI\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1196.0951385498047,
-        "y": 2973.333306312561,
-        "z": "652cf04d.917e78",
+        "x": 1161.0951385498047,
+        "y": 2986.5863103866577,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "5c62b00e.a7cd48",
+        "id": "8a243db.c5662c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 855.8572311401367,
-        "y": 3186.619167327881,
-        "z": "652cf04d.917e78",
+        "x": 820.8572311401367,
+        "y": 3199.8721714019775,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "7368045.ed8167c",
-                "b2ea455b.480508"
+                "1b929659.994202",
+                "3000afa5.73af78"
             ]
         ]
     },
     {
-        "id": "7368045.ed8167c",
+        "id": "1b929659.994202",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1065.8572235107422,
-        "y": 3165.190655708313,
-        "z": "652cf04d.917e78",
+        "x": 1030.8572235107422,
+        "y": 3178.4436597824097,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "b2ea455b.480508",
+        "id": "3000afa5.73af78",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1952.4405975341797,
-        "y": 3741.820848464966,
-        "z": "652cf04d.917e78",
+        "x": 1917.4405975341797,
+        "y": 3755.0738525390625,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "2eff60b0.82a368",
-                "2209a27.51db7de",
-                "8cff46f6.b77",
-                "e06e50cf.f6e82"
+                "378b03ce.20c66c",
+                "7f7bd6c0.4dce5",
+                "dd87ea49.833d68",
+                "7840dd27.291b7c"
             ]
         ]
     },
     {
-        "id": "7ef20c7d.b3d83c",
+        "id": "48f3f890.8517f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1141.3333282470703,
-        "y": 3276.714331626892,
-        "z": "652cf04d.917e78",
+        "x": 1106.3333282470703,
+        "y": 3289.9673357009888,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "1e4bb717.8c8f11",
-                "b2ea455b.480508"
+                "cb477d35.d878f8",
+                "3000afa5.73af78"
             ]
         ]
     },
     {
-        "id": "1e4bb717.8c8f11",
+        "id": "cb477d35.d878f8",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error reading VF_TO_NETWORK_ROLE_MAPPING table\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1344.1904373168945,
-        "y": 3243.8572273254395,
-        "z": "652cf04d.917e78",
+        "x": 1309.1904373168945,
+        "y": 3257.110231399536,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "ddfbfd5a.f170a",
+        "id": "c82ac0d8.cc5e38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1711.3332824707031,
-        "y": 3486.285619735718,
-        "z": "652cf04d.917e78",
+        "x": 1676.3332824707031,
+        "y": 3499.5386238098145,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ed599d84.5459d",
-                "b2ea455b.480508"
+                "72b2b538.d558dc",
+                "3000afa5.73af78"
             ]
         ]
     },
     {
-        "id": "ed599d84.5459d",
+        "id": "72b2b538.d558dc",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1922.7618865966797,
-        "y": 3454.8569107055664,
-        "z": "652cf04d.917e78",
+        "x": 1887.7618865966797,
+        "y": 3468.109914779663,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "3ecadd51.2a79da",
+        "id": "5682a799.32827",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2731.8094635009766,
-        "y": 4707.667684555054,
-        "z": "652cf04d.917e78",
+        "x": 2696.8094635009766,
+        "y": 4720.92068862915,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "1132c0eb.47f19f",
-                "1eafb6c3.64af09"
+                "7661361b.939148",
+                "26c72533.15b0ea"
             ]
         ]
     },
     {
-        "id": "1132c0eb.47f19f",
+        "id": "7661361b.939148",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`\n    'Error retrieving network-topology-identifier-structure for service instance '\n    + $network-service-instance-id\n    + ' and network-id '\n    + $l3-network-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2943.237968444824,
-        "y": 4676.238899230957,
-        "z": "652cf04d.917e78",
+        "x": 2908.237968444824,
+        "y": 4689.491903305054,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "aac9396.609d348",
+        "id": "62e01756.b02ec8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1844.4761962890625,
-        "y": 4548.048126220703,
-        "z": "652cf04d.917e78",
+        "x": 1809.4761962890625,
+        "y": 4561.3011302948,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "6ef91a22.9e6f5c",
-                "1eafb6c3.64af09"
+                "f751a4f8.1ed6c",
+                "26c72533.15b0ea"
             ]
         ]
     },
     {
-        "id": "6ef91a22.9e6f5c",
+        "id": "f751a4f8.1ed6c",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error reading VNF_RELATED_NETWORK_ROLE table\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2058.4761962890625,
-        "y": 4529.190979003906,
-        "z": "652cf04d.917e78",
+        "x": 2023.4761962890625,
+        "y": 4542.443983078003,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "bd008d18.af7e28",
+        "id": "3cb8f8f8.397e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2488.952423095703,
-        "y": 4823.667268753052,
-        "z": "652cf04d.917e78",
+        "x": 2453.952423095703,
+        "y": 4836.920272827148,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "3b9e157a.a6eb1a",
-                "1eafb6c3.64af09"
+                "c14a1816.2bece8",
+                "26c72533.15b0ea"
             ]
         ]
     },
     {
-        "id": "3b9e157a.a6eb1a",
+        "id": "c14a1816.2bece8",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error getting owning entity from service instance\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2696.095443725586,
-        "y": 4799.381650924683,
-        "z": "652cf04d.917e78",
+        "x": 2661.095443725586,
+        "y": 4812.634654998779,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "e973673a.4d16f8",
+        "id": "9441abd.ea4d958",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2503.952423095703,
-        "y": 4868.667268753052,
-        "z": "652cf04d.917e78",
+        "x": 2468.952423095703,
+        "y": 4881.920272827148,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ea2f1cf6.5574e",
-                "1eafb6c3.64af09"
+                "5cc607a9.f4749",
+                "26c72533.15b0ea"
             ]
         ]
     },
     {
-        "id": "ea2f1cf6.5574e",
+        "id": "5cc607a9.f4749",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Unable to find owning entity from service instance\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2705.3810653686523,
-        "y": 4842.953462600708,
-        "z": "652cf04d.917e78",
+        "x": 2670.3810653686523,
+        "y": 4856.206466674805,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "1b6474fa.c07123",
+        "id": "b524c65d.e8c7c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2947.9998168945312,
-        "y": 4994.143200874329,
-        "z": "652cf04d.917e78",
+        "x": 2912.9998168945312,
+        "y": 5007.396204948425,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "ad71495b.bf604",
-                "1eafb6c3.64af09"
+                "2ae5f0aa.16eba",
+                "26c72533.15b0ea"
             ]
         ]
     },
     {
-        "id": "ad71495b.bf604",
+        "id": "2ae5f0aa.16eba",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error calling getNetworks custom query in AAI\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3163.714179992676,
-        "y": 4964.143190383911,
-        "z": "652cf04d.917e78",
+        "x": 3128.714179992676,
+        "y": 4977.396194458008,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "10aba7ed.de916",
+        "id": "c4b783d3.51c55",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2959.6665649414062,
-        "y": 5039.143200874329,
-        "z": "652cf04d.917e78",
+        "x": 2924.6665649414062,
+        "y": 5052.396204948425,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "92ff3f65.ace2f",
-                "1eafb6c3.64af09"
+                "d11e9c05.b61cf",
+                "26c72533.15b0ea"
             ]
         ]
     },
     {
-        "id": "92ff3f65.ace2f",
+        "id": "d11e9c05.b61cf",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No l3-network returned from getNetworks custom query for related network role '\n      + $db.vnf-related-network-role[0].related-network-role`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3175.380928039551,
-        "y": 5009.143190383911,
-        "z": "652cf04d.917e78",
+        "x": 3140.380928039551,
+        "y": 5022.396194458008,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "6c186302.6806a4",
+        "id": "b7613405.a57bf",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3603.952033996582,
-        "y": 5140.333766937256,
-        "z": "652cf04d.917e78",
+        "x": 3568.952033996582,
+        "y": 5153.5867710113525,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c91d001.4234e8",
-                "1eafb6c3.64af09"
+                "e1d3badb.4944e",
+                "26c72533.15b0ea"
             ]
         ]
     },
     {
-        "id": "c91d001.4234e8",
+        "id": "e1d3badb.4944e",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error getting vlan-tag object from AAI\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3816.80916595459,
-        "y": 5113.190900802612,
-        "z": "652cf04d.917e78",
+        "x": 3781.80916595459,
+        "y": 5126.443904876709,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "1eafb6c3.64af09",
+        "id": "26c72533.15b0ea",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3723.6791076660156,
-        "y": 5591.275134086609,
-        "z": "652cf04d.917e78",
+        "x": 3688.6791076660156,
+        "y": 5604.528138160706,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "45d48b66.a8078c",
-                "f7795356.cb57f8",
-                "5ac8760f.3c13c",
-                "149b2fa5.4d0cf8"
+                "db3d93.58c8227",
+                "ad080da7.45d5b",
+                "140e4a8.aa852b6",
+                "4fe34f3d.b60a38"
             ]
         ]
     },
     {
-        "id": "11a704cb.ec6e1b",
+        "id": "76d0200d.fc0188",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1711.333267211914,
-        "y": 3536.2856159210205,
-        "z": "652cf04d.917e78",
+        "x": 1676.333267211914,
+        "y": 3549.538619995117,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "9729b81b.95b818",
-                "b2ea455b.480508"
+                "ac11c09f.11a3f8",
+                "3000afa5.73af78"
             ]
         ]
     },
     {
-        "id": "9729b81b.95b818",
+        "id": "ac11c09f.11a3f8",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error retrieving l3-network from AAI\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1922.7618713378906,
-        "y": 3504.856906890869,
-        "z": "652cf04d.917e78",
+        "x": 1887.7618713378906,
+        "y": 3518.109910964966,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "2ae5fa90.61994e",
+        "id": "2f7baa50.3a7f6e",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Unable to find l3-network in AAI for network role ' + $db.vf-network-role-mapping[$role-index].network-role`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1847.0476913452148,
-        "y": 4247.714210510254,
-        "z": "652cf04d.917e78",
+        "x": 1812.0476913452148,
+        "y": 4260.967214584351,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "c374836e.37fed8",
+        "id": "d3e41f3b.440478",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1647.0476913452148,
-        "y": 4262,
-        "z": "652cf04d.917e78",
+        "x": 1612.0476913452148,
+        "y": 4275.253004074097,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "2ae5fa90.61994e",
-                "1eafb6c3.64af09"
+                "2f7baa50.3a7f6e",
+                "26c72533.15b0ea"
             ]
         ]
     },
     {
-        "id": "cf09642d.dcd6b",
+        "id": "9c4ebd50.5f47c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1301.3332748413086,
-        "y": 5434.856773376465,
-        "z": "652cf04d.917e78",
+        "x": 1266.3332748413086,
+        "y": 5448.1097774505615,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "d709ac0f.fb269",
-                "e74586be.b8e6f8"
+                "26c1eaae.bf138e",
+                "fe30a9c6.049198"
             ]
         ]
     },
     {
-        "id": "d709ac0f.fb269",
+        "id": "26c1eaae.bf138e",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No availability zones found in AAI for cloud region '\n       + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1504.1904067993164,
-        "y": 5416.28534412384,
-        "z": "652cf04d.917e78",
+        "x": 1469.1904067993164,
+        "y": 5429.538348197937,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "662f403a.490a78",
+        "id": "6293928d.4f10b4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1528.7144622802734,
-        "y": 5561.524040222168,
-        "z": "652cf04d.917e78",
+        "x": 1493.7144622802734,
+        "y": 5574.777044296265,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "c383f700.e2fe08",
-                "e74586be.b8e6f8"
+                "a65d67ab.54ccc8",
+                "fe30a9c6.049198"
             ]
         ]
     },
     {
-        "id": "c383f700.e2fe08",
+        "id": "a65d67ab.54ccc8",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating generic-vnf in AAI\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1730.1430130004883,
-        "y": 5541.524041175842,
-        "z": "652cf04d.917e78",
+        "x": 1695.1430130004883,
+        "y": 5554.777045249939,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "bf452558.9a9008",
+        "id": "6db07962.51fbc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1530.381088256836,
-        "y": 5604.857048034668,
-        "z": "652cf04d.917e78",
+        "x": 1495.381088256836,
+        "y": 5618.110052108765,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "79c5928f.79507c",
-                "e74586be.b8e6f8"
+                "f04c754d.905e58",
+                "fe30a9c6.049198"
             ]
         ]
     },
     {
-        "id": "79c5928f.79507c",
+        "id": "f04c754d.905e58",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1731.8096389770508,
-        "y": 5584.857048988342,
-        "z": "652cf04d.917e78",
+        "x": 1696.8096389770508,
+        "y": 5598.110053062439,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "e0daa6a.dcf31d8",
+        "id": "b28581b0.5712a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1388.238136291504,
-        "y": 5679.618696212769,
-        "z": "652cf04d.917e78",
+        "x": 1353.238136291504,
+        "y": 5692.871700286865,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "1a45b18b.687d7e",
-                "e74586be.b8e6f8"
+                "97c4188b.d87ca",
+                "fe30a9c6.049198"
             ]
         ]
     },
     {
-        "id": "1a45b18b.687d7e",
+        "id": "97c4188b.d87ca",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating generic-vnf in AAI\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1585.9166717529297,
-        "y": 5658.011522293091,
-        "z": "652cf04d.917e78",
+        "x": 1550.9166717529297,
+        "y": 5671.2645263671875,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "ca1e10f7.f5af08",
+        "id": "1b732815.14e07",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1408.2976303100586,
-        "y": 5724.678614616394,
-        "z": "652cf04d.917e78",
+        "x": 1373.2976303100586,
+        "y": 5737.931618690491,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "7c8d3c94.816594",
-                "e74586be.b8e6f8"
+                "3b0cf6e0.855aaa",
+                "fe30a9c6.049198"
             ]
         ]
     },
     {
-        "id": "7c8d3c94.816594",
+        "id": "3b0cf6e0.855aaa",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1612.583396911621,
-        "y": 5701.821611404419,
-        "z": "652cf04d.917e78",
+        "x": 1577.583396911621,
+        "y": 5715.074615478516,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "2e13fdd8.c6ad92",
+        "id": "8d790e64.fbc6b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 824.0118942260742,
-        "y": 5834.29768371582,
-        "z": "652cf04d.917e78",
+        "x": 789.0118942260742,
+        "y": 5847.550687789917,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "7c4ba56.57b5cdc",
-                "e74586be.b8e6f8"
+                "c1b55e7e.c6db7",
+                "fe30a9c6.049198"
             ]
         ]
     },
     {
-        "id": "7c4ba56.57b5cdc",
+        "id": "c1b55e7e.c6db7",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating selflink in generic-vnf in AAI\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1029.7262344360352,
-        "y": 5810.011829376221,
-        "z": "652cf04d.917e78",
+        "x": 994.7262344360352,
+        "y": 5823.264833450317,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "eba4fe8c.3ea98",
+        "id": "86656044.af7ea",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 837.3452072143555,
-        "y": 5877.63117980957,
-        "z": "652cf04d.917e78",
+        "x": 802.3452072143555,
+        "y": 5890.884183883667,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "2d963807.1f3568",
-                "e74586be.b8e6f8"
+                "8343190d.5848c",
+                "fe30a9c6.049198"
             ]
         ]
     },
     {
-        "id": "2d963807.1f3568",
+        "id": "8343190d.5848c",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1043.0595474243164,
-        "y": 5853.345325469971,
-        "z": "652cf04d.917e78",
+        "x": 1008.0595474243164,
+        "y": 5866.598329544067,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "1ce1d0e3.b09f8f",
+        "id": "df50542d.c5f3b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1417.3928909301758,
-        "y": 5927.011758804321,
-        "z": "652cf04d.917e78",
+        "x": 1382.3928909301758,
+        "y": 5940.264762878418,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "f1dfb0ff.674588",
-                "e74586be.b8e6f8"
+                "1553bf30.21afc9",
+                "fe30a9c6.049198"
             ]
         ]
     },
     {
-        "id": "f1dfb0ff.674588",
+        "id": "1553bf30.21afc9",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating relationship in generic-vnf in AAI\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1611.678611755371,
-        "y": 5901.2977504730225,
-        "z": "652cf04d.917e78",
+        "x": 1576.678611755371,
+        "y": 5914.550754547119,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "85592822.f54ce",
+        "id": "1108a556.80c593",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1432.3928909301758,
-        "y": 5970.345254898071,
-        "z": "652cf04d.917e78",
+        "x": 1397.3928909301758,
+        "y": 5983.598258972168,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "16449f26.c6b4a1",
-                "e74586be.b8e6f8"
+                "65d2b92b.988988",
+                "fe30a9c6.049198"
             ]
         ]
     },
     {
-        "id": "16449f26.c6b4a1",
+        "id": "65d2b92b.988988",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'No generic-vnf found in AAI for vnf ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1626.678611755371,
-        "y": 5944.6312465667725,
-        "z": "652cf04d.917e78",
+        "x": 1591.678611755371,
+        "y": 5957.884250640869,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "634a4090.ff27d",
+        "id": "a2884948.862f8",
         "type": "execute",
         "name": "execute RestApiCallNode - PUT vnf",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + 'vnf-data-assign.json'`\" />\n    <parameter name='restapiUrl' value=\"`$prop.controller.url + $tmp.vnf.url`\" />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"vnf-assign\" />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 527.3212051391602,
-        "y": 6334.9891719818115,
-        "z": "652cf04d.917e78",
+        "x": 492.32120513916016,
+        "y": 6348.242176055908,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "1a97646.1d7bf9c",
-                "5710c473.bb38cc"
+                "eb2fd10f.58d528",
+                "766f2742.7f101"
             ]
         ]
     },
     {
-        "id": "1a97646.1d7bf9c",
+        "id": "eb2fd10f.58d528",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 774.5339660644531,
-        "y": 6356.319892883301,
-        "z": "652cf04d.917e78",
+        "x": 739.5339660644531,
+        "y": 6369.5728969573975,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "7fa41968.bb5ec8"
+                "601af5e.6e5998c"
             ]
         ]
     },
     {
-        "id": "5710c473.bb38cc",
+        "id": "766f2742.7f101",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 766.9626007080078,
-        "y": 6314.819912910461,
-        "z": "652cf04d.917e78",
+        "x": 731.9626007080078,
+        "y": 6328.072916984558,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "7fa41968.bb5ec8"
+                "601af5e.6e5998c"
             ]
         ]
     },
     {
-        "id": "7fa41968.bb5ec8",
+        "id": "601af5e.6e5998c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 942.5592803955078,
-        "y": 6334.750367164612,
-        "z": "652cf04d.917e78",
+        "x": 907.5592803955078,
+        "y": 6348.0033712387085,
+        "z": "f54d3783.41afe",
         "wires": [
             [
-                "eb23793e.28b0d",
-                "e74586be.b8e6f8"
+                "f06a0861.c5b6a",
+                "fe30a9c6.049198"
             ]
         ]
     },
     {
-        "id": "eb23793e.28b0d",
+        "id": "f06a0861.c5b6a",
         "type": "configure",
         "name": "set error-message",
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error doing PUT of vnf-data\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1148.2735900878906,
-        "y": 6300.464484214783,
-        "z": "652cf04d.917e78",
+        "x": 1113.2735900878906,
+        "y": 6313.717488288879,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "9ec4fd36.2e31c8",
+        "id": "5d5f2dd1.10210c",
         "type": "set",
         "name": "set so.response-code = 200",
         "xml": "<set>\n<parameter name=\"so.response-code\" value=\"200\" />",
         "comments": "",
-        "x": 498.09376525878906,
-        "y": 6477.500561714172,
-        "z": "652cf04d.917e78",
+        "x": 463.09376525878906,
+        "y": 6490.753565788269,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "5369940c.e48364",
+        "id": "7e13039d.149664",
         "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=\"`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url`\" />\n<parameter name=\"so.svc-request-id\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`\" />\n<parameter name=\"so.service-type\" value=\"`$vnf-topology-operation-input.service-information.subscription-service-type`\" />\n<parameter name=\"so.service-instance-id\" value=\"`$vnf-topology-operation-input.service-information.service-instance-id`\" />\n",
         "comments": "",
-        "x": 595.7605819702148,
-        "y": 313.9549217224121,
-        "z": "652cf04d.917e78",
+        "x": 557.7606201171875,
+        "y": 350.2079162597656,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "2eff60b0.82a368",
+        "id": "378b03ce.20c66c",
         "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": 2278.2909622192383,
-        "y": 3792.151798248291,
-        "z": "652cf04d.917e78",
+        "x": 2243.2909622192383,
+        "y": 3805.4048023223877,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "d8dc3738.9ff7d",
+        "id": "8d27e9d2.f1e978",
         "type": "set",
         "name": "set so.reponse-code = 200",
         "xml": "<set>\n<parameter name=\"so.response-code\" value=\"200\" />\n",
         "comments": "",
-        "x": 1238.8462142944336,
-        "y": 888.2629871368408,
-        "z": "652cf04d.917e78",
+        "x": 1203.8462142944336,
+        "y": 901.5159912109375,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "2209a27.51db7de",
+        "id": "7f7bd6c0.4dce5",
         "type": "set",
         "name": "set variables for deleting name",
         "xml": "<set>\n<parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\n<parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='naming-policy-generate-name-input.action' value='DELETE' />\n",
         "comments": "",
-        "x": 2225.096290588379,
-        "y": 3691.040738105774,
-        "z": "652cf04d.917e78",
+        "x": 2190.096290588379,
+        "y": 3704.2937421798706,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "8cff46f6.b77",
+        "id": "dd87ea49.833d68",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:naming-policy-generate-name",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2322.66756439209,
-        "y": 3741.1830978393555,
-        "z": "652cf04d.917e78",
+        "x": 2287.66756439209,
+        "y": 3754.436101913452,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "5ac8760f.3c13c",
+        "id": "140e4a8.aa852b6",
         "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": 4057.0410079956055,
-        "y": 5615.346151351929,
-        "z": "652cf04d.917e78",
+        "x": 4022.0410079956055,
+        "y": 5628.599155426025,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "45d48b66.a8078c",
+        "id": "db3d93.58c8227",
         "type": "set",
         "name": "set variables for deleting name",
         "xml": "<set>\n<parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\n<parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='naming-policy-generate-name-input.action' value='DELETE' />\n",
         "comments": "",
-        "x": 4003.846336364746,
-        "y": 5514.235091209412,
-        "z": "652cf04d.917e78",
+        "x": 3968.846336364746,
+        "y": 5527.488095283508,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "f7795356.cb57f8",
+        "id": "ad080da7.45d5b",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:naming-policy-generate-name",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4101.417610168457,
-        "y": 5564.377450942993,
-        "z": "652cf04d.917e78",
+        "x": 4066.417610168457,
+        "y": 5577.63045501709,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "fef2b74e.207f2",
+        "id": "574c5265.459624",
         "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": 2286.2076263427734,
-        "y": 6596.319822311401,
-        "z": "652cf04d.917e78",
+        "x": 2251.2076263427734,
+        "y": 6609.572826385498,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "5e0caa6d.e903f4",
+        "id": "fcd8b4d3.ba6f18",
         "type": "set",
         "name": "set variables for deleting name",
         "xml": "<set>\n<parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\n<parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='naming-policy-generate-name-input.action' value='DELETE' />\n",
         "comments": "",
-        "x": 2229.262924194336,
-        "y": 6495.2088985443115,
-        "z": "652cf04d.917e78",
+        "x": 2194.262924194336,
+        "y": 6508.461902618408,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "fcbc941a.75b4b8",
+        "id": "7af5e0af.8b4d6",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:naming-policy-generate-name",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2326.834197998047,
-        "y": 6545.351258277893,
-        "z": "652cf04d.917e78",
+        "x": 2291.834197998047,
+        "y": 6558.60426235199,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "6ffa4d06.cd8f6c",
+        "id": "c1ed3b4.b543348",
         "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": 2118.7077407836914,
-        "y": 792.8462972640991,
-        "z": "652cf04d.917e78",
+        "x": 2083.7077407836914,
+        "y": 806.0993013381958,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "85f543a5.3e0c48",
+        "id": "e733881a.ac1f4",
         "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": 3242.457305908203,
-        "y": 1868.596351146698,
-        "z": "652cf04d.917e78",
+        "x": 3207.457305908203,
+        "y": 1881.8493552207947,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "82edd673.f84e28",
+        "id": "f22d0ab9.1bb94",
         "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": 2894.957359313965,
-        "y": 2283.346435546875,
-        "z": "652cf04d.917e78",
+        "x": 2859.957359313965,
+        "y": 2296.5994396209717,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "1fec3768.f512f1",
+        "id": "f5df60ce.d84ac8",
         "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": 562.5963668823242,
-        "y": 6531.874531745911,
-        "z": "652cf04d.917e78",
+        "x": 527.5963668823242,
+        "y": 6545.127535820007,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "61c39fe5.7ecd2",
+        "id": "97334262.a10fc",
         "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": 1310.8462448120117,
-        "y": 937.0129909515381,
-        "z": "652cf04d.917e78",
+        "x": 1275.8462448120117,
+        "y": 950.2659950256348,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "ce39ee80.3e9ff",
+        "id": "282b78b6.aebb7",
         "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": 2000.096290588379,
-        "y": 843.2629833221436,
-        "z": "652cf04d.917e78",
+        "x": 1965.096290588379,
+        "y": 856.5159873962402,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "5d5d1ee3.ba096",
+        "id": "3dd98612.ab55e2",
         "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": 3123.84627532959,
-        "y": 1912.8463134765625,
-        "z": "652cf04d.917e78",
+        "x": 3088.84627532959,
+        "y": 1926.0993175506592,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "d16813f7.4f256",
+        "id": "bebfeeed.4ae468",
         "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": 2778.84627532959,
-        "y": 2331.596435546875,
-        "z": "652cf04d.917e78",
+        "x": 2743.84627532959,
+        "y": 2344.8494396209717,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "e06e50cf.f6e82",
+        "id": "7840dd27.291b7c",
         "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": 2158.846424102783,
-        "y": 3839.929880142212,
-        "z": "652cf04d.917e78",
+        "x": 2123.846424102783,
+        "y": 3853.1828842163086,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "149b2fa5.4d0cf8",
+        "id": "4fe34f3d.b60a38",
         "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": 3939.81844329834,
-        "y": 5665.06884765625,
-        "z": "652cf04d.917e78",
+        "x": 3904.81844329834,
+        "y": 5678.321851730347,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "ae834aa6.55d6c",
+        "id": "6358f1ef.44078",
         "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": 2166.0686569213867,
-        "y": 6643.263185501099,
-        "z": "652cf04d.917e78",
+        "x": 2131.0686569213867,
+        "y": 6656.516189575195,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "4ba8fd3f.c818fc",
+        "id": "3367c076.389b7",
         "type": "execute",
         "name": "generate vnf URL (sub service-instance-id)",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.vnf-assign`\"/>\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": 551.3463516235352,
-        "y": 6138.542016029358,
-        "z": "652cf04d.917e78",
+        "x": 516.3463516235352,
+        "y": 6151.795020103455,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "d2d8ec6e.e92468",
+        "id": "d71dd728.42aa",
         "type": "execute",
         "name": "generate vnf 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.vnf.url\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-id`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 506.34627532958984,
-        "y": 6189.969970703125,
-        "z": "652cf04d.917e78",
+        "x": 471.34627532958984,
+        "y": 6203.222974777222,
+        "z": "f54d3783.41afe",
         "wires": [
             []
         ]
     },
     {
-        "id": "2957e806.869ab",
+        "id": "dac2571d.72305",
         "type": "set",
         "name": "copy vnf data",
         "xml": "<set>\n<parameter name='vnf-data.' value='service-data.vnfs.vnf[$vnf-index].vnf-data.' />\n",
         "comments": "",
-        "x": 452.2392349243164,
-        "y": 6237.827503204346,
-        "z": "652cf04d.917e78",
+        "x": 417.2392349243164,
+        "y": 6251.080507278442,
+        "z": "f54d3783.41afe",
         "wires": []
     },
     {
-        "id": "bb434916.4ddfd",
+        "id": "b8027a72.6866a",
         "type": "comment",
         "name": "'New' version of DG, called for flows where SO expects async response (so-bpmn-infra)",
         "info": "",
         "comments": "",
-        "x": 565,
-        "y": 93,
-        "z": "652cf04d.917e78",
+        "x": 530,
+        "y": 106.25300407409668,
+        "z": "f54d3783.41afe",
+        "wires": []
+    },
+    {
+        "id": "caa8d84a.f0775",
+        "type": "switchNode",
+        "name": "cloud-owner passed in input?",
+        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.cloud-owner != ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 542,
+        "y": 304,
+        "z": "f54d3783.41afe",
+        "wires": [
+            [
+                "49ac8a59.568384"
+            ]
+        ]
+    },
+    {
+        "id": "49ac8a59.568384",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 862,
+        "y": 306,
+        "z": "f54d3783.41afe",
+        "wires": [
+            [
+                "64659a33.df3f8c"
+            ]
+        ]
+    },
+    {
+        "id": "64659a33.df3f8c",
+        "type": "set",
+        "name": "set prop.cloud-region.cloud-owner to input cloud-owner",
+        "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$vnf-topology-operation-input.vnf-request-input.cloud-owner`' />\n",
+        "comments": "",
+        "x": 1233,
+        "y": 302,
+        "z": "f54d3783.41afe",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml
old mode 100755
new mode 100644
index 1f6f5d85..5bccbb86
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml
@@ -7,6 +7,13 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
+            <switch test="`$network-topology-operation-input.network-request-input.cloud-owner != ''`">
+                <outcome value='true'>
+                    <set>
+                        <parameter name='prop.cloud-region.cloud-owner' value='`$network-topology-operation-input.network-request-input.cloud-owner`' />
+                    </set>
+                </outcome>
+            </switch>
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="tenant" 
 		key="cloud-region.cloud-owner = $prop.cloud-region.cloud-owner AND 
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml
index f25087e9..dbc2203e 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml
@@ -7,6 +7,13 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
+            <switch test="`$pnf-topology-operation-input.pnf-request-input.cloud-owner != ''`">
+                <outcome value='true'>
+                    <set>
+                        <parameter name='prop.cloud-region.cloud-owner' value='`$pnf-topology-operation-input.pnf-request-input.cloud-owner`' />
+                    </set>
+                </outcome>
+            </switch>
             <switch test='`$pnf-topology-operation-input.pnf-request-input.cloud-owner`'>
                 <outcome value=''>
                     <block></block>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml
index 923303a0..081a4e3b 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml
@@ -7,6 +7,13 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
+            <switch test="`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner != ''`">
+                <outcome value='true'>
+                    <set>
+                        <parameter name='prop.cloud-region.cloud-owner' value='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`' />
+                    </set>
+                </outcome>
+            </switch>
             <set>
                 <parameter name="so.ack-final-indicator" value="Y" />
                 <parameter name="so.response-code" value="500" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml
index 52601479..9d1f3ca5 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml
@@ -7,6 +7,13 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
+            <switch test="`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner != ''`">
+                <outcome value='true'>
+                    <set>
+                        <parameter name='prop.cloud-region.cloud-owner' value='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`' />
+                    </set>
+                </outcome>
+            </switch>
             <switch test='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`'>
                 <outcome value=''>
                     <block></block>
@@ -1430,4 +1437,4 @@ key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id
             </switch>
         </block>
     </method>
-</service-logic>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml
index 61b4226a..acb3c1ce 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml
@@ -7,6 +7,13 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
+            <switch test="`$vnf-topology-operation-input.vnf-request-input.cloud-owner != ''`">
+                <outcome value='true'>
+                    <set>
+                        <parameter name='prop.cloud-region.cloud-owner' value='`$vnf-topology-operation-input.vnf-request-input.cloud-owner`' />
+                    </set>
+                </outcome>
+            </switch>
             <set>
                 <parameter name="so.ack-final-indicator" value="Y" />
                 <parameter name="so.response-code" value="500" />
-- 
2.16.6