Support cloud-owner input param 24/110824/3
authorDan Timoney <dtimoney@att.com>
Fri, 31 Jul 2020 20:41:53 +0000 (16:41 -0400)
committerDan Timoney <dtimoney@att.com>
Mon, 3 Aug 2020 13:46:44 +0000 (09:46 -0400)
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>
Former-commit-id: 131845c1b3185b5efb8b5bd287747c7086eface8

.gitignore
platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-assign.json
platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_pnf-topology-operation-assign.json
platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.json
platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.json
platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.json
platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml [changed mode: 0755->0644]
platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_pnf-topology-operation-assign.xml
platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-async.xml
platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign-sync.xml
platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign-async.xml

index b632be9..1c75d57 100755 (executable)
@@ -11,6 +11,7 @@ org.eclipse.core.resources.prefs
 .pydevproject
 maven-eclipse.xml
 workspace
+.factorypath
 
 ## Compilation Files ##
 *.class
index 887976b..6a7565b 100644 (file)
@@ -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
+[\r
+    {\r
+        "id": "d9354bed.7e3d38",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
+        "outputs": 1,\r
+        "x": 109,\r
+        "y": 90,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "66dddf81.514c08"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "66dddf81.514c08",\r
+        "type": "service-logic",\r
+        "name": "GENERIC-RESOURCE-API ${project.version}",\r
+        "module": "GENERIC-RESOURCE-API",\r
+        "version": "${project.version}",\r
+        "comments": "",\r
+        "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}'>",\r
+        "outputs": 1,\r
+        "x": 252.2856903076172,\r
+        "y": 153.09525775909424,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "65a79f7d.49e2c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "65a79f7d.49e2c",\r
+        "type": "method",\r
+        "name": "network-topology-operation-assign",\r
+        "xml": "<method rpc='network-topology-operation-assign' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 227.96437072753906,\r
+        "y": 230.892840385437,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "3f3f6e54.d26392"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3f3f6e54.d26392",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 187.28572845458984,\r
+        "y": 415.1578025817871,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "96a66838.27eb5",\r
+                "4ec3b463.9f3dec",\r
+                "d3ee5726.8245f",\r
+                "3c332c37.f4b7bc",\r
+                "6b08e57f.4948f4",\r
+                "96dfe9d4.8e2428",\r
+                "66347a0f.b006fc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "96a66838.27eb5",\r
+        "type": "returnSuccess",\r
+        "name": "return success",\r
+        "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",\r
+        "comments": "",\r
+        "x": 476.34532165527344,\r
+        "y": 798.428908675909,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ff1e099e.f8c22",\r
+        "type": "switchNode",\r
+        "name": "switch network-request-information.network-name",\r
+        "xml": "<switch test='`$network-topology-operation-input.network-request-input.network-name`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1338.5793914794922,\r
+        "y": 718.2224534451962,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "5ee2db3f.ff804c",\r
+                "47dada57.b386d4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4cfca0e0.5ca288",\r
+        "type": "comment",\r
+        "name": "if network-name not populated, generate and call automated flow",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 1924.9604797363281,\r
+        "y": 641.281824439764,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "5ee2db3f.ff804c",\r
+        "type": "other",\r
+        "name": "outcome NULL",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1769.9844284057617,\r
+        "y": 684.4007714688778,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "a0461f96.83e898"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a0461f96.83e898",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1963.317626953125,\r
+        "y": 681.7341164052486,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "e24ce471.3a334"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e24ce471.3a334",\r
+        "type": "switchNode",\r
+        "name": "switch network-model.onap-generated-naming",\r
+        "xml": "<switch test='`$network-model.ecomp-generated-naming`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2263.26993560791,\r
+        "y": 680.734105437994,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "f6dd56f6.ab0ed8",\r
+                "5fde81d4.76f8d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f6dd56f6.ab0ed8",\r
+        "type": "other",\r
+        "name": "outcome Y",\r
+        "xml": "<outcome value='Y'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2582.2700386047363,\r
+        "y": 668.7340984344482,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "cf4d3c67.b13698"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cf4d3c67.b13698",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">\n",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2751.0200805664062,\r
+        "y": 669.2340869903564,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "b9c386f.7817bf8",\r
+                "d18311c4.4cd748",\r
+                "b0171571.8c955",\r
+                "cc60b7f8.cae668"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5fde81d4.76f8d8",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2573.492328643799,\r
+        "y": 701.7340984344482,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "1c27fc30.223f64"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1c27fc30.223f64",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "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",\r
+        "comments": "",\r
+        "x": 2754.992515563965,\r
+        "y": 705.7342141568661,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "84f94b0f.6ed3",\r
+        "type": "switchNode",\r
+        "name": "switch network-model.onap-generated-naming",\r
+        "xml": "<switch test='`$network-model.naming-policy`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2743.042922973633,\r
+        "y": 1233.127024024725,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "82ada125.3372f",\r
+                "82da6366.c03ea",\r
+                "7c4cce15.39256",\r
+                "33898a4d.eb2f56",\r
+                "5a2b9c63.71261c",\r
+                "403cc823.dd2ee8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "82da6366.c03ea",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3061.0432891845703,\r
+        "y": 1453.1270688474178,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "b2173417.8d9188"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "82ada125.3372f",\r
+        "type": "other",\r
+        "name": "outcome org.openecomp.policy.naming.SriovProvider.SriovProviderNetwork",\r
+        "xml": "<outcome value='org.openecomp.policy.naming.SriovProvider.SriovProviderNetwork'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3260.154739379883,\r
+        "y": 1379.1271246373653,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "9518558.1f4d3a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b2173417.8d9188",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "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",\r
+        "comments": "",\r
+        "x": 3221.4875507354736,\r
+        "y": 1452.793745368719,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "858baa62.b657b8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3776.0728454589844,\r
+        "y": 1140.210465848446,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "9c109189.444f58",\r
+                "cf022494.6df518",\r
+                "a835404c.942c08",\r
+                "3e84a79e.7e1e48",\r
+                "ed5be788.499a98",\r
+                "c1f2498e.515b7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9c109189.444f58",\r
+        "type": "set",\r
+        "name": "set nameformat",\r
+        "xml": "<set>\n<parameter name='tmp.network-name-prefix' value='$TenantName_int_$role_net' />\n",\r
+        "comments": "",\r
+        "x": 4288.547813415527,\r
+        "y": 1034.5436511933804,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "683e2e49.348cd8",\r
+        "type": "set",\r
+        "name": "set nameformat",\r
+        "xml": "<set>\n<parameter name='tmp.network-name-prefix' value='$TenantName_$role_net' />\n",\r
+        "comments": "",\r
+        "x": 4286.357772827148,\r
+        "y": 1076.40079459548,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "9518558.1f4d3a8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3671.643653869629,\r
+        "y": 1364.8771620690823,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "683e2e49.348cd8",\r
+                "cf022494.6df518",\r
+                "a835404c.942c08",\r
+                "3e84a79e.7e1e48",\r
+                "ed5be788.499a98",\r
+                "c1f2498e.515b7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7c4cce15.39256",\r
+        "type": "other",\r
+        "name": "outcome org.openecomp.policy.naming.ViprProtectedOam.ViprOamProtectedNetwork",\r
+        "xml": "<outcome value='org.openecomp.policy.naming.ViprProtectedOam.ViprOamProtectedNetwork'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3298.9328384399414,\r
+        "y": 1124.460464477539,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "858baa62.b657b8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cf022494.6df518",\r
+        "type": "execute",\r
+        "name": "execute SliStringUtils - replace tenantname",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4362.802307128906,\r
+        "y": 1200.067470163107,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "a835404c.942c08",\r
+        "type": "execute",\r
+        "name": "execute SliStringUtils - replace role",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4335.802307128906,\r
+        "y": 1235.067470163107,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "3e84a79e.7e1e48",\r
+        "type": "get-resource",\r
+        "name": "get-resource NETWORK_INSTANCE_NAME_INDEX",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4385.469055175781,\r
+        "y": 1271.067470163107,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "e098e55c.e9bcc8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ed5be788.499a98",\r
+        "type": "switchNode",\r
+        "name": "switch index-number",\r
+        "xml": "<switch test='`$db.network-name-prefix.index-number`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4291.183395385742,\r
+        "y": 1375.353054612875,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "5152f824.fb557",\r
+                "20b4e6c.d14431a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "20b4e6c.d14431a",\r
+        "type": "other",\r
+        "name": "NULL",\r
+        "xml": "<outcome value=''>",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4474.040435791016,\r
+        "y": 1416.7815681397915,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "25896c27.58ebfc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5152f824.fb557",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4475.4689865112305,\r
+        "y": 1332.4958969056606,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "a9ac0b9d.a6eb4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "981d7ecf.08a1d",\r
+        "type": "save",\r
+        "name": "save (insert) name index",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4847.255027770996,\r
+        "y": 1439.281955331564,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "2aed3f93.ceaf3"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "650af43d.047e24",\r
+        "type": "set",\r
+        "name": "increment index number",\r
+        "xml": "<set>\n<parameter name='tmp.index-number' value='`$db.network-name-prefix.index-number+1`' />\n",\r
+        "comments": "",\r
+        "x": 4846.897624969482,\r
+        "y": 1309.6389118134975,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "25896c27.58ebfc",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4632.611980438232,\r
+        "y": 1415.3532119691372,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "bac1ba8a.5888d",\r
+                "981d7ecf.08a1d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e098e55c.e9bcc8",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4659.754695892334,\r
+        "y": 1269.6388812959194,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "e8519067.5eedc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e8519067.5eedc",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "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",\r
+        "comments": "",\r
+        "x": 4814.040512084961,\r
+        "y": 1269.6389003694057,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "bac1ba8a.5888d",\r
+        "type": "set",\r
+        "name": "set new index number to 1",\r
+        "xml": "<set>\n<parameter name='tmp.index-number' value='1' />\n",\r
+        "comments": "",\r
+        "x": 4855.469207763672,\r
+        "y": 1393.9245296418667,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "21f03475.9133c4",\r
+        "type": "save",\r
+        "name": "save (update) name index",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4854.04056930542,\r
+        "y": 1351.067464441061,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "c232d6cf.de0a18"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a9ac0b9d.a6eb4",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4632.611877441406,\r
+        "y": 1331.0673442780972,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "650af43d.047e24",\r
+                "21f03475.9133c4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c232d6cf.de0a18",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5076.897624969482,\r
+        "y": 1351.067464441061,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "c68c27c5.c875c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c68c27c5.c875c8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "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",\r
+        "comments": "",\r
+        "x": 5231.183441162109,\r
+        "y": 1351.0674835145473,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2aed3f93.ceaf3",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5075.468925476074,\r
+        "y": 1436.7816768586636,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "49ac795f.497f88"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "49ac795f.497f88",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "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",\r
+        "comments": "",\r
+        "x": 5229.754741668701,\r
+        "y": 1436.78169593215,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c1f2498e.515b7",\r
+        "type": "set",\r
+        "name": "set tmp.network-instance-name",\r
+        "xml": "<set>\n<parameter name='tmp.network-instance-name' value=\"`$tmp.network-name-prefix + '_' + $tmp.index-number`\" />\n",\r
+        "comments": "",\r
+        "x": 4328.754192352295,\r
+        "y": 1454.4959779679775,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "47dada57.b386d4",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1750.6138343811035,\r
+        "y": 737.7248501777649,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "fc8a6fbd.0a8c1"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4ec3b463.9f3dec",\r
+        "type": "get-resource",\r
+        "name": "get-resource tenant",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 524.1653747558594,\r
+        "y": 411.46299585700035,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "dceca419.e95bf",\r
+                "5c7e325c.1e2d84",\r
+                "a1832241.3d7b08"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "dceca419.e95bf",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 759.7767105102539,\r
+        "y": 415.5740579068661,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "29bf9597.ed8532"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5c7e325c.1e2d84",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 755.1097373962402,\r
+        "y": 448.90737184882164,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "29bf9597.ed8532"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "29bf9597.ed8532",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "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",\r
+        "comments": "",\r
+        "x": 955.9523849487305,\r
+        "y": 423.62962278723717,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "fc1552fb.02ef8",\r
+        "type": "set",\r
+        "name": "set tmp.network-instance-name",\r
+        "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",\r
+        "comments": "",\r
+        "x": 2219.085075378418,\r
+        "y": 730.7248662412167,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "fc8a6fbd.0a8c1",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1949.132396697998,\r
+        "y": 737.7248196601868,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "fc1552fb.02ef8",\r
+                "b8fd9c4b.8d8a1"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7df139c4.75d918",\r
+        "type": "call",\r
+        "name": "call generate-l3network-network-id",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='generate-l3network-network-id' mode='sync' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1178.2795639038086,\r
+        "y": 502.54109224677086,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "a1832241.3d7b08",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 755.2857437133789,\r
+        "y": 384.0000222623348,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "f4aa45be.0cd09"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f4aa45be.0cd09",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 947.7857437133789,\r
+        "y": 384.75003084540367,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "33898a4d.eb2f56",\r
+        "type": "other",\r
+        "name": "outcome oam_vipr_protected_network",\r
+        "xml": "<outcome value='oam_vipr_protected_network'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3153.376640319824,\r
+        "y": 1161.324143409729,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "858baa62.b657b8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5a2b9c63.71261c",\r
+        "type": "other",\r
+        "name": "outcome network_without_route_tags_naming_default",\r
+        "xml": "<outcome value='network_without_route_tags_naming_default'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3200.043312072754,\r
+        "y": 1197.9908113479614,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "858baa62.b657b8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "403cc823.dd2ee8",\r
+        "type": "other",\r
+        "name": "outcome sriov_provider_network",\r
+        "xml": "<outcome value='sriov_provider_network'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3132.710159301758,\r
+        "y": 1412.657508701086,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "9518558.1f4d3a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "375f6c6a.29e584",\r
+        "type": "other",\r
+        "name": "outcome oam_atm_u_landing_network",\r
+        "xml": "<outcome value='oam_atm_u_landing_network'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3146.709831237793,\r
+        "y": 1239.657470703125,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "9518558.1f4d3a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "839be5c.165d718",\r
+        "type": "other",\r
+        "name": "outcome oam_atm_p_landing_network",\r
+        "xml": "<outcome value='oam_atm_p_landing_network'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3145.0430068969727,\r
+        "y": 1274.6574726104736,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "9518558.1f4d3a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9b384d04.bc9c48",\r
+        "type": "other",\r
+        "name": "outcome oam_aim_landing_network",\r
+        "xml": "<outcome value='oam_aim_landing_network'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3138.3768463134766,\r
+        "y": 1306.3241415023804,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "9518558.1f4d3a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "617ccf55.6ce468",\r
+        "type": "other",\r
+        "name": "outcome network_with_route_tags_naming_default",\r
+        "xml": "<outcome value='network_with_route_tags_naming_default'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3183.3769302368164,\r
+        "y": 1339.6574659347534,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "9518558.1f4d3a8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "48c9f390.1cccac",\r
+        "type": "comment",\r
+        "name": "Changelog",\r
+        "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",\r
+        "comments": "",\r
+        "x": 321.8571472167969,\r
+        "y": 90.00000667572021,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d3ee5726.8245f",\r
+        "type": "execute",\r
+        "name": "execute Properties - pull properties file",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 586.571533203125,\r
+        "y": 254.71820068359375,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "533d3c33.ff026c",\r
+        "type": "comment",\r
+        "name": "Pre-1806 naming logic",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 2664.0712890625,\r
+        "y": 1200.8254249989986,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b9c386f.7817bf8",\r
+        "type": "call",\r
+        "name": "call naming-policy-generate-name",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3029.1788177490234,\r
+        "y": 707.0039323270321,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "d18311c4.4cd748",\r
+        "type": "set",\r
+        "name": "set parameters for generate-unique-name",\r
+        "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",\r
+        "comments": "",\r
+        "x": 3051.9291076660156,\r
+        "y": 669.004013389349,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b0171571.8c955",\r
+        "type": "set",\r
+        "name": "set network name",\r
+        "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",\r
+        "comments": "",\r
+        "x": 2978.428871154785,\r
+        "y": 742.0039304196835,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b8fd9c4b.8d8a1",\r
+        "type": "call",\r
+        "name": "call network-topology-operation-assign-from-preload",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign-from-preload' mode='sync' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2283.2148056030273,\r
+        "y": 765.4324515759945,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "cc60b7f8.cae668",\r
+        "type": "call",\r
+        "name": "call network-topology-operation-assign-automated",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign-automated' mode='sync' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3082.341377258301,\r
+        "y": 779.5833495557308,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "3c332c37.f4b7bc",\r
+        "type": "set",\r
+        "name": "set tmp.l3-network.network-id",\r
+        "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`' />",\r
+        "comments": "",\r
+        "x": 526.7461700439453,\r
+        "y": 587.2500842511654,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6b08e57f.4948f4",\r
+        "type": "switchNode",\r
+        "name": "switch network-request-information.network-id",\r
+        "xml": "<switch test='`$network-topology-operation-input.network-information.network-id`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 576.2500610351562,\r
+        "y": 541.0039370954037,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "4c000f91.25bd98",\r
+                "a2712860.12272"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4c000f91.25bd98",\r
+        "type": "other",\r
+        "name": "outcome NULL",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 905.25,\r
+        "y": 504.0039218366146,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "7df139c4.75d918"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a2712860.12272",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 885.8794059753418,\r
+        "y": 543.3280005455017,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "8d53d1f0.18ba8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8d53d1f0.18ba8",\r
+        "type": "set",\r
+        "name": "set network-id",\r
+        "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",\r
+        "comments": "",\r
+        "x": 1108.25,\r
+        "y": 542.7540283203125,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1c431b71.bddac5",\r
+        "type": "comment",\r
+        "name": "if network-instance-group-id populated, follow vlan tagging flow",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 631.1445465087891,\r
+        "y": 687.2913134992123,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "96dfe9d4.8e2428",\r
+        "type": "switchNode",\r
+        "name": "switch network-request-information.network-instance-group-id",\r
+        "xml": "<switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 629.8627166748047,\r
+        "y": 722.1563418805599,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "b127ebea.ab0398",\r
+                "12e816ea.a7d6a1"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b127ebea.ab0398",\r
+        "type": "other",\r
+        "name": "outcome NULL",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1012.5732421875,\r
+        "y": 720.148541778326,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "ff1e099e.f8c22"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "12e816ea.a7d6a1",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 993.2026481628418,\r
+        "y": 759.4726204872131,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "954c1f71.93d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "954c1f71.93d",\r
+        "type": "call",\r
+        "name": "call network-topology-operation-assign-vlantagging-instancegroup",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign-vlantagging-instancegroup' mode='sync' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1394.0737915039062,\r
+        "y": 761.2916396558285,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "352e9d1e.614ada",\r
+        "type": "comment",\r
+        "name": "if network-name not populated, generate and call automated flow",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 1941.1310729980469,\r
+        "y": 832.3133433759212,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "66347a0f.b006fc",\r
+        "type": "switchNode",\r
+        "name": "cloud-owner passed in input?",\r
+        "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.cloud-owner != ''`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 618,\r
+        "y": 313,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "606ae78e.f9ea48"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "606ae78e.f9ea48",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 915,\r
+        "y": 313,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": [\r
+            [\r
+                "1e09389.8f46447"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1e09389.8f46447",\r
+        "type": "set",\r
+        "name": "set prop.cloud-region.cloud-owner to input cloud-owner",\r
+        "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$network-topology-operation-input.network-request-input.cloud-owner`' />\n",\r
+        "comments": "",\r
+        "x": 1322,\r
+        "y": 314,\r
+        "z": "81b8b420.9b1d88",\r
+        "wires": []\r
+    }\r
+]
\ No newline at end of file
index 2e3a1c2..effe51e 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "d3b3a7ea.d04d08",\r
+        "id": "ee243452.aa33a8",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 133.3333282470703,\r
-        "y": 79.63588523864746,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 134,\r
+        "y": 98,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "46bb10f7.5c3fb"\r
+                "5810e1f9.1768b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46bb10f7.5c3fb",\r
+        "id": "5810e1f9.1768b",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 248.61903381347656,\r
-        "y": 121.54066467285156,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 249.28570556640625,\r
+        "y": 139.9047794342041,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "11b944cd.c96c5b"\r
+                "70e23e6c.961c38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11b944cd.c96c5b",\r
+        "id": "70e23e6c.961c38",\r
         "type": "method",\r
         "name": "method pnf-topology-operation-assign",\r
         "xml": "<method rpc='pnf-topology-operation-assign' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 243.92864990234375,\r
-        "y": 165.55255317687988,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 244.59532165527344,\r
+        "y": 183.91666793823242,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "ce6b8a58.b8d3e8"\r
+                "c77449b3.048b78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e923496.314c4c",\r
+        "id": "14cec61f.9eab5a",\r
         "type": "comment",\r
         "name": "pnf-topology-operation-assign",\r
         "info": "",\r
         "comments": "",\r
-        "x": 535.5948638916016,\r
-        "y": 41.38888931274414,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 536.2615356445312,\r
+        "y": 59.75300407409668,\r
+        "z": "19228309.79f23d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2c8dd484.c334bc",\r
+        "id": "da472ec3.e5ccd8",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$pnf-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 627.2143096923828,\r
-        "y": 309.0287160873413,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 627.8809814453125,\r
+        "y": 327.39283084869385,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "e97259d0.1af158",\r
-                "413f5d48.571fc4"\r
+                "b27a37af.b36718",\r
+                "f6fae337.330588"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e97259d0.1af158",\r
+        "id": "b27a37af.b36718",\r
         "type": "outcome",\r
         "name": "CreatePnfInstance",\r
         "xml": "<outcome value='CreatePnfInstance'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 880.9286041259766,\r
-        "y": 286.1715974807739,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 881.5952758789062,\r
+        "y": 304.53571224212646,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "f6bc9eb4.5cc37"\r
+                "5bfce726.0e0808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "413f5d48.571fc4",\r
+        "id": "f6fae337.330588",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 842.9285697937012,\r
-        "y": 331.88592529296875,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 843.5952415466309,\r
+        "y": 350.2500400543213,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "514d78e9.baa838"\r
+                "e0cd414.414b64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6bc9eb4.5cc37",\r
+        "id": "5bfce726.0e0808",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1065.785732269287,\r
-        "y": 286.17162704467773,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 1066.4524040222168,\r
+        "y": 304.5357418060303,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "514d78e9.baa838",\r
+        "id": "e0cd414.414b64",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1082.9285774230957,\r
-        "y": 331.8858833312988,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 1083.5952491760254,\r
+        "y": 350.24999809265137,\r
+        "z": "19228309.79f23d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4388ff9d.ce7d6",\r
+        "id": "19b08e1.3415872",\r
         "type": "get-resource",\r
         "name": "get-resource VF_MODEL",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 639.5476150512695,\r
-        "y": 400.17158603668213,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 640.2142868041992,\r
+        "y": 418.53570079803467,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "512ab575.220ccc",\r
-                "3a1614d2.3eacec"\r
+                "982998d2.b1104",\r
+                "55fc7df0.63822c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6dc29919.0f2208",\r
+        "id": "ec81ba8b.5b2c9",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1080.9760932922363,\r
-        "y": 423.60007190704346,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 1081.642765045166,\r
+        "y": 441.964186668396,\r
+        "z": "19228309.79f23d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "512ab575.220ccc",\r
+        "id": "982998d2.b1104",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 840.3333129882812,\r
-        "y": 380.55242347717285,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 840.9999847412109,\r
+        "y": 398.9165382385254,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "d5d2d14c.f67aa"\r
+                "6a64650.0d6f39c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a1614d2.3eacec",\r
+        "id": "55fc7df0.63822c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 848.9047431945801,\r
-        "y": 424.83813667297363,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 849.5714149475098,\r
+        "y": 443.2022514343262,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "6dc29919.0f2208"\r
+                "ec81ba8b.5b2c9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5d2d14c.f67aa",\r
+        "id": "6a64650.0d6f39c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1080.333293914795,\r
-        "y": 378.695330619812,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 1080.9999656677246,\r
+        "y": 397.05944538116455,\r
+        "z": "19228309.79f23d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "95465986.653a28",\r
+        "id": "a75821b1.edfb58",\r
         "type": "execute",\r
         "name": "execute PropertiesNode",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 635.1190948486328,\r
-        "y": 182.314471244812,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 637.7857666015625,\r
+        "y": 117.6785888671875,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ce6b8a58.b8d3e8",\r
+        "id": "c77449b3.048b78",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 353.41272735595703,\r
-        "y": 309.5079708099365,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 354.0793991088867,\r
+        "y": 327.87208557128906,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "2c8dd484.c334bc",\r
-                "4388ff9d.ce7d6",\r
-                "95465986.653a28",\r
-                "6cdfcbff.124fe4",\r
-                "4f7127f2.481f58"\r
+                "da472ec3.e5ccd8",\r
+                "19b08e1.3415872",\r
+                "a75821b1.edfb58",\r
+                "780d7aca.b60934",\r
+                "71d0891.189e778",\r
+                "f6ad14ca.084b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6cdfcbff.124fe4",\r
+        "id": "780d7aca.b60934",\r
         "type": "switchNode",\r
         "name": "switch input cloud-owner",\r
         "xml": "<switch test='`$pnf-topology-operation-input.pnf-request-input.cloud-owner`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 635.8333511352539,\r
-        "y": 237.55254077911377,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 636.5000228881836,\r
+        "y": 255.9166555404663,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "fbe3ca5c.624b78",\r
-                "12f9e0f5.d15d1f"\r
+                "c9bdd3dc.faf7b",\r
+                "6e4e01ec.cdd3b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fbe3ca5c.624b78",\r
+        "id": "c9bdd3dc.faf7b",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 819.1667251586914,\r
-        "y": 207.55252933502197,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 819.8333969116211,\r
+        "y": 225.9166440963745,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "c50e0e6c.80923"\r
+                "f08a07.1ccc0df8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12f9e0f5.d15d1f",\r
+        "id": "6e4e01ec.cdd3b8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 818.9286308288574,\r
-        "y": 248.5050230026245,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 819.5953025817871,\r
+        "y": 266.86913776397705,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "6843bdbc.1eb674"\r
+                "9f00eed0.781e1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c50e0e6c.80923",\r
+        "id": "f08a07.1ccc0df8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 954.1666793823242,\r
-        "y": 205.88586902618408,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 954.8333511352539,\r
+        "y": 224.24998378753662,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6843bdbc.1eb674",\r
+        "id": "9f00eed0.781e1",\r
         "type": "set",\r
         "name": "set prop.cloud-region.cloud-owner",\r
         "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$pnf-topology-operation-input.pnf-request-input.cloud-owner`' />\n",\r
         "comments": "",\r
-        "x": 1035.8333358764648,\r
-        "y": 247.55255031585693,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 1036.5000076293945,\r
+        "y": 265.9166650772095,\r
+        "z": "19228309.79f23d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "940a3bec.b79db8",\r
+        "id": "9a07bcfe.297ad8",\r
         "type": "call",\r
         "name": "call self-serve-pnf-assign",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-pnf-assign' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 848.5553359985352,\r
-        "y": 596.4128832817078,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 849.2220077514648,\r
+        "y": 614.7769980430603,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "ee11637d.64cc5"\r
+                "1b53503a.a14958"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22ef4f33.3ca9c",\r
+        "id": "d15a667b.1812a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1232.6267127990723,\r
-        "y": 596.4128336906433,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 1233.293384552002,\r
+        "y": 614.7769484519958,\r
+        "z": "19228309.79f23d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d7499e88.a3c54",\r
+        "id": "b09b2b8a.09a48",\r
         "type": "comment",\r
         "name": "SELF-SERVE FORK",\r
         "info": "",\r
         "comments": "",\r
-        "x": 758.174690246582,\r
-        "y": 547.6151220798492,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 758.8413619995117,\r
+        "y": 565.9792368412018,\r
+        "z": "19228309.79f23d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ee11637d.64cc5",\r
+        "id": "1b53503a.a14958",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1053.8529167175293,\r
-        "y": 595.9009146690369,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 1054.519588470459,\r
+        "y": 614.2650294303894,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "22ef4f33.3ca9c"\r
+                "d15a667b.1812a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8085154e.65e6a8",\r
+        "id": "1f34dbbd.dc61f4",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 820.9642715454102,\r
-        "y": 750.5674510002136,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 821.6309432983398,\r
+        "y": 768.9315657615662,\r
+        "z": "19228309.79f23d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4326ce02.3a255",\r
+        "id": "1f5752f6.bdefd5",\r
         "type": "set",\r
         "name": "set pnf-level-oper-status to PendingCreate",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 959.0277328491211,\r
-        "y": 649.15491771698,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 959.6944046020508,\r
+        "y": 667.5190324783325,\r
+        "z": "19228309.79f23d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b05b3263.f3526",\r
+        "id": "e1473b9e.65e3f8",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-pnf-assign.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 810.8689994812012,\r
-        "y": 698.3447003364563,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 811.5356712341309,\r
+        "y": 716.7088150978088,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4f7127f2.481f58",\r
+        "id": "71d0891.189e778",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 599.535530090332,\r
-        "y": 667.8531589508057,\r
-        "z": "6dfe2c1.a0003d4",\r
+        "x": 600.2022018432617,\r
+        "y": 686.2172737121582,\r
+        "z": "19228309.79f23d",\r
         "wires": [\r
             [\r
-                "940a3bec.b79db8",\r
-                "8085154e.65e6a8",\r
-                "b05b3263.f3526"\r
+                "9a07bcfe.297ad8",\r
+                "1f34dbbd.dc61f4",\r
+                "e1473b9e.65e3f8"\r
             ]\r
         ]\r
+    },\r
+    {\r
+        "id": "f6ad14ca.084b8",\r
+        "type": "switchNode",\r
+        "name": "Is cloud-owner passed in input?",\r
+        "xml": "<switch test=\"`$pnf-topology-operation-input.pnf-request-input.cloud-owner != ''`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 723,\r
+        "y": 172,\r
+        "z": "19228309.79f23d",\r
+        "wires": [\r
+            [\r
+                "98dded3d.86af78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "98dded3d.86af78",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1020,\r
+        "y": 172,\r
+        "z": "19228309.79f23d",\r
+        "wires": [\r
+            [\r
+                "fdb56d64.3dcfa"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fdb56d64.3dcfa",\r
+        "type": "set",\r
+        "name": "set prop.cloud-region.cloud-owner to input cloud-owner",\r
+        "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$pnf-topology-operation-input.pnf-request-input.cloud-owner`' />\n",\r
+        "comments": "",\r
+        "x": 1391,\r
+        "y": 168,\r
+        "z": "19228309.79f23d",\r
+        "wires": []\r
     }\r
 ]
\ No newline at end of file
index 3d4b8bd..089e74a 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "47ef00b1.749c8",\r
+        "id": "5fef1ca7.f76b2c",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 195,\r
-        "y": 102.5242919921875,\r
-        "z": "34265cd.7205424",\r
+        "x": 157.99998474121094,\r
+        "y": 199.52428817749023,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "4efb4066.e4139"\r
+                "eadd48a2.a47be"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4efb4066.e4139",\r
+        "id": "eadd48a2.a47be",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 308.8571357727051,\r
-        "y": 142.33382987976074,\r
-        "z": "34265cd.7205424",\r
+        "x": 271.857120513916,\r
+        "y": 239.33382606506348,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "3089d18d.9d8e36"\r
+                "62584ce7.0a03c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3089d18d.9d8e36",\r
+        "id": "62584ce7.0a03c4",\r
         "type": "method",\r
         "name": "method vf-module-topology-operation-assign-async",\r
         "xml": "<method rpc='vf-module-topology-operation-assign-async' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 308.42862701416016,\r
-        "y": 182.5242919921875,\r
-        "z": "34265cd.7205424",\r
+        "x": 271.4286117553711,\r
+        "y": 279.52428817749023,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "effbab1c.8eeb18"\r
+                "f8ca447b.c9d998"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ddba88b.d2daa78",\r
+        "id": "2675f20c.3ef7c6",\r
         "type": "comment",\r
         "name": "vf-module-topology-operation-assign-async",\r
         "info": "",\r
         "comments": "",\r
-        "x": 549.0711059570312,\r
-        "y": 21,\r
-        "z": "34265cd.7205424",\r
+        "x": 512.0710906982422,\r
+        "y": 117.99999618530273,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "13d1edde.2c3cc2",\r
+        "id": "16a1cdd5.b488f2",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 600.1905212402344,\r
-        "y": 455.5480899810791,\r
-        "z": "34265cd.7205424",\r
+        "x": 563.1905059814453,\r
+        "y": 552.5480861663818,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "d09a1f6d.c339a8",\r
-                "ae721e71.bc28f8"\r
+                "f6d2c005.1732a",\r
+                "cd49e654.ecead"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d09a1f6d.c339a8",\r
+        "id": "f6d2c005.1732a",\r
         "type": "outcome",\r
         "name": "CreateVfModuleInstance",\r
         "xml": "<outcome value='CreateVfModuleInstance'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 870.9881591796875,\r
-        "y": 423.9409656524658,\r
-        "z": "34265cd.7205424",\r
+        "x": 833.9881439208984,\r
+        "y": 520.9409618377686,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "163e3c12.686c64"\r
+                "eda2626e.eabf58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae721e71.bc28f8",\r
+        "id": "cd49e654.ecead",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 805.9047813415527,\r
-        "y": 488.0719690322876,\r
-        "z": "34265cd.7205424",\r
+        "x": 768.9047660827637,\r
+        "y": 585.0719652175903,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b097fd2d.1c3e2"\r
+                "bdff604f.42ef3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "163e3c12.686c64",\r
+        "id": "eda2626e.eabf58",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1060.845323562622,\r
-        "y": 423.94099712371826,\r
-        "z": "34265cd.7205424",\r
+        "x": 1023.845308303833,\r
+        "y": 520.940993309021,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "356786ed.1c1db2",\r
+        "id": "d8c6245c.30876",\r
         "type": "get-resource",\r
         "name": "get-resource VF_MODULE_MODEL",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 647.5237884521484,\r
-        "y": 556.6910438537598,\r
-        "z": "34265cd.7205424",\r
+        "x": 610.5237731933594,\r
+        "y": 653.6910400390625,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "3e27e49d.23f3f4",\r
-                "80af5787.882358"\r
+                "9743eae8.547b58",\r
+                "e217d566.35e7b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e27e49d.23f3f4",\r
+        "id": "9743eae8.547b58",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 913.3094787597656,\r
-        "y": 537.0718746185303,\r
-        "z": "34265cd.7205424",\r
+        "x": 876.3094635009766,\r
+        "y": 634.071870803833,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "2b23f970.b0e516"\r
+                "a8481a22.9610b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80af5787.882358",\r
+        "id": "e217d566.35e7b",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 921.8809089660645,\r
-        "y": 581.357587814331,\r
-        "z": "34265cd.7205424",\r
+        "x": 884.8808937072754,\r
+        "y": 678.3575839996338,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "19ca61b5.8fa5c6"\r
+                "12fc934c.3bd04d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f269ddb2.03ac18",\r
+        "id": "9f361c75.f7c698",\r
         "type": "switchNode",\r
         "name": "switch service-data.vnfs.vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 641.3690414428711,\r
-        "y": 734.0124034881592,\r
-        "z": "34265cd.7205424",\r
+        "x": 604.369026184082,\r
+        "y": 831.0123996734619,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b91f6edf.e66fa",\r
-                "de858ec5.7b807"\r
+                "496e5a5a.75943c",\r
+                "5e2df781.3cbcc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b91f6edf.e66fa",\r
+        "id": "496e5a5a.75943c",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 882.0833129882812,\r
-        "y": 710.155143737793,\r
-        "z": "34265cd.7205424",\r
+        "x": 845.0832977294922,\r
+        "y": 807.1551399230957,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "57fdbbee.7122f4"\r
+                "b40ea227.e7972"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de858ec5.7b807",\r
+        "id": "5e2df781.3cbcc8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 881.8451538085938,\r
-        "y": 752.1076622009277,\r
-        "z": "34265cd.7205424",\r
+        "x": 844.8451385498047,\r
+        "y": 849.1076583862305,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b90f80a9.a4803"\r
+                "159bdfa5.c6b9b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b2cbded2.837b2",\r
+        "id": "b209b55a.0520c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 239.9404296875,\r
-        "y": 3171.9293028116226,\r
-        "z": "34265cd.7205424",\r
-        "wires": [\r
-            [\r
-                "a43d883.25c17f8",\r
-                "a0b91b46.4fb248",\r
-                "cb9c99a0.7906c",\r
-                "734ae3c5.175e1c",\r
-                "d02c5f14.3d4ee",\r
-                "97b7d623.89325",\r
-                "925699fb.c3532",\r
-                "500b7c10.330fb4",\r
-                "e5d088d4.d1279",\r
-                "9f6faea5.1876d",\r
-                "b6b2184e.def9e",\r
-                "6c341ffe.ffd948",\r
-                "602e0129.20af78",\r
-                "f312e38d.47c19",\r
-                "c5f1094.89d7678",\r
-                "bdd166c5.9655d",\r
-                "3326bf0a.c858a",\r
-                "eada7f38.32c088",\r
-                "8aa4893.5435478",\r
-                "40d2ead1.29e2d4",\r
-                "205882d9.0b5ba6",\r
-                "e9f0935c.0d26e",\r
-                "cf288013.27e988",\r
-                "50d2cea2.bb528",\r
-                "886b51f6.cb8c8",\r
-                "14aa8b5.d6278f5",\r
-                "4b70bca8.2d04e4",\r
-                "d4b60897.e18598",\r
-                "fcdfebce.a935a8",\r
-                "84fdd3bf.927fd",\r
-                "9f112544.7f8a58",\r
-                "5b817e7f.0206",\r
-                "a1c5d05.89a983",\r
-                "7e168e6e.8d02f8",\r
-                "c1894905.cb3d58",\r
-                "7badb381.1fbf0c",\r
-                "2d6c7dfc.640b9a"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "b90f80a9.a4803",\r
+        "x": 202.94041442871094,\r
+        "y": 3268.9292989969254,\r
+        "z": "1e5d41b0.b1168e",\r
+        "wires": [\r
+            [\r
+                "d765e32e.c6a6c8",\r
+                "e1aa9962.b2cca8",\r
+                "2886552.ce6422a",\r
+                "259e2808.48083",\r
+                "7ffcda81.e6c1cc",\r
+                "4ffa8fa2.c8758",\r
+                "a7369062.c567c8",\r
+                "69d66ce3.f97a5c",\r
+                "2cd2be99.205622",\r
+                "be3b3ee.7ce42c",\r
+                "c19d4ee0.8d77c",\r
+                "bd5d1959.e5b588",\r
+                "353f71d8.b849ee",\r
+                "10740584.685552",\r
+                "8266f367.7a81d",\r
+                "d570eb5d.f5786",\r
+                "f7a15e8.e9d50a",\r
+                "d0512da2.27542",\r
+                "1b32685d.a9d2f",\r
+                "5d0d3a4f.87fd84",\r
+                "33a320c6.b50498",\r
+                "13308bfd.0f2aec",\r
+                "a75def4f.6ee6e",\r
+                "43e6fb56.3aad2c",\r
+                "8ddb6fb6.8a0038",\r
+                "76eaad0d.045934",\r
+                "b55fea55.8a7208",\r
+                "f0a7970e.17889",\r
+                "52376e41.5c3c28",\r
+                "54266176.fdc52",\r
+                "ebdeb223.d9f918",\r
+                "db29530f.c21f7",\r
+                "2f669bfa.b0d904",\r
+                "d6e0298e.3c1e8",\r
+                "d3460755.d852e",\r
+                "d35134f0.fec4d",\r
+                "7916d324.cb3bf4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "159bdfa5.c6b9b8",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1044.0832977294922,\r
-        "y": 751.7742805480957,\r
-        "z": "34265cd.7205424",\r
+        "x": 1007.0832824707031,\r
+        "y": 848.7742767333984,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f126a52f.3ffd6"\r
+                "d54b095a.77a938"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f126a52f.3ffd6",\r
+        "id": "d54b095a.77a938",\r
         "type": "switchNode",\r
         "name": "switch service data vnf == input vnf",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1295.4165954589844,\r
-        "y": 751.4410085678101,\r
-        "z": "34265cd.7205424",\r
+        "x": 1258.4165802001953,\r
+        "y": 848.4410047531128,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "9db43827.db871"\r
+                "9291a4b4.435ba8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9db43827.db871",\r
+        "id": "9291a4b4.435ba8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1525.4166069030762,\r
-        "y": 750.7743215560913,\r
-        "z": "34265cd.7205424",\r
+        "x": 1488.416591644287,\r
+        "y": 847.774317741394,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c01d11b0.35cf18"\r
+                "a2b9ec94.73978"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "527b3c86.073724",\r
+        "id": "3ad4001f.cd4388",\r
         "type": "set",\r
         "name": "set vnf-index to -1",\r
         "xml": "<set>\n<parameter name='vnf-index' value='-1' />\n",\r
         "comments": "",\r
-        "x": 590.4166641235352,\r
-        "y": 665.4409027099609,\r
-        "z": "34265cd.7205424",\r
+        "x": 553.4166488647461,\r
+        "y": 762.4408988952637,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c592a9bb.2acb88",\r
+        "id": "ffe8620d.4a41a8",\r
         "type": "set",\r
         "name": "set vnf-index to idx",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1847.0832443237305,\r
-        "y": 721.7742795944214,\r
-        "z": "34265cd.7205424",\r
+        "x": 1810.0832290649414,\r
+        "y": 818.7742757797241,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aca51e3b.78a188",\r
+        "id": "b1d0605e.841ca",\r
         "type": "switchNode",\r
         "name": "switch vnf-index",\r
         "xml": "<switch test='`$vnf-index`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 579.1666870117188,\r
-        "y": 817.6075925827026,\r
-        "z": "34265cd.7205424",\r
+        "x": 542.1666717529297,\r
+        "y": 914.6075887680054,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "cb668766.b21a98"\r
+                "b932b709.8abbb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb668766.b21a98",\r
+        "id": "b932b709.8abbb8",\r
         "type": "outcome",\r
         "name": "-1",\r
         "xml": "<outcome value='-1'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 757.500072479248,\r
-        "y": 816.9409685134888,\r
-        "z": "34265cd.7205424",\r
+        "x": 720.500057220459,\r
+        "y": 913.9409646987915,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "a0d2ddbe.4ce55"\r
+                "5cd79a68.a802ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a43d883.25c17f8",\r
+        "id": "d765e32e.c6a6c8",\r
         "type": "switchNode",\r
         "name": "switch vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 617.0833854675293,\r
-        "y": 1388.3577966690063,\r
-        "z": "34265cd.7205424",\r
+        "x": 580.0833702087402,\r
+        "y": 1485.357792854309,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "8981146c.cb942",\r
-                "fcfff00d.49938"\r
+                "996a7f9b.32041",\r
+                "904da051.0d0538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8981146c.cb942",\r
+        "id": "996a7f9b.32041",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 874.4643402099609,\r
-        "y": 1355.5005702972412,\r
-        "z": "34265cd.7205424",\r
+        "x": 837.4643249511719,\r
+        "y": 1452.500566482544,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "3dbed402.1d6ef4"\r
+                "4c326b2e.0b59a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3dbed402.1d6ef4",\r
+        "id": "4c326b2e.0b59a4",\r
         "type": "set",\r
         "name": "set vf-module-index=0",\r
         "xml": "<set>\n<parameter name='vf-module-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 1062.0833778381348,\r
-        "y": 1356.167345046997,\r
-        "z": "34265cd.7205424",\r
+        "x": 1025.0833625793457,\r
+        "y": 1453.1673412322998,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fcfff00d.49938",\r
+        "id": "904da051.0d0538",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 874.8928833007812,\r
-        "y": 1419.786428451538,\r
-        "z": "34265cd.7205424",\r
+        "x": 837.8928680419922,\r
+        "y": 1516.7864246368408,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "7565eb2b.4c1ff4"\r
+                "ba1e98fd.f5e98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c0b8cef7.d83a68",\r
+        "id": "ee38f883.9fd87",\r
         "type": "set",\r
         "name": "set vf-module-index = vf-module_length",\r
         "xml": "<set>\n<parameter name='vf-module-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n",\r
         "comments": "",\r
-        "x": 1260.083423614502,\r
-        "y": 1399.9768238067627,\r
-        "z": "34265cd.7205424",\r
+        "x": 1223.083408355713,\r
+        "y": 1496.9768199920654,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "baf65dc8.0e8fb8",\r
+        "id": "e6d36a66.fc6eb",\r
         "type": "for",\r
         "name": "for each existing VF module",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1219.1785163879395,\r
-        "y": 1444.0720539093018,\r
-        "z": "34265cd.7205424",\r
+        "x": 1182.1785011291504,\r
+        "y": 1541.0720500946045,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c8acfe74.080af8"\r
+                "2fd1f627.c02a4a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7565eb2b.4c1ff4",\r
+        "id": "ba1e98fd.f5e98",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1011.6071624755859,\r
-        "y": 1419.7863540649414,\r
-        "z": "34265cd.7205424",\r
+        "x": 974.6071472167969,\r
+        "y": 1516.7863502502441,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c0b8cef7.d83a68",\r
-                "baf65dc8.0e8fb8"\r
+                "ee38f883.9fd87",\r
+                "e6d36a66.fc6eb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8acfe74.080af8",\r
+        "id": "2fd1f627.c02a4a",\r
         "type": "switchNode",\r
         "name": "switch vf-module-information.vf-module-id == service-data.vnfs.vnf[].vf-modules.vf-module[].vf-module-id",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1722.7976188659668,\r
-        "y": 1443.6434650421143,\r
-        "z": "34265cd.7205424",\r
+        "x": 1685.7976036071777,\r
+        "y": 1540.643461227417,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "e7c1d7a5.ea41f"\r
+                "f6ad1e0e.9e6058"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e7c1d7a5.ea41f",\r
+        "id": "f6ad1e0e.9e6058",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2165.4166679382324,\r
-        "y": 1443.214916229248,\r
-        "z": "34265cd.7205424",\r
+        "x": 2128.4166526794434,\r
+        "y": 1540.2149124145508,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "bdb7e590.4bbf98"\r
+                "2a30af16.7b82"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d2392dfe.c660f",\r
+        "id": "d15dcaa9.4347a8",\r
         "type": "comment",\r
         "name": "make sure this VF module doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1749.2499656677246,\r
-        "y": 1398.270956993103,\r
-        "z": "34265cd.7205424",\r
+        "x": 1712.2499504089355,\r
+        "y": 1495.2709531784058,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a0b91b46.4fb248",\r
+        "id": "e1aa9962.b2cca8",\r
         "type": "set",\r
         "name": "set new vf-module_length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-module-index + 1`' />\n",\r
         "comments": "",\r
-        "x": 627.7499656677246,\r
-        "y": 1499.3576517105103,\r
-        "z": "34265cd.7205424",\r
+        "x": 590.7499504089355,\r
+        "y": 1596.357647895813,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cb9c99a0.7906c",\r
+        "id": "2886552.ce6422a",\r
         "type": "set",\r
         "name": "set vf-module-topology data",\r
         "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",\r
         "comments": "",\r
-        "x": 634.2499847412109,\r
-        "y": 1611.8577585220337,\r
-        "z": "34265cd.7205424",\r
+        "x": 597.2499694824219,\r
+        "y": 1708.8577547073364,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ee8323c4.89df98",\r
+        "id": "6e9378a9.0367d",\r
         "type": "set",\r
         "name": "set aic-clli",\r
         "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",\r
         "comments": "",\r
-        "x": 1395.2022438049316,\r
-        "y": 1771.095685005188,\r
-        "z": "34265cd.7205424",\r
+        "x": 1358.2022285461426,\r
+        "y": 1868.0956811904907,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "734ae3c5.175e1c",\r
+        "id": "259e2808.48083",\r
         "type": "switchNode",\r
         "name": "switch aic-clli",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 594.2499046325684,\r
-        "y": 1885.0480251312256,\r
-        "z": "34265cd.7205424",\r
+        "x": 557.2498893737793,\r
+        "y": 1982.0480213165283,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "a5088391.cb913"\r
+                "9ac40770.7714b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5088391.cb913",\r
+        "id": "9ac40770.7714b",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 739.5355949401855,\r
-        "y": 1885.0480937957764,\r
-        "z": "34265cd.7205424",\r
+        "x": 702.5355796813965,\r
+        "y": 1982.048089981079,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "2b8167ac.ee8e3"\r
+                "42e790a.f88747"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d02c5f14.3d4ee",\r
+        "id": "7ffcda81.e6c1cc",\r
         "type": "get-resource",\r
         "name": "get-resource cloud region",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 633.107120513916,\r
-        "y": 1685.1912965774536,\r
-        "z": "34265cd.7205424",\r
+        "x": 596.107105255127,\r
+        "y": 1782.1912927627563,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "afc6e33.fafafa",\r
-                "60ebcdb7.264a0c"\r
+                "f2beec5b.5611a8",\r
+                "30b937c5.93fd7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60ebcdb7.264a0c",\r
+        "id": "30b937c5.93fd7",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 847.3533134460449,\r
-        "y": 1703.34215259552,\r
-        "z": "34265cd.7205424",\r
+        "x": 810.3532981872559,\r
+        "y": 1800.3421487808228,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "71cefe31.79b508"\r
+                "caeb64b7.ba2878"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "afc6e33.fafafa",\r
+        "id": "f2beec5b.5611a8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 856.281909942627,\r
-        "y": 1660.6278858184814,\r
-        "z": "34265cd.7205424",\r
+        "x": 819.2818946838379,\r
+        "y": 1757.6278820037842,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "e750571d.ca626"\r
+                "7e580eff.038e2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c01d11b0.35cf18",\r
+        "id": "a2b9ec94.73978",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1673.7500686645508,\r
-        "y": 749.6940202713013,\r
-        "z": "34265cd.7205424",\r
+        "x": 1636.7500534057617,\r
+        "y": 846.694016456604,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c592a9bb.2acb88",\r
-                "9ce31ee0.52ab58"\r
+                "ffe8620d.4a41a8",\r
+                "4b03173.9ac0e68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ce31ee0.52ab58",\r
+        "id": "4b03173.9ac0e68",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 1808.7500343322754,\r
-        "y": 771.3606061935425,\r
-        "z": "34265cd.7205424",\r
+        "x": 1771.7500190734863,\r
+        "y": 868.3606023788452,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c55eb946.3ed8e8",\r
+        "id": "fc19e6e.2a84698",\r
         "type": "set",\r
         "name": "set from DB",\r
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-invariant-uuid'\n  value='`$db.vf-module-model.invariant-uuid`' />\n",\r
         "comments": "",\r
-        "x": 1008.5832443237305,\r
-        "y": 1926.4440183639526,\r
-        "z": "34265cd.7205424",\r
+        "x": 971.5832290649414,\r
+        "y": 2023.4440145492554,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "97b7d623.89325",\r
+        "id": "4ffa8fa2.c8758",\r
         "type": "switchNode",\r
         "name": "switch input model-invariant-uuid",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 652.4403190612793,\r
-        "y": 1949.2684621810913,\r
-        "z": "34265cd.7205424",\r
+        "x": 615.4403038024902,\r
+        "y": 2046.268458366394,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "ef2c9ecf.3ea71",\r
-                "6560f94f.b870d8"\r
+                "8859fea1.da3998",\r
+                "69b411af.327d08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef2c9ecf.3ea71",\r
+        "id": "8859fea1.da3998",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 858.106990814209,\r
-        "y": 1926.4114255905151,\r
-        "z": "34265cd.7205424",\r
+        "x": 821.1069755554199,\r
+        "y": 2023.4114217758179,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c55eb946.3ed8e8"\r
+                "fc19e6e.2a84698"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6560f94f.b870d8",\r
+        "id": "69b411af.327d08",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 859.535587310791,\r
-        "y": 1970.6970167160034,\r
-        "z": "34265cd.7205424",\r
+        "x": 822.535572052002,\r
+        "y": 2067.697012901306,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "3ee20fc0.bf22f"\r
+                "d1ad172f.1fe558"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ee20fc0.bf22f",\r
+        "id": "d1ad172f.1fe558",\r
         "type": "set",\r
         "name": "set from input",\r
         "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",\r
         "comments": "",\r
-        "x": 1013.8213233947754,\r
-        "y": 1970.1255888938904,\r
-        "z": "34265cd.7205424",\r
+        "x": 976.8213081359863,\r
+        "y": 2067.125585079193,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3108a061.0ec8f",\r
+        "id": "ff8a2c9.6d54b5",\r
         "type": "set",\r
         "name": "set from DB",\r
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-uuid'\n  value='`$db.vf-module-model.uuid`' />\n",\r
         "comments": "",\r
-        "x": 1009.535514831543,\r
-        "y": 2014.9826946258545,\r
-        "z": "34265cd.7205424",\r
+        "x": 972.5354995727539,\r
+        "y": 2111.982690811157,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "925699fb.c3532",\r
+        "id": "a7369062.c567c8",\r
         "type": "switchNode",\r
         "name": "switch input model-uuid",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 625.0593376159668,\r
-        "y": 2037.8071994781494,\r
-        "z": "34265cd.7205424",\r
+        "x": 588.0593223571777,\r
+        "y": 2134.807195663452,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "935ab6e4.246cd",\r
-                "110bf82.0172d08"\r
+                "2621938b.96a034",\r
+                "cc168f45.9ae8f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "935ab6e4.246cd",\r
+        "id": "2621938b.96a034",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 859.0593109130859,\r
-        "y": 2014.9501314163208,\r
-        "z": "34265cd.7205424",\r
+        "x": 822.0592956542969,\r
+        "y": 2111.9501276016235,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "3108a061.0ec8f"\r
+                "ff8a2c9.6d54b5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "110bf82.0172d08",\r
+        "id": "cc168f45.9ae8f8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 860.487907409668,\r
-        "y": 2059.235722541809,\r
-        "z": "34265cd.7205424",\r
+        "x": 823.4878921508789,\r
+        "y": 2156.235718727112,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f5fdcdbb.a51fc8"\r
+                "6b2c4cda.703a54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5fdcdbb.a51fc8",\r
+        "id": "6b2c4cda.703a54",\r
         "type": "set",\r
         "name": "set from input",\r
         "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",\r
         "comments": "",\r
-        "x": 1014.7736434936523,\r
-        "y": 2058.664294719696,\r
-        "z": "34265cd.7205424",\r
+        "x": 977.7736282348633,\r
+        "y": 2155.664290904999,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3414be68.250f22",\r
+        "id": "40fb71b4.fe9a88",\r
         "type": "set",\r
         "name": "set from DB",\r
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-version'\n  value='`$db.vf-module-model.version`' />\n",\r
         "comments": "",\r
-        "x": 1006.6784477233887,\r
-        "y": 2103.8399019241333,\r
-        "z": "34265cd.7205424",\r
+        "x": 969.6784324645996,\r
+        "y": 2200.839898109436,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "500b7c10.330fb4",\r
+        "id": "69d66ce3.f97a5c",\r
         "type": "switchNode",\r
         "name": "switch input model-version",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 633.2022094726562,\r
-        "y": 2126.6643466949463,\r
-        "z": "34265cd.7205424",\r
+        "x": 596.2021942138672,\r
+        "y": 2223.664342880249,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "2d96bcee.a98f2c",\r
-                "d50c8bc4.769118"\r
+                "8d1bc34b.5f2768",\r
+                "b5cb1b08.e5fea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d96bcee.a98f2c",\r
+        "id": "8d1bc34b.5f2768",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 856.2021942138672,\r
-        "y": 2103.807309150696,\r
-        "z": "34265cd.7205424",\r
+        "x": 819.2021789550781,\r
+        "y": 2200.8073053359985,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "3414be68.250f22"\r
+                "40fb71b4.fe9a88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d50c8bc4.769118",\r
+        "id": "b5cb1b08.e5fea8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 857.6307907104492,\r
-        "y": 2148.092900276184,\r
-        "z": "34265cd.7205424",\r
+        "x": 820.6307754516602,\r
+        "y": 2245.092896461487,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f4ecdb0.7ccf3a8"\r
+                "91462cbf.dd094"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4ecdb0.7ccf3a8",\r
+        "id": "91462cbf.dd094",\r
         "type": "set",\r
         "name": "set from input",\r
         "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",\r
         "comments": "",\r
-        "x": 1011.9165267944336,\r
-        "y": 2147.521472454071,\r
-        "z": "34265cd.7205424",\r
+        "x": 974.9165115356445,\r
+        "y": 2244.521468639374,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1c1e9347.9ae5dd",\r
+        "id": "5d0993e7.17439c",\r
         "type": "set",\r
         "name": "set from DB",\r
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-name'\n  value='`$db.vf-module-model.name`' />\n",\r
         "comments": "",\r
-        "x": 1006.6784477233887,\r
-        "y": 2190.9827241897583,\r
-        "z": "34265cd.7205424",\r
+        "x": 969.6784324645996,\r
+        "y": 2287.982720375061,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e5d088d4.d1279",\r
+        "id": "2cd2be99.205622",\r
         "type": "switchNode",\r
         "name": "switch input model-name",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-name`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 628.2022094726562,\r
-        "y": 2213.8071689605713,\r
-        "z": "34265cd.7205424",\r
+        "x": 591.2021942138672,\r
+        "y": 2310.807165145874,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f63d99eb.7ea558",\r
-                "a3370d33.87d5d"\r
+                "be5907cf.3853a",\r
+                "c1f83a69.57a51"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f63d99eb.7ea558",\r
+        "id": "be5907cf.3853a",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 856.2021942138672,\r
-        "y": 2190.950131416321,\r
-        "z": "34265cd.7205424",\r
+        "x": 819.2021789550781,\r
+        "y": 2287.9501276016235,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "1c1e9347.9ae5dd"\r
+                "5d0993e7.17439c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3370d33.87d5d",\r
+        "id": "c1f83a69.57a51",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 857.6307907104492,\r
-        "y": 2235.235722541809,\r
-        "z": "34265cd.7205424",\r
+        "x": 820.6307754516602,\r
+        "y": 2332.235718727112,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b62b5297.640c38"\r
+                "19c39c5d.580394"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b62b5297.640c38",\r
+        "id": "19c39c5d.580394",\r
         "type": "set",\r
         "name": "set from input",\r
         "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",\r
         "comments": "",\r
-        "x": 1011.9165267944336,\r
-        "y": 2234.664294719696,\r
-        "z": "34265cd.7205424",\r
+        "x": 974.9165115356445,\r
+        "y": 2331.664290904999,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9f6faea5.1876d",\r
+        "id": "be3b3ee.7ce42c",\r
         "type": "set",\r
         "name": "set model-customization-uuid",\r
         "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",\r
         "comments": "",\r
-        "x": 642.6545448303223,\r
-        "y": 2286.3161582946777,\r
-        "z": "34265cd.7205424",\r
+        "x": 605.6545295715332,\r
+        "y": 2383.3161544799805,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b6b2184e.def9e",\r
+        "id": "c19d4ee0.8d77c",\r
         "type": "set",\r
         "name": "set vf-module-id",\r
         "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",\r
         "comments": "",\r
-        "x": 595.8451919555664,\r
-        "y": 1555.0393342971802,\r
-        "z": "34265cd.7205424",\r
+        "x": 558.8451766967773,\r
+        "y": 1652.039330482483,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6c341ffe.ffd948",\r
+        "id": "bd5d1959.e5b588",\r
         "type": "for",\r
         "name": "for each cloud-region relationship",\r
         "xml": "<for index='idx' start='0' end='`$aai.cloud-region.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 655.3609352111816,\r
-        "y": 1773.697979927063,\r
-        "z": "34265cd.7205424",\r
+        "x": 618.3609199523926,\r
+        "y": 1870.6979761123657,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c0518e57.620ee8"\r
+                "de08cd4.005073"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c0518e57.620ee8",\r
+        "id": "de08cd4.005073",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$aai.cloud-region.relationship-list.relationship[$idx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 903.039478302002,\r
-        "y": 1773.4479093551636,\r
-        "z": "34265cd.7205424",\r
+        "x": 866.0394630432129,\r
+        "y": 1870.4479055404663,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "541c6720.7cffe8"\r
+                "fd795205.2ddc38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "541c6720.7cffe8",\r
+        "id": "fd795205.2ddc38",\r
         "type": "outcome",\r
         "name": "complex",\r
         "xml": "<outcome value='complex'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1072.5037994384766,\r
-        "y": 1772.8407316207886,\r
-        "z": "34265cd.7205424",\r
+        "x": 1035.5037841796875,\r
+        "y": 1869.8407278060913,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "de4075f3.bc9ec"\r
+                "87c9d5a3.8ba4f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bfd35321.fbdcc",\r
+        "id": "893bbd1e.4638",\r
         "type": "execute",\r
         "name": "split related-link",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1412.5989570617676,\r
-        "y": 1727.2693071365356,\r
-        "z": "34265cd.7205424",\r
+        "x": 1375.5989418029785,\r
+        "y": 1824.2693033218384,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "de4075f3.bc9ec",\r
+        "id": "87c9d5a3.8ba4f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1232.2656593322754,\r
-        "y": 1773.936095237732,\r
-        "z": "34265cd.7205424",\r
+        "x": 1195.2656440734863,\r
+        "y": 1870.9360914230347,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "bfd35321.fbdcc",\r
-                "b03a09c0.4474b8",\r
-                "ee8323c4.89df98"\r
+                "893bbd1e.4638",\r
+                "6e705361.dc7ec4",\r
+                "6e9378a9.0367d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b03a09c0.4474b8",\r
+        "id": "6e705361.dc7ec4",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 1382.2656211853027,\r
-        "y": 1817.2693920135498,\r
-        "z": "34265cd.7205424",\r
+        "x": 1345.2656059265137,\r
+        "y": 1914.2693881988525,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d583179d.999f08",\r
+        "id": "ba0281e8.c6d89",\r
         "type": "execute",\r
         "name": "execute PropertiesNode",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 614.0476226806641,\r
-        "y": 212.04809951782227,\r
-        "z": "34265cd.7205424",\r
+        "x": 608.047607421875,\r
+        "y": 270.048095703125,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8aa4893.5435478",\r
+        "id": "1b32685d.a9d2f",\r
         "type": "set",\r
         "name": "set order-status to PendingCreate",\r
         "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",\r
         "comments": "",\r
-        "x": 540.5122909545898,\r
-        "y": 7382.904582977295,\r
-        "z": "34265cd.7205424",\r
+        "x": 503.5122756958008,\r
+        "y": 7479.904579162598,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40d2ead1.29e2d4",\r
+        "id": "5d0d3a4f.87fd84",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 484.01214599609375,\r
-        "y": 8147.951934337616,\r
-        "z": "34265cd.7205424",\r
+        "x": 447.0121307373047,\r
+        "y": 8244.951930522919,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eada7f38.32c088",\r
+        "id": "d0512da2.27542",\r
         "type": "set",\r
         "name": "copy input data",\r
         "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",\r
         "comments": "",\r
-        "x": 472.6192321777344,\r
-        "y": 7239.253315925598,\r
-        "z": "34265cd.7205424",\r
+        "x": 435.6192169189453,\r
+        "y": 7336.253312110901,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3326bf0a.c858a",\r
+        "id": "f7a15e8.e9d50a",\r
         "type": "set",\r
         "name": "copy vf-module-topology data",\r
         "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",\r
         "comments": "",\r
-        "x": 527.5002517700195,\r
-        "y": 7186.038250923157,\r
-        "z": "34265cd.7205424",\r
+        "x": 490.50023651123047,\r
+        "y": 7283.0382471084595,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f312e38d.47c19",\r
+        "id": "10740584.685552",\r
         "type": "save",\r
         "name": "update vf-module",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 557.8929710388184,\r
-        "y": 4393.039915680885,\r
-        "z": "34265cd.7205424",\r
+        "x": 520.8929557800293,\r
+        "y": 4490.039911866188,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "56183cf7.21f8bc",\r
-                "298fb653.de04f2"\r
+                "ebdaa7ec.bf551",\r
+                "1b4621ea.e2df9e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56183cf7.21f8bc",\r
+        "id": "ebdaa7ec.bf551",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 732.9646110534668,\r
-        "y": 4361.4205375909805,\r
-        "z": "34265cd.7205424",\r
+        "x": 695.9645957946777,\r
+        "y": 4458.420533776283,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "69c206e5.9c5be8"\r
+                "5962f380.97801c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "298fb653.de04f2",\r
+        "id": "1b4621ea.e2df9e",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 741.5359840393066,\r
-        "y": 4430.039627611637,\r
-        "z": "34265cd.7205424",\r
+        "x": 704.5359687805176,\r
+        "y": 4527.03962379694,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "ca232fc7.373f28"\r
+                "a583af75.4a7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "602e0129.20af78",\r
+        "id": "353f71d8.b849ee",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
         "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",\r
         "comments": "",\r
-        "x": 581.5597801208496,\r
-        "y": 4268.564144730568,\r
-        "z": "34265cd.7205424",\r
+        "x": 544.5597648620605,\r
+        "y": 4365.564140915871,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8b5e2bc.0d8cdd8",\r
+        "id": "a523e3d.fb4e3a",\r
         "type": "save",\r
         "name": "save vf-module relationships",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1351.5835266113281,\r
-        "y": 5951.192310094833,\r
-        "z": "34265cd.7205424",\r
+        "x": 1314.583511352539,\r
+        "y": 6048.192306280136,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "156220b0.97881f",\r
-                "a8f671db.55245"\r
+                "194c928.6ab7c6e",\r
+                "d8ed4d46.8d3988"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "156220b0.97881f",\r
+        "id": "194c928.6ab7c6e",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1571.4168701171875,\r
-        "y": 5922.064054250717,\r
-        "z": "34265cd.7205424",\r
+        "x": 1534.4168548583984,\r
+        "y": 6019.06405043602,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "d0730d21.778c9"\r
+                "8b294cea.9128d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8f671db.55245",\r
+        "id": "d8ed4d46.8d3988",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1579.9884033203125,\r
-        "y": 5974.683198690414,\r
-        "z": "34265cd.7205424",\r
+        "x": 1542.9883880615234,\r
+        "y": 6071.683194875717,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "e6565cbf.f37f88"\r
+                "3015a60e.8d9b02"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5f1094.89d7678",\r
+        "id": "8266f367.7a81d",\r
         "type": "for",\r
         "name": "for each vm-type",\r
         "xml": "<for silentFailure='true' index='vm-type-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 531.2502517700195,\r
-        "y": 5716.525862932205,\r
-        "z": "34265cd.7205424",\r
+        "x": 494.25023651123047,\r
+        "y": 5813.525859117508,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "900abd87.03036"\r
+                "ae746370.fbd12"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "71e9d608.74954",\r
+        "id": "721dd7e.3003728",\r
         "type": "for",\r
         "name": "for each vm-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 928.2502632141113,\r
-        "y": 6135.192695140839,\r
-        "z": "34265cd.7205424",\r
+        "x": 891.2502479553223,\r
+        "y": 6232.192691326141,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "474d2262.a76184"\r
+                "93d8dd9c.4ab7e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bdd166c5.9655d",\r
+        "id": "d570eb5d.f5786",\r
         "type": "for",\r
         "name": "for each vm-type",\r
         "xml": "<for silentFailure='true' index='vm-type-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 476.92879486083984,\r
-        "y": 7081.0718812942505,\r
-        "z": "34265cd.7205424",\r
+        "x": 439.9287796020508,\r
+        "y": 7178.071877479553,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "5099fa11.6e8244"\r
+                "84f3bff5.a80988"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5099fa11.6e8244",\r
+        "id": "84f3bff5.a80988",\r
         "type": "for",\r
         "name": "for each vm",\r
         "xml": "<for index='vm-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-count`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 671.928825378418,\r
-        "y": 7080.4048891067505,\r
-        "z": "34265cd.7205424",\r
+        "x": 634.9288101196289,\r
+        "y": 7177.404885292053,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "99b22585.2f4188"\r
+                "9db83f9.3bdd74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70d018d1.df953",\r
+        "id": "1b0dcc5f.b77854",\r
         "type": "save",\r
         "name": "save VIPR_CONFIGURATION",\r
         "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 )\" >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1092.3455200195312,\r
-        "y": 7105.5725764632225,\r
-        "z": "34265cd.7205424",\r
+        "x": 1055.3455047607422,\r
+        "y": 7202.572572648525,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "ee6a30b6.2fdb08"\r
+                "42a14d7b.afe65c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7b025d1.119928",\r
+        "id": "8c3d549d.3f55c",\r
         "type": "comment",\r
         "name": "Not a failure",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1612.3454208374023,\r
-        "y": 7105.572581231594,\r
-        "z": "34265cd.7205424",\r
+        "x": 1575.3454055786133,\r
+        "y": 7202.572577416897,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ee6a30b6.2fdb08",\r
+        "id": "42a14d7b.afe65c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1302.3455047607422,\r
-        "y": 7105.57272619009,\r
-        "z": "34265cd.7205424",\r
+        "x": 1265.3454895019531,\r
+        "y": 7202.572722375393,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f00a7c73.128e3"\r
+                "697d9822.ab8678"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f00a7c73.128e3",\r
+        "id": "697d9822.ab8678",\r
         "type": "record",\r
         "name": "record",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1445.6789474487305,\r
-        "y": 7105.572564065456,\r
-        "z": "34265cd.7205424",\r
+        "x": 1408.6789321899414,\r
+        "y": 7202.572560250759,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a9e98a28.a6413",\r
+        "id": "ebdc10bd.8a96c8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1475.679069519043,\r
-        "y": 7056.904277741909,\r
-        "z": "34265cd.7205424",\r
+        "x": 1438.679054260254,\r
+        "y": 7153.904273927212,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f18e18b8.f1a978"\r
+                "46ad510d.4ec508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0f9c912.bbfa7",\r
+        "id": "9141cc56.5e1638",\r
         "type": "comment",\r
         "name": "Not a failure",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1799.0121231079102,\r
-        "y": 7055.238099992275,\r
-        "z": "34265cd.7205424",\r
+        "x": 1762.012107849121,\r
+        "y": 7152.238096177578,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f18e18b8.f1a978",\r
+        "id": "46ad510d.4ec508",\r
         "type": "record",\r
         "name": "record",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1621.6790046691895,\r
-        "y": 7056.904910981655,\r
-        "z": "34265cd.7205424",\r
+        "x": 1584.6789894104004,\r
+        "y": 7153.904907166958,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "99b22585.2f4188",\r
+        "id": "9db83f9.3bdd74",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 840.2622184753418,\r
-        "y": 7079.404733657837,\r
-        "z": "34265cd.7205424",\r
+        "x": 803.2622032165527,\r
+        "y": 7176.40472984314,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "432a36c8.1b8a38",\r
-                "70d018d1.df953"\r
+                "48a8f335.b41d6c",\r
+                "1b0dcc5f.b77854"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "432a36c8.1b8a38",\r
+        "id": "48a8f335.b41d6c",\r
         "type": "delete",\r
         "name": "delete any pre-existing records in VIPR_CONFIGURATION",\r
         "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]' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1182.3455352783203,\r
-        "y": 7057.238910615444,\r
-        "z": "34265cd.7205424",\r
+        "x": 1145.3455200195312,\r
+        "y": 7154.238906800747,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "a9e98a28.a6413"\r
+                "ebdc10bd.8a96c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69c206e5.9c5be8",\r
+        "id": "5962f380.97801c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 891.2501792907715,\r
-        "y": 4361.191208481789,\r
-        "z": "34265cd.7205424",\r
+        "x": 854.2501640319824,\r
+        "y": 4458.191204667091,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "23db4204.137326",\r
-                "deea8b7a.34ee38"\r
+                "9929cc19.031428",\r
+                "387bacc5.df1d84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca232fc7.373f28",\r
+        "id": "a583af75.4a7c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 892.2500953674316,\r
-        "y": 4427.857498705387,\r
-        "z": "34265cd.7205424",\r
+        "x": 855.2500801086426,\r
+        "y": 4524.85749489069,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c333832f.3cfc3"\r
+                "da0980a4.747a78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0730d21.778c9",\r
+        "id": "8b294cea.9128d8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1739.9168739318848,\r
-        "y": 5921.858323812485,\r
-        "z": "34265cd.7205424",\r
+        "x": 1702.9168586730957,\r
+        "y": 6018.8583199977875,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c98dc3b.19af54",\r
-                "269063c8.ce5a84"\r
+                "bcecc401.bf37b",\r
+                "96fecd53.204d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e6565cbf.f37f88",\r
+        "id": "3015a60e.8d9b02",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1734.9168739318848,\r
-        "y": 5974.8581664562225,\r
-        "z": "34265cd.7205424",\r
+        "x": 1697.9168586730957,\r
+        "y": 6071.858162641525,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "21dc9b2.c9b4164",\r
-                "269063c8.ce5a84"\r
+                "8ce17d26.7481f8",\r
+                "96fecd53.204d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "857ef89e.1a5408",\r
+        "id": "d8e05d0.e811aa",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode - get preload-list",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1100.833351135254,\r
-        "y": 2498.691061973572,\r
-        "z": "34265cd.7205424",\r
+        "x": 1063.8333358764648,\r
+        "y": 2595.6910581588745,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "416fdbec.15ba44",\r
-                "73c4e919.9f625"\r
+                "d9ea3efe.a87e5",\r
+                "e2faee57.b7f5d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "416fdbec.15ba44",\r
+        "id": "d9ea3efe.a87e5",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1369.1665840148926,\r
-        "y": 2457.0243921279907,\r
-        "z": "34265cd.7205424",\r
+        "x": 1332.1665687561035,\r
+        "y": 2554.0243883132935,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "1f482e71.6f90f2"\r
+                "88e9c571.834c18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73c4e919.9f625",\r
+        "id": "e2faee57.b7f5d",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1367.4999389648438,\r
-        "y": 2532.024540901184,\r
-        "z": "34265cd.7205424",\r
+        "x": 1330.4999237060547,\r
+        "y": 2629.024537086487,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "2b585b07.776fbc"\r
+                "8820c3b4.3dae5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f482e71.6f90f2",\r
+        "id": "88e9c571.834c18",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1525.833339691162,\r
-        "y": 2455.3578300476074,\r
-        "z": "34265cd.7205424",\r
+        "x": 1488.833324432373,\r
+        "y": 2552.35782623291,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "875e55f0.b2f8e8"\r
+                "581ce945.29d908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b585b07.776fbc",\r
+        "id": "8820c3b4.3dae5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1522.4999465942383,\r
-        "y": 2532.0243825912476,\r
-        "z": "34265cd.7205424",\r
+        "x": 1485.4999313354492,\r
+        "y": 2629.0243787765503,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "8bed185c.8ac5d"\r
+                "4e9d9449.fc591c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "875e55f0.b2f8e8",\r
+        "id": "581ce945.29d908",\r
         "type": "switchNode",\r
         "name": "switch mdsal-preload.response-code",\r
         "xml": "<switch test='`$mdsal-preload.response-code`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1754.1666412353516,\r
-        "y": 2455.357871055603,\r
-        "z": "34265cd.7205424",\r
+        "x": 1717.1666259765625,\r
+        "y": 2552.3578672409058,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "d327b2a2.0c837",\r
-                "fd8f2e7a.c3fae"\r
+                "69e5b9e1.abe87",\r
+                "bafb2098.90126"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d327b2a2.0c837",\r
+        "id": "69e5b9e1.abe87",\r
         "type": "outcome",\r
         "name": "404 (not found)",\r
         "xml": "<outcome value='404'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2037.0833435058594,\r
-        "y": 2409.940915107727,\r
-        "z": "34265cd.7205424",\r
+        "x": 2000.0833282470703,\r
+        "y": 2506.94091129303,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "35aa0744.80b5c8"\r
+                "aeaac31c.b0a03"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "35aa0744.80b5c8",\r
+        "id": "aeaac31c.b0a03",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign-no-preload",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-no-preload' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2439.99991607666,\r
-        "y": 2323.274383544922,\r
-        "z": "34265cd.7205424",\r
+        "x": 2402.999900817871,\r
+        "y": 2420.2743797302246,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "123078c4.5f42b7"\r
+                "f7ff06c4.ed826"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "123078c4.5f42b7",\r
+        "id": "f7ff06c4.ed826",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2828.7498779296875,\r
-        "y": 2324.1082620620728,\r
-        "z": "34265cd.7205424",\r
+        "x": 2791.7498626708984,\r
+        "y": 2421.1082582473755,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b201b2ed.f32f68"\r
+                "8d60dce.3fe77a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd8f2e7a.c3fae",\r
+        "id": "bafb2098.90126",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2003.3333053588867,\r
-        "y": 2474.107699394226,\r
-        "z": "34265cd.7205424",\r
+        "x": 1966.3332901000977,\r
+        "y": 2571.107695579529,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "886e3c52.8c2238"\r
+                "59ff4e4b.8c6b68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8bed185c.8ac5d",\r
+        "id": "4e9d9449.fc591c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign-preload",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-preload' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1885.833236694336,\r
-        "y": 2533.6911306381226,\r
-        "z": "34265cd.7205424",\r
+        "x": 1848.8332214355469,\r
+        "y": 2630.6911268234253,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "470a9210.0d2c7c"\r
+                "e07b96b8.ec3848"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "470a9210.0d2c7c",\r
+        "id": "e07b96b8.ec3848",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2241.500099182129,\r
-        "y": 2532.024748802185,\r
-        "z": "34265cd.7205424",\r
+        "x": 2204.50008392334,\r
+        "y": 2629.024744987488,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "9af3e55f.6087e"\r
+                "fddcb313.1cf958"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "900abd87.03036",\r
+        "id": "ae746370.fbd12",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 721.7503204345703,\r
-        "y": 5717.3590977191925,\r
-        "z": "34265cd.7205424",\r
+        "x": 684.7503051757812,\r
+        "y": 5814.359093904495,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "71e9d608.74954",\r
-                "61dc9df3.118e34"\r
+                "721dd7e.3003728",\r
+                "b19496cb.88b488"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61dc9df3.118e34",\r
+        "id": "b19496cb.88b488",\r
         "type": "for",\r
         "name": "for each vnfc",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 972.7503700256348,\r
-        "y": 4922.025188922882,\r
-        "z": "34265cd.7205424",\r
+        "x": 935.7503547668457,\r
+        "y": 5019.025185108185,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "933d597e.bd69e8"\r
+                "1e32842a.58b264"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c87af5c.2b49f88",\r
+        "id": "486da9cb.5e0db",\r
         "type": "save",\r
         "name": "save vnfc to A&AI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1698.7504386901855,\r
-        "y": 4730.359119415283,\r
-        "z": "34265cd.7205424",\r
+        "x": 1661.7504234313965,\r
+        "y": 4827.359115600586,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "d4c69512.b7a85",\r
-                "cb5ae333.4bb6c"\r
+                "ed23263a.02e4b",\r
+                "fd219437.f0a108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "933d597e.bd69e8",\r
+        "id": "1e32842a.58b264",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1141.0836715698242,\r
-        "y": 4922.692016124725,\r
-        "z": "34265cd.7205424",\r
+        "x": 1104.0836563110352,\r
+        "y": 5019.692012310028,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "90bbdc02.a17328",\r
-                "4f542d3d.52a65c",\r
-                "9ee6416c.5e5dc8",\r
-                "67190c0.7b4b2f4",\r
-                "2591369f.6e45f2",\r
-                "f5615f88.05ae28"\r
+                "c0e750b5.9c30a",\r
+                "92ab8c55.74cf88",\r
+                "1b5a92a6.166fdd",\r
+                "73fcbf14.3fdec",\r
+                "94b5136b.b8b098",\r
+                "c3cf109b.3ee48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4c69512.b7a85",\r
+        "id": "ed23263a.02e4b",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1889.7504768371582,\r
-        "y": 4682.692453384399,\r
-        "z": "34265cd.7205424",\r
+        "x": 1852.7504615783691,\r
+        "y": 4779.692449569702,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "fcab33e3.661e5"\r
+                "62a1d2ce.f5805c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fcab33e3.661e5",\r
+        "id": "62a1d2ce.f5805c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2054.917163848877,\r
-        "y": 4696.820286691189,\r
-        "z": "34265cd.7205424",\r
+        "x": 2017.917148590088,\r
+        "y": 4793.820282876492,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "64b6a50b.0e40cc",\r
-                "deea8b7a.34ee38"\r
+                "ce58c07c.b817d",\r
+                "387bacc5.df1d84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ee6416c.5e5dc8",\r
+        "id": "1b5a92a6.166fdd",\r
         "type": "save",\r
         "name": "save vnfc relationships",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1365.654956817627,\r
-        "y": 4830.97835111618,\r
-        "z": "34265cd.7205424",\r
+        "x": 1328.654941558838,\r
+        "y": 4927.978347301483,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "4aa5e996.c15df8",\r
-                "627ad9e4.060cf"\r
+                "55b62c68.acde94",\r
+                "e4bd7450.018bf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b05f84b7.ac3f68",\r
+        "id": "21cae6a7.1f1552",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1697.4881477355957,\r
-        "y": 4804.2959752082825,\r
-        "z": "34265cd.7205424",\r
+        "x": 1660.4881324768066,\r
+        "y": 4901.295971393585,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "ecec95d0.f03d18",\r
-                "deea8b7a.34ee38"\r
+                "8a14b675.cd4478",\r
+                "387bacc5.df1d84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d68d461e.5265a",\r
+        "id": "32299384.140b94",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1697.488224029541,\r
-        "y": 4857.29573392868,\r
-        "z": "34265cd.7205424",\r
+        "x": 1660.488208770752,\r
+        "y": 4954.295730113983,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "4b5a4f9a.72aaf8",\r
-                "deea8b7a.34ee38"\r
+                "b8157190.3209b8",\r
+                "387bacc5.df1d84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4aa5e996.c15df8",\r
+        "id": "55b62c68.acde94",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1540.6550331115723,\r
-        "y": 4804.311645030975,\r
-        "z": "34265cd.7205424",\r
+        "x": 1503.6550178527832,\r
+        "y": 4901.311641216278,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b05f84b7.ac3f68"\r
+                "21cae6a7.1f1552"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "627ad9e4.060cf",\r
+        "id": "e4bd7450.018bf",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1549.2265663146973,\r
-        "y": 4856.930789470673,\r
-        "z": "34265cd.7205424",\r
+        "x": 1512.2265510559082,\r
+        "y": 4953.930785655975,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "d68d461e.5265a"\r
+                "32299384.140b94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90bbdc02.a17328",\r
+        "id": "c0e750b5.9c30a",\r
         "type": "for",\r
         "name": "for each vnfc-network-role",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1363.1310768127441,\r
-        "y": 5247.834759235382,\r
-        "z": "34265cd.7205424",\r
+        "x": 1326.131061553955,\r
+        "y": 5344.834755420685,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "58cb90bc.4bbef8"\r
+                "47726d30.d34cb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "205882d9.0b5ba6",\r
+        "id": "33a320c6.b50498",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vfmoduleb.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 583.7499809265137,\r
-        "y": 2555.7385811805725,\r
-        "z": "34265cd.7205424",\r
+        "x": 546.7499656677246,\r
+        "y": 2652.7385773658752,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8cfa77fd.d126b8",\r
+        "id": "bb7020bf.917f88",\r
         "type": "for",\r
         "name": "for each vnfc-subnetwork-role",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1819.0836143493652,\r
-        "y": 5211.025192737579,\r
-        "z": "34265cd.7205424",\r
+        "x": 1782.0835990905762,\r
+        "y": 5308.025188922882,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "6762299c.778d8"\r
+                "a92688a9.e4a6b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6762299c.778d8",\r
+        "id": "a92688a9.e4a6b",\r
         "type": "for",\r
         "name": "for each vnfc-address-family",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2086.4169578552246,\r
-        "y": 5210.025681018829,\r
-        "z": "34265cd.7205424",\r
+        "x": 2049.4169425964355,\r
+        "y": 5307.025677204132,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "7d53a97d.be26"\r
+                "ec22b21e.0a4ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d1f18ef1.182398",\r
+        "id": "4ed6e311.93f5fc",\r
         "type": "for",\r
         "name": "for each vnfc-ip-address",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2518.4165687561035,\r
-        "y": 5276.6913805007935,\r
-        "z": "34265cd.7205424",\r
+        "x": 2481.4165534973145,\r
+        "y": 5373.691376686096,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "77214afc.517d0c"\r
+                "303dd138.323a4e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d53a97d.be26",\r
+        "id": "ec22b21e.0a4ac",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2297.4167289733887,\r
-        "y": 5210.025137424469,\r
-        "z": "34265cd.7205424",\r
+        "x": 2260.4167137145996,\r
+        "y": 5307.025133609772,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "34424215.2a711e",\r
-                "d1f18ef1.182398"\r
+                "15a125a7.f8a182",\r
+                "4ed6e311.93f5fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "34424215.2a711e",\r
+        "id": "15a125a7.f8a182",\r
         "type": "set",\r
         "name": "set tmp.address-family",\r
         "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",\r
         "comments": "",\r
-        "x": 2517.4170570373535,\r
-        "y": 5130.02503490448,\r
-        "z": "34265cd.7205424",\r
+        "x": 2480.4170417785645,\r
+        "y": 5227.025031089783,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "77214afc.517d0c",\r
+        "id": "303dd138.323a4e",\r
         "type": "switchNode",\r
         "name": "switch address family",\r
         "xml": "<switch test='`$tmp.address-family`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2757.416660308838,\r
-        "y": 5275.02520275116,\r
-        "z": "34265cd.7205424",\r
+        "x": 2720.416645050049,\r
+        "y": 5372.025198936462,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "466ce5a0.fa2a7c",\r
-                "e5989ca0.8172d"\r
+                "e6ae0d09.a09cf",\r
+                "4f6d9652.0c3078"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "466ce5a0.fa2a7c",\r
+        "id": "e6ae0d09.a09cf",\r
         "type": "outcome",\r
         "name": "ipv4",\r
         "xml": "<outcome value='ipv4'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2954.5596656799316,\r
-        "y": 5178.59646320343,\r
-        "z": "34265cd.7205424",\r
+        "x": 2917.5596504211426,\r
+        "y": 5275.596459388733,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "16109ed1.313bd1"\r
+                "602361cc.c4df38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5989ca0.8172d",\r
+        "id": "4f6d9652.0c3078",\r
         "type": "outcome",\r
         "name": "ipv6",\r
         "xml": "<outcome value='ipv6'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2952.178737640381,\r
-        "y": 5358.358494758606,\r
-        "z": "34265cd.7205424",\r
+        "x": 2915.178722381592,\r
+        "y": 5455.358490943909,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "9a0c5b84.5a57f"\r
+                "1a69583f.183678"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf096cd1.ca06e8",\r
+        "id": "e702daf4.edb6a8",\r
         "type": "comment",\r
         "name": "Fixed IPs",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1836.0836296081543,\r
-        "y": 5172.692569732666,\r
-        "z": "34265cd.7205424",\r
+        "x": 1799.0836143493652,\r
+        "y": 5269.692565917969,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ba22ae12.2926b",\r
+        "id": "c09d2003.b8f32",\r
         "type": "save",\r
         "name": "save l3-interface-ipv4-address-list object to A&AI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3397.892795562744,\r
-        "y": 5126.929543177288,\r
-        "z": "34265cd.7205424",\r
+        "x": 3360.892780303955,\r
+        "y": 5223.929539362591,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "a96cb36a.8783d8"\r
+                "1c4f2098.c55b27"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "16109ed1.313bd1",\r
+        "id": "602361cc.c4df38",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3104.5596656799316,\r
-        "y": 5178.596381823223,\r
-        "z": "34265cd.7205424",\r
+        "x": 3067.5596504211426,\r
+        "y": 5275.596378008526,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "ba22ae12.2926b",\r
-                "c1872588.7583"\r
+                "c09d2003.b8f32",\r
+                "3d116e3f.dedbd2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2901367b.3a7652",\r
+        "id": "a1a5338b.dea9",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3811.3926696777344,\r
-        "y": 5126.914035479229,\r
-        "z": "34265cd.7205424",\r
+        "x": 3774.3926544189453,\r
+        "y": 5223.914031664532,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "a7be1c39.6ee63",\r
-                "b8d50b6.e90cc78"\r
+                "c5ce8f8a.5c8cc",\r
+                "4f9c607a.ce1c88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a96cb36a.8783d8",\r
+        "id": "1c4f2098.c55b27",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3654.559555053711,\r
-        "y": 5126.929705301922,\r
-        "z": "34265cd.7205424",\r
+        "x": 3617.559539794922,\r
+        "y": 5223.9297014872245,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "2901367b.3a7652"\r
+                "a1a5338b.dea9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1872588.7583",\r
+        "id": "3d116e3f.dedbd2",\r
         "type": "save",\r
         "name": "save l3-interface-ipv4-address-list relationships",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3392.893039703369,\r
-        "y": 5225.262962023418,\r
-        "z": "34265cd.7205424",\r
+        "x": 3355.89302444458,\r
+        "y": 5322.262958208721,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c76a4fda.833a4",\r
-                "53b8f95f.e81ec"\r
+                "b2f60d32.750248",\r
+                "9412527d.7ae5b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64905913.ec2ab",\r
+        "id": "562e333b.9aa834",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3813.0592918395996,\r
-        "y": 5196.914006868999,\r
-        "z": "34265cd.7205424",\r
+        "x": 3776.0592765808105,\r
+        "y": 5293.914003054302,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "a4494b11.30c988",\r
-                "b8d50b6.e90cc78"\r
+                "d6d217c2.575b08",\r
+                "4f9c607a.ce1c88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea0b0cf4.b0b87",\r
+        "id": "385833b4.f6a1f4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3813.059368133545,\r
-        "y": 5249.913765589397,\r
-        "z": "34265cd.7205424",\r
+        "x": 3776.059352874756,\r
+        "y": 5346.9137617747,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "3b6a1bff.11e25c",\r
-                "b8d50b6.e90cc78"\r
+                "eacb1b8b.899fc",\r
+                "4f9c607a.ce1c88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c76a4fda.833a4",\r
+        "id": "b2f60d32.750248",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3656.226177215576,\r
-        "y": 5196.929676691692,\r
-        "z": "34265cd.7205424",\r
+        "x": 3619.226161956787,\r
+        "y": 5293.929672876995,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "64905913.ec2ab"\r
+                "562e333b.9aa834"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "53b8f95f.e81ec",\r
+        "id": "9412527d.7ae5b8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3664.797710418701,\r
-        "y": 5249.54882113139,\r
-        "z": "34265cd.7205424",\r
+        "x": 3627.797695159912,\r
+        "y": 5346.548817316692,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "ea0b0cf4.b0b87"\r
+                "385833b4.f6a1f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f65e4dc.17ee84",\r
+        "id": "fb1894e6.eb936",\r
         "type": "save",\r
         "name": "save l3-interface-ipv6-address-list object to A&AI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3396.702533721924,\r
-        "y": 5305.977599143982,\r
-        "z": "34265cd.7205424",\r
+        "x": 3359.7025184631348,\r
+        "y": 5402.977595329285,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c7c91c2b.8530c8"\r
+                "bb93e24f.0ddfa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a0c5b84.5a57f",\r
+        "id": "1a69583f.183678",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3103.3694038391113,\r
-        "y": 5357.644437789917,\r
-        "z": "34265cd.7205424",\r
+        "x": 3066.3693885803223,\r
+        "y": 5454.64443397522,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "5f65e4dc.17ee84",\r
-                "6821e286.f06a64"\r
+                "fb1894e6.eb936",\r
+                "ff950167.1fb1e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20bc2782.743bc",\r
+        "id": "af4f59e8.34e16",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3810.202407836914,\r
-        "y": 5305.962091445923,\r
-        "z": "34265cd.7205424",\r
+        "x": 3773.202392578125,\r
+        "y": 5402.962087631226,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "1d21480c.1addf8",\r
-                "b8d50b6.e90cc78"\r
+                "e1c04fe9.9abb6",\r
+                "4f9c607a.ce1c88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7c91c2b.8530c8",\r
+        "id": "bb93e24f.0ddfa",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3653.3692932128906,\r
-        "y": 5305.977761268616,\r
-        "z": "34265cd.7205424",\r
+        "x": 3616.3692779541016,\r
+        "y": 5402.9777574539185,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "20bc2782.743bc"\r
+                "af4f59e8.34e16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6821e286.f06a64",\r
+        "id": "ff950167.1fb1e",\r
         "type": "save",\r
         "name": "save l3-interface-ipv6-address-list relationships",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3391.702777862549,\r
-        "y": 5404.311017990112,\r
-        "z": "34265cd.7205424",\r
+        "x": 3354.7027626037598,\r
+        "y": 5501.311014175415,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "8cd900c5.0fd1d",\r
-                "7505a4c8.0ea53c"\r
+                "92d98e03.b2aa9",\r
+                "2492559a.c4998a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b7b6484f.d8c77",\r
+        "id": "1c4e1681.7e4871",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3811.8690299987793,\r
-        "y": 5375.962062835693,\r
-        "z": "34265cd.7205424",\r
+        "x": 3774.8690147399902,\r
+        "y": 5472.962059020996,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "e3d10ed9.82b7b8",\r
-                "b8d50b6.e90cc78"\r
+                "b00c290a.190b9",\r
+                "4f9c607a.ce1c88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "79bf1748.e06bb8",\r
+        "id": "71aef803.40248",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3811.8691062927246,\r
-        "y": 5428.961821556091,\r
-        "z": "34265cd.7205424",\r
+        "x": 3774.8690910339355,\r
+        "y": 5525.961817741394,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "fedf80c9.88e5f",\r
-                "b8d50b6.e90cc78"\r
+                "f9dafb05.46c9b",\r
+                "4f9c607a.ce1c88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8cd900c5.0fd1d",\r
+        "id": "92d98e03.b2aa9",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3655.035915374756,\r
-        "y": 5375.977732658386,\r
-        "z": "34265cd.7205424",\r
+        "x": 3618.035900115967,\r
+        "y": 5472.977728843689,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b7b6484f.d8c77"\r
+                "1c4e1681.7e4871"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7505a4c8.0ea53c",\r
+        "id": "2492559a.c4998a",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3663.607448577881,\r
-        "y": 5428.5968770980835,\r
-        "z": "34265cd.7205424",\r
+        "x": 3626.607433319092,\r
+        "y": 5525.596873283386,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "79bf1748.e06bb8"\r
+                "71aef803.40248"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "474d2262.a76184",\r
+        "id": "93d8dd9c.4ab7e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1118.083583831787,\r
-        "y": 6134.692134380341,\r
-        "z": "34265cd.7205424",\r
+        "x": 1081.083568572998,\r
+        "y": 6231.692130565643,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b6a8d268.c987",\r
-                "8b5e2bc.0d8cdd8",\r
-                "81d51660.a0c9e8",\r
-                "a9042f25.4b114"\r
+                "c8fd9787.8452c",\r
+                "a523e3d.fb4e3a",\r
+                "bcda90cb.440fb8",\r
+                "d730be4.76af4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ff1efff.4270b8",\r
+        "id": "3fcdc941.269b36",\r
         "type": "for",\r
         "name": "for each vnfc",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1766.0837593078613,\r
-        "y": 6257.02588224411,\r
-        "z": "34265cd.7205424",\r
+        "x": 1729.0837440490723,\r
+        "y": 6354.025878429413,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f2b022e3.1f756"\r
+                "ddc96fa8.7a60c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3153e0c.d09088",\r
+        "id": "5ebcb9e7.4aa54",\r
         "type": "save",\r
         "name": "save vip-ipv4-address-list object to A&AI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1849.0836143493652,\r
-        "y": 6088.358893871307,\r
-        "z": "34265cd.7205424",\r
+        "x": 1812.0835990905762,\r
+        "y": 6185.35889005661,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "6c580401.058424",\r
-                "381a766c.6ae85a"\r
+                "573bd3c5.98aba4",\r
+                "1bbdfbf6.b3d06c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81d51660.a0c9e8",\r
+        "id": "bcda90cb.440fb8",\r
         "type": "for",\r
         "name": "for each floating ipv4 address",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1357.0836067199707,\r
-        "y": 6146.358966350555,\r
-        "z": "34265cd.7205424",\r
+        "x": 1320.0835914611816,\r
+        "y": 6243.358962535858,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "a116ff51.f71318"\r
+                "63669aaf.74e08c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a116ff51.f71318",\r
+        "id": "63669aaf.74e08c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1583.0836067199707,\r
-        "y": 6144.358966350555,\r
-        "z": "34265cd.7205424",\r
+        "x": 1546.0835914611816,\r
+        "y": 6241.358962535858,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "e3153e0c.d09088",\r
-                "caa9e69f.d253a",\r
-                "5ff1efff.4270b8"\r
+                "5ebcb9e7.4aa54",\r
+                "8d460902.156",\r
+                "3fcdc941.269b36"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af60e3c3.bb56a",\r
+        "id": "8f0f7206.35cad8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2244.583484649658,\r
-        "y": 6058.343266963959,\r
-        "z": "34265cd.7205424",\r
+        "x": 2207.583469390869,\r
+        "y": 6155.3432631492615,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f4049c01.0aeaf",\r
-                "269063c8.ce5a84"\r
+                "ac68386.d27d148",\r
+                "96fecd53.204d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26f5dd9.f21b7a2",\r
+        "id": "f32c832d.fb25c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2244.5835609436035,\r
-        "y": 6111.343025684357,\r
-        "z": "34265cd.7205424",\r
+        "x": 2207.5835456848145,\r
+        "y": 6208.343021869659,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "5573d94b.dc5",\r
-                "269063c8.ce5a84"\r
+                "5c926ac4.441d54",\r
+                "96fecd53.204d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c580401.058424",\r
+        "id": "573bd3c5.98aba4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2087.7503700256348,\r
-        "y": 6058.358936786652,\r
-        "z": "34265cd.7205424",\r
+        "x": 2050.7503547668457,\r
+        "y": 6155.358932971954,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "af60e3c3.bb56a"\r
+                "8f0f7206.35cad8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "381a766c.6ae85a",\r
+        "id": "1bbdfbf6.b3d06c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2096.3219032287598,\r
-        "y": 6110.978081226349,\r
-        "z": "34265cd.7205424",\r
+        "x": 2059.3218879699707,\r
+        "y": 6207.978077411652,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "26f5dd9.f21b7a2"\r
+                "f32c832d.fb25c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd3cd499.458be8",\r
+        "id": "26b909fe.b46aae",\r
         "type": "save",\r
         "name": "save vip-ipv4-address-list relationships",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2184.7502098083496,\r
-        "y": 6201.025557041168,\r
-        "z": "34265cd.7205424",\r
+        "x": 2147.7501945495605,\r
+        "y": 6298.025553226471,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "a45ccf9a.b8373",\r
-                "85e3b005.bd6568"\r
+                "369543b.0355ebc",\r
+                "d5fdb460.0834c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c68b77d.81077",\r
+        "id": "fd955046.bf6118",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2587.916488647461,\r
-        "y": 6173.009899675846,\r
-        "z": "34265cd.7205424",\r
+        "x": 2550.916473388672,\r
+        "y": 6270.009895861149,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c60c031b.634f38",\r
-                "269063c8.ce5a84"\r
+                "1eb209e1.85fe36",\r
+                "96fecd53.204d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40a56b3d.e7bfb4",\r
+        "id": "d7cc0097.28a2d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2587.9165649414062,\r
-        "y": 6226.009658396244,\r
-        "z": "34265cd.7205424",\r
+        "x": 2550.916549682617,\r
+        "y": 6323.009654581547,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "bdc62da9.93398",\r
-                "269063c8.ce5a84"\r
+                "703340a7.64aea8",\r
+                "96fecd53.204d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a45ccf9a.b8373",\r
+        "id": "369543b.0355ebc",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2431.0833740234375,\r
-        "y": 6173.025569498539,\r
-        "z": "34265cd.7205424",\r
+        "x": 2394.0833587646484,\r
+        "y": 6270.025565683842,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "5c68b77d.81077"\r
+                "fd955046.bf6118"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "85e3b005.bd6568",\r
+        "id": "d5fdb460.0834c8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2439.6549072265625,\r
-        "y": 6225.644713938236,\r
-        "z": "34265cd.7205424",\r
+        "x": 2402.6548919677734,\r
+        "y": 6322.644710123539,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "40a56b3d.e7bfb4"\r
+                "d7cc0097.28a2d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12a683dc.f7d1cc",\r
+        "id": "b35a3553.69f82",\r
         "type": "save",\r
         "name": "save vip-ipv6-address-list object to A&AI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1852.4169425964355,\r
-        "y": 6411.69157743454,\r
-        "z": "34265cd.7205424",\r
+        "x": 1815.4169273376465,\r
+        "y": 6508.6915736198425,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f3231ce.0a38d6",\r
-                "5e4e24ef.38b0bc"\r
+                "36e92cf1.e11e04",\r
+                "8cc2b975.04ae18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a9042f25.4b114",\r
+        "id": "d730be4.76af4c",\r
         "type": "for",\r
         "name": "for each floating ipv6 address",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1360.416934967041,\r
-        "y": 6468.691649913788,\r
-        "z": "34265cd.7205424",\r
+        "x": 1323.416919708252,\r
+        "y": 6565.691646099091,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "669eaafe.ae3adc"\r
+                "d0c28ec3.c731b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "669eaafe.ae3adc",\r
+        "id": "d0c28ec3.c731b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1586.416934967041,\r
-        "y": 6467.691649913788,\r
-        "z": "34265cd.7205424",\r
+        "x": 1549.416919708252,\r
+        "y": 6564.691646099091,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "12a683dc.f7d1cc",\r
-                "475a576d.8e3c28",\r
-                "81320c04.9ba968"\r
+                "b35a3553.69f82",\r
+                "b0707c4.6ea4d",\r
+                "7d5e2a4c.059314"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b2655ee.d0e88a",\r
+        "id": "719917b1.86ce1",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2247.9168128967285,\r
-        "y": 6381.675950527191,\r
-        "z": "34265cd.7205424",\r
+        "x": 2210.9167976379395,\r
+        "y": 6478.675946712494,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "37375282.76ddb6",\r
-                "269063c8.ce5a84"\r
+                "67c04d7.9f55234",\r
+                "96fecd53.204d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4588595a.f76a3",\r
+        "id": "805fb62e.923ed",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2247.916889190674,\r
-        "y": 6434.675709247589,\r
-        "z": "34265cd.7205424",\r
+        "x": 2210.9168739318848,\r
+        "y": 6531.675705432892,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "48c2cba4.91f6cc",\r
-                "269063c8.ce5a84"\r
+                "3bd1f48b.4c0b2c",\r
+                "96fecd53.204d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3231ce.0a38d6",\r
+        "id": "36e92cf1.e11e04",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2091.083698272705,\r
-        "y": 6381.691620349884,\r
-        "z": "34265cd.7205424",\r
+        "x": 2054.083683013916,\r
+        "y": 6478.691616535187,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "2b2655ee.d0e88a"\r
+                "719917b1.86ce1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e4e24ef.38b0bc",\r
+        "id": "8cc2b975.04ae18",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2099.65523147583,\r
-        "y": 6434.310764789581,\r
-        "z": "34265cd.7205424",\r
+        "x": 2062.655216217041,\r
+        "y": 6531.310760974884,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "4588595a.f76a3"\r
+                "805fb62e.923ed"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c2d6569.a1c6a2",\r
+        "id": "dca0d1ee.17c198",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2581.250068664551,\r
-        "y": 6494.676001131535,\r
-        "z": "34265cd.7205424",\r
+        "x": 2544.2500534057617,\r
+        "y": 6591.675997316837,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "4a19d7b6.f2c47",\r
-                "269063c8.ce5a84"\r
+                "7345e678.7bf88",\r
+                "96fecd53.204d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ee8cc5c.76ddbc",\r
+        "id": "99fb4bfb.6119d8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2581.250144958496,\r
-        "y": 6547.6757598519325,\r
-        "z": "34265cd.7205424",\r
+        "x": 2544.250129699707,\r
+        "y": 6644.675756037235,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "84c51507.94d668",\r
-                "269063c8.ce5a84"\r
+                "131ea97.a877f57",\r
+                "96fecd53.204d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de9afd93.7c394",\r
+        "id": "b4c59645.4d87f8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2424.4169540405273,\r
-        "y": 6494.691670954227,\r
-        "z": "34265cd.7205424",\r
+        "x": 2387.4169387817383,\r
+        "y": 6591.69166713953,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "2c2d6569.a1c6a2"\r
+                "dca0d1ee.17c198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e9292b7.adab1c",\r
+        "id": "19a0a042.9844b8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2432.9884872436523,\r
-        "y": 6547.310815393925,\r
-        "z": "34265cd.7205424",\r
+        "x": 2395.9884719848633,\r
+        "y": 6644.310811579227,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "3ee8cc5c.76ddbc"\r
+                "99fb4bfb.6119d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "636270ad.cb1f1",\r
+        "id": "8bf7fa79.126fb",\r
         "type": "save",\r
         "name": "save vip-ipv6-address-list relationships",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2180.083797454834,\r
-        "y": 6523.358089923859,\r
-        "z": "34265cd.7205424",\r
+        "x": 2143.083782196045,\r
+        "y": 6620.358086109161,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "de9afd93.7c394",\r
-                "6e9292b7.adab1c"\r
+                "b4c59645.4d87f8",\r
+                "19a0a042.9844b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f542d3d.52a65c",\r
+        "id": "92ab8c55.74cf88",\r
         "type": "set",\r
         "name": "set created_flag",\r
         "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",\r
         "comments": "",\r
-        "x": 1342.7502403259277,\r
-        "y": 4770.691873967648,\r
-        "z": "34265cd.7205424",\r
+        "x": 1305.7502250671387,\r
+        "y": 4867.69187015295,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b6a8d268.c987",\r
+        "id": "c8fd9787.8452c",\r
         "type": "set",\r
         "name": "set created-flag",\r
         "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",\r
         "comments": "",\r
-        "x": 1313.4169960021973,\r
-        "y": 6018.692055404186,\r
-        "z": "34265cd.7205424",\r
+        "x": 1276.4169807434082,\r
+        "y": 6115.692051589489,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "caa9e69f.d253a",\r
+        "id": "8d460902.156",\r
         "type": "set",\r
         "name": "set created-ipv4-flag",\r
         "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",\r
         "comments": "",\r
-        "x": 1786.4169616699219,\r
-        "y": 6146.69213527441,\r
-        "z": "34265cd.7205424",\r
+        "x": 1749.4169464111328,\r
+        "y": 6243.692131459713,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "475a576d.8e3c28",\r
+        "id": "b0707c4.6ea4d",\r
         "type": "set",\r
         "name": "set created-ipv6-flag",\r
         "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",\r
         "comments": "",\r
-        "x": 1791.7502975463867,\r
-        "y": 6472.691738545895,\r
-        "z": "34265cd.7205424",\r
+        "x": 1754.7502822875977,\r
+        "y": 6569.691734731197,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cb5ae333.4bb6c",\r
+        "id": "fd219437.f0a108",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1892.750415802002,\r
-        "y": 4730.692112863064,\r
-        "z": "34265cd.7205424",\r
+        "x": 1855.750400543213,\r
+        "y": 4827.692109048367,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "fcab33e3.661e5"\r
+                "62a1d2ce.f5805c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9f0935c.0d26e",\r
+        "id": "13308bfd.0f2aec",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-vlan-tagging-assign",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-vlan-tagging-assign' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 660.1668167114258,\r
-        "y": 6805.692090034485,\r
-        "z": "34265cd.7205424",\r
+        "x": 623.1668014526367,\r
+        "y": 6902.692086219788,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "bc1360c6.580c08"\r
+                "b2c99321.07804"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc1360c6.580c08",\r
+        "id": "b2c99321.07804",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1004.5002326965332,\r
-        "y": 6805.025585174561,\r
-        "z": "34265cd.7205424",\r
+        "x": 967.5002174377441,\r
+        "y": 6902.025581359863,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "a09eae64.f34c68"\r
+                "9faf9bf7.4ac728"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a09eae64.f34c68",\r
+        "id": "9faf9bf7.4ac728",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1159.5001068115234,\r
-        "y": 6805.025381088257,\r
-        "z": "34265cd.7205424",\r
+        "x": 1122.5000915527344,\r
+        "y": 6902.02537727356,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "3f7dfdbe.c1b85a",\r
-                "1a40ddac.06f67a"\r
+                "9d5c7913.8b1318",\r
+                "7d6098e9.a14988"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f7dfdbe.c1b85a",\r
+        "id": "9d5c7913.8b1318",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vlantaggingfailure.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1340.273723602295,\r
-        "y": 6777.763387203217,\r
-        "z": "34265cd.7205424",\r
+        "x": 1303.2737083435059,\r
+        "y": 6874.763383388519,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "effbab1c.8eeb18",\r
+        "id": "f8ca447b.c9d998",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 314.64286041259766,\r
-        "y": 556.5714378356934,\r
-        "z": "34265cd.7205424",\r
+        "x": 277.6428451538086,\r
+        "y": 653.5714340209961,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "d583179d.999f08",\r
-                "13d1edde.2c3cc2",\r
-                "356786ed.1c1db2",\r
-                "527b3c86.073724",\r
-                "f269ddb2.03ac18",\r
-                "aca51e3b.78a188",\r
-                "a6f8df46.880ce8",\r
-                "d918a5d3.4b678",\r
-                "7933c6b5.bef96",\r
-                "b13baffe.18c468"\r
+                "ba0281e8.c6d89",\r
+                "16a1cdd5.b488f2",\r
+                "d8c6245c.30876",\r
+                "3ad4001f.cd4388",\r
+                "9f361c75.f7c698",\r
+                "b1d0605e.841ca",\r
+                "32e92ddc.ae5c1a",\r
+                "bb29ba7b.f486c",\r
+                "ac910a9d.5490c8",\r
+                "bf8d316e.62c2d",\r
+                "54659cd5.5a9534"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4b60897.e18598",\r
+        "id": "f0a7970e.17889",\r
         "type": "switchNode",\r
         "name": "switch from-preload",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 605.6547050476074,\r
-        "y": 2622.1672010421753,\r
-        "z": "34265cd.7205424",\r
+        "x": 568.6546897888184,\r
+        "y": 2719.167197227478,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "7205c7e2.e07a68",\r
-                "338ca0a7.bfe7d8"\r
+                "375d9d1a.2a0dca",\r
+                "ce7a0e15.45e6b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7205c7e2.e07a68",\r
+        "id": "375d9d1a.2a0dca",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 777.5594367980957,\r
-        "y": 2599.5482215881348,\r
-        "z": "34265cd.7205424",\r
+        "x": 740.5594215393066,\r
+        "y": 2696.5482177734375,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "cee08d41.b2fe6"\r
+                "2c31b540.c0b982"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "338ca0a7.bfe7d8",\r
+        "id": "ce7a0e15.45e6b8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 779.2260894775391,\r
-        "y": 2644.5480604171753,\r
-        "z": "34265cd.7205424",\r
+        "x": 742.22607421875,\r
+        "y": 2741.548056602478,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "afc9b079.ac8a6"\r
+                "4a24532d.397b84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cee08d41.b2fe6",\r
+        "id": "2c31b540.c0b982",\r
         "type": "set",\r
         "name": "set automated-assignment to true",\r
         "xml": "<set>\n<parameter name='automated-assignment' value='true' />\n",\r
         "comments": "",\r
-        "x": 992.5594215393066,\r
-        "y": 2597.881392478943,\r
-        "z": "34265cd.7205424",\r
+        "x": 955.5594062805176,\r
+        "y": 2694.8813886642456,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "afc9b079.ac8a6",\r
+        "id": "4a24532d.397b84",\r
         "type": "set",\r
         "name": "set automated-assignment to false",\r
         "xml": "<set>\n<parameter name='automated-assignment' value='false' />\n",\r
         "comments": "",\r
-        "x": 990.8927421569824,\r
-        "y": 2642.8813123703003,\r
-        "z": "34265cd.7205424",\r
+        "x": 953.8927268981934,\r
+        "y": 2739.881308555603,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "81320c04.9ba968",\r
+        "id": "7d5e2a4c.059314",\r
         "type": "for",\r
         "name": "for each vnfc",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1767.1788291931152,\r
-        "y": 6571.572162151337,\r
-        "z": "34265cd.7205424",\r
+        "x": 1730.1788139343262,\r
+        "y": 6668.572158336639,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "d27afbea.8fdbb"\r
+                "ea947930.9aa72"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf288013.27e988",\r
+        "id": "a75def4f.6ee6e",\r
         "type": "for",\r
         "name": "for each vm-type",\r
         "xml": "<for silentFailure='true' index='vm-type-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 584.4168014526367,\r
-        "y": 3982.3580837249756,\r
-        "z": "34265cd.7205424",\r
+        "x": 547.4167861938477,\r
+        "y": 4079.3580799102783,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "4b547438.e5a1e4"\r
+                "46a5a77d.d755f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b547438.e5a1e4",\r
+        "id": "46a5a77d.d755f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 774.9168701171875,\r
-        "y": 3983.191318511963,\r
-        "z": "34265cd.7205424",\r
+        "x": 737.9168548583984,\r
+        "y": 4080.1913146972656,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "e115a59a.78977"\r
+                "8c7d407.6bcf7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e115a59a.78977",\r
+        "id": "8c7d407.6bcf7c",\r
         "type": "for",\r
         "name": "for each vm-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 976.4168014526367,\r
-        "y": 3982.3580837249756,\r
-        "z": "34265cd.7205424",\r
+        "x": 939.4167861938477,\r
+        "y": 4079.3580799102783,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c279839c.179e2"\r
+                "35ad2d4.547ffd2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c279839c.179e2",\r
+        "id": "35ad2d4.547ffd2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1166.2501220703125,\r
-        "y": 3981.8575229644775,\r
-        "z": "34265cd.7205424",\r
+        "x": 1129.2501068115234,\r
+        "y": 4078.8575191497803,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "9c5890c1.1bc73"\r
+                "f487beec.088c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c5890c1.1bc73",\r
+        "id": "f487beec.088c",\r
         "type": "get-resource",\r
         "name": "get-resource VFC_RELATED_NETWORK_ROLE",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1455.7500953674316,\r
-        "y": 3980.358165740967,\r
-        "z": "34265cd.7205424",\r
+        "x": 1418.7500801086426,\r
+        "y": 4077.3581619262695,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "a30af21d.78b66",\r
-                "54be536b.883c7c"\r
+                "a0408b33.43b78",\r
+                "3bacb1f6.d56f8e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a30af21d.78b66",\r
+        "id": "a0408b33.43b78",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1726.7500343322754,\r
-        "y": 3885.0248680114746,\r
-        "z": "34265cd.7205424",\r
+        "x": 1689.7500190734863,\r
+        "y": 3982.0248641967773,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "6573ac5d.e2d6fc"\r
+                "35e45c1b.0b696c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6573ac5d.e2d6fc",\r
+        "id": "35e45c1b.0b696c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1873.9405517578125,\r
-        "y": 3883.5728826522827,\r
-        "z": "34265cd.7205424",\r
+        "x": 1836.9405364990234,\r
+        "y": 3980.5728788375854,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "d4e308ce.5712b",\r
-                "f3cab335.7ec9f"\r
+                "e1550da4.520918",\r
+                "1980bda6.0907fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54be536b.883c7c",\r
+        "id": "3bacb1f6.d56f8e",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1727.5832443237305,\r
-        "y": 4129.691747665405,\r
-        "z": "34265cd.7205424",\r
+        "x": 1690.5832290649414,\r
+        "y": 4226.691743850708,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "8b99514d.224a68"\r
+                "d2a8eaa8.b65ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bdec068a.d17588",\r
+        "id": "1226c3aa.88da74",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2145.9164962768555,\r
-        "y": 4131.69150352478,\r
-        "z": "34265cd.7205424",\r
+        "x": 2108.9164810180664,\r
+        "y": 4228.691499710083,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "2380b499.33cb74",\r
-                "2a3d42f3.0625f6",\r
-                "9050219d.292618",\r
-                "a92d624e.c2d3a8",\r
-                "64298756.8d8e3",\r
-                "ee1be000.48bb78",\r
-                "fa830b25.a2ef78",\r
-                "18757bd7.bc1504"\r
+                "c57415e5.fd3248",\r
+                "e4e8595c.9b58f",\r
+                "e4b60504.f981a8",\r
+                "156f261a.863eca",\r
+                "495279ca.733358",\r
+                "c85f9edd.97f348",\r
+                "de61ca34.e42ee8",\r
+                "1f01eb84.19964c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a3d42f3.0625f6",\r
+        "id": "e4e8595c.9b58f",\r
         "type": "for",\r
         "name": "for each vnf network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2328.416675567627,\r
-        "y": 3974.024751663208,\r
-        "z": "34265cd.7205424",\r
+        "x": 2291.416660308838,\r
+        "y": 4071.0247478485107,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "2377be3.2805842"\r
+                "7a857ed.1aa998"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2380b499.33cb74",\r
+        "id": "c57415e5.fd3248",\r
         "type": "set",\r
         "name": "set found-related-network to false",\r
         "xml": "<set>\n<parameter name='found-related-network' value='false' />\n",\r
         "comments": "",\r
-        "x": 2368.4167518615723,\r
-        "y": 3915.6915283203125,\r
-        "z": "34265cd.7205424",\r
+        "x": 2331.416736602783,\r
+        "y": 4012.6915245056152,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f214ef27.8c7068",\r
+        "id": "bce8e032.adb05",\r
         "type": "for",\r
         "name": "for each related network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2727.4166374206543,\r
-        "y": 3950.6910152435303,\r
-        "z": "34265cd.7205424",\r
+        "x": 2690.4166221618652,\r
+        "y": 4047.691011428833,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "7ede6549.805acc"\r
+                "e0911b99.e70388"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2377be3.2805842",\r
+        "id": "7a857ed.1aa998",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2516.416675567627,\r
-        "y": 3974.024751663208,\r
-        "z": "34265cd.7205424",\r
+        "x": 2479.416660308838,\r
+        "y": 4071.0247478485107,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f214ef27.8c7068",\r
-                "ac51f9c5.7f381"\r
+                "bce8e032.adb05",\r
+                "62c152f0.7d2894"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ede6549.805acc",\r
+        "id": "e0911b99.e70388",\r
         "type": "switchNode",\r
         "name": "switch network-role matches",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2979.4165534973145,\r
-        "y": 3950.6910915374756,\r
-        "z": "34265cd.7205424",\r
+        "x": 2942.4165382385254,\r
+        "y": 4047.6910877227783,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "639ffefa.c6a668"\r
+                "1ffef684.6c9e81"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b99514d.224a68",\r
+        "id": "d2a8eaa8.b65ea",\r
         "type": "for",\r
         "name": "for each db related-network",\r
         "xml": "<for index='db-related-network-index' start='0' end='`$db.vnf-related-network-role_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1931.916618347168,\r
-        "y": 4130.35849571228,\r
-        "z": "34265cd.7205424",\r
+        "x": 1894.916603088379,\r
+        "y": 4227.358491897583,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "bdec068a.d17588"\r
+                "1226c3aa.88da74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "639ffefa.c6a668",\r
+        "id": "1ffef684.6c9e81",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3179.4165534973145,\r
-        "y": 3948.6910915374756,\r
-        "z": "34265cd.7205424",\r
+        "x": 3142.4165382385254,\r
+        "y": 4045.6910877227783,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "81afa752.330a7"\r
+                "766ba0f5.f4bb98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81afa752.330a7",\r
+        "id": "766ba0f5.f4bb98",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3333.4165534973145,\r
-        "y": 3946.6910915374756,\r
-        "z": "34265cd.7205424",\r
+        "x": 3296.4165382385254,\r
+        "y": 4043.6910877227783,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "9b9cff35.d523",\r
-                "46e64037.6ec64",\r
-                "8025f3eb.bd5ea"\r
+                "15001ccf.c8a18b",\r
+                "232797a8.b52268",\r
+                "f2dd29bc.54a1a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9b9cff35.d523",\r
+        "id": "15001ccf.c8a18b",\r
         "type": "set",\r
         "name": "set found-related-network to true",\r
         "xml": "<set>\n<parameter name='found-related-network' value='true' />\n",\r
         "comments": "",\r
-        "x": 3565.4167137145996,\r
-        "y": 3906.357675552368,\r
-        "z": "34265cd.7205424",\r
+        "x": 3528.4166984558105,\r
+        "y": 4003.357671737671,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "46e64037.6ec64",\r
+        "id": "232797a8.b52268",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 3488.7498893737793,\r
-        "y": 3993.024425506592,\r
-        "z": "34265cd.7205424",\r
+        "x": 3451.7498741149902,\r
+        "y": 4090.0244216918945,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9050219d.292618",\r
+        "id": "e4b60504.f981a8",\r
         "type": "switchNode",\r
         "name": "switch found-related-network",\r
         "xml": "<switch test='`$found-related-network`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2363.9165649414062,\r
-        "y": 4074.6916370391846,\r
-        "z": "34265cd.7205424",\r
+        "x": 2326.916549682617,\r
+        "y": 4171.691633224487,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "2c771fce.f6f0e"\r
+                "72439ee4.6178c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c771fce.f6f0e",\r
+        "id": "72439ee4.6178c8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2557.9165649414062,\r
-        "y": 4072.6916370391846,\r
-        "z": "34265cd.7205424",\r
+        "x": 2520.916549682617,\r
+        "y": 4169.691633224487,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "ed2c165a.75be88"\r
+                "13dbfbb2.053ff4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ed2c165a.75be88",\r
+        "id": "13dbfbb2.053ff4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2687.9165649414062,\r
-        "y": 4072.6916370391846,\r
-        "z": "34265cd.7205424",\r
+        "x": 2650.916549682617,\r
+        "y": 4169.691633224487,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "e1873883.a0b338",\r
-                "f3cab335.7ec9f"\r
+                "7b08fad7.a132ec",\r
+                "1980bda6.0907fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a92d624e.c2d3a8",\r
+        "id": "156f261a.863eca",\r
         "type": "set",\r
         "name": "set is-trunked and segmentation-id in vm-network",\r
         "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",\r
         "comments": "",\r
-        "x": 2425.9165649414062,\r
-        "y": 4122.691637039185,\r
-        "z": "34265cd.7205424",\r
+        "x": 2388.916549682617,\r
+        "y": 4219.691633224487,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ee1be000.48bb78",\r
+        "id": "c85f9edd.97f348",\r
         "type": "switchNode",\r
         "name": "switch rn-index",\r
         "xml": "<switch test='`$rn-index`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2313.9165649414062,\r
-        "y": 4230.691637039185,\r
-        "z": "34265cd.7205424",\r
+        "x": 2276.916549682617,\r
+        "y": 4327.691633224487,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "74c68449.7a6374"\r
+                "ef7434da.bc93f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64298756.8d8e3",\r
+        "id": "495279ca.733358",\r
         "type": "set",\r
         "name": "set rn-index to related network length",\r
         "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",\r
         "comments": "",\r
-        "x": 2385.9165649414062,\r
-        "y": 4174.691637039185,\r
-        "z": "34265cd.7205424",\r
+        "x": 2348.916549682617,\r
+        "y": 4271.691633224487,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "74c68449.7a6374",\r
+        "id": "ef7434da.bc93f",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2477.9165649414062,\r
-        "y": 4230.691637039185,\r
-        "z": "34265cd.7205424",\r
+        "x": 2440.916549682617,\r
+        "y": 4327.691633224487,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "8aa2ab54.ceea58"\r
+                "c24d1bf8.2f47d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8aa2ab54.ceea58",\r
+        "id": "c24d1bf8.2f47d8",\r
         "type": "set",\r
         "name": "set rn-index to 0",\r
         "xml": "<set>\n<parameter name='rn-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 2637.9165649414062,\r
-        "y": 4230.691637039185,\r
-        "z": "34265cd.7205424",\r
+        "x": 2600.916549682617,\r
+        "y": 4327.691633224487,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fa830b25.a2ef78",\r
+        "id": "de61ca34.e42ee8",\r
         "type": "set",\r
         "name": "set related-network data",\r
         "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",\r
         "comments": "",\r
-        "x": 2337.9165649414062,\r
-        "y": 4282.691637039185,\r
-        "z": "34265cd.7205424",\r
+        "x": 2300.916549682617,\r
+        "y": 4379.691633224487,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "18757bd7.bc1504",\r
+        "id": "1f01eb84.19964c",\r
         "type": "set",\r
         "name": "set new related network length",\r
         "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",\r
         "comments": "",\r
-        "x": 2355.9165649414062,\r
-        "y": 4334.691637039185,\r
-        "z": "34265cd.7205424",\r
+        "x": 2318.916549682617,\r
+        "y": 4431.691633224487,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ac51f9c5.7f381",\r
+        "id": "62c152f0.7d2894",\r
         "type": "switchNode",\r
         "name": "switch found-related-network",\r
         "xml": "<switch test='`$found-related-network`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2740.416660308838,\r
-        "y": 3998.3578758239746,\r
-        "z": "34265cd.7205424",\r
+        "x": 2703.416645050049,\r
+        "y": 4095.3578720092773,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "8dfcb5e2.bf7d2"\r
+                "85bfa485.399358"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8dfcb5e2.bf7d2",\r
+        "id": "85bfa485.399358",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2937.083522796631,\r
-        "y": 3998.358247756958,\r
-        "z": "34265cd.7205424",\r
+        "x": 2900.083507537842,\r
+        "y": 4095.3582439422607,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "49e231.bdb7fdd"\r
+                "bb00c0c7.52dd78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49e231.bdb7fdd",\r
+        "id": "bb00c0c7.52dd78",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 3067.083408355713,\r
-        "y": 3996.6913719177246,\r
-        "z": "34265cd.7205424",\r
+        "x": 3030.083393096924,\r
+        "y": 4093.6913681030273,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8025f3eb.bd5ea",\r
+        "id": "f2dd29bc.54a1a",\r
         "type": "set",\r
         "name": "save indexes",\r
         "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",\r
         "comments": "",\r
-        "x": 3507.0836219787598,\r
-        "y": 3948.3582458496094,\r
-        "z": "34265cd.7205424",\r
+        "x": 3470.0836067199707,\r
+        "y": 4045.358242034912,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "67c600cd.b9cba",\r
+        "id": "9c6dc578.9d7fc",\r
         "type": "execute",\r
         "name": "generate cp-instance-id",\r
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" >\n<parameter name=\"ctx-destination\" value=\"cp-instance-id\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1795.9881134033203,\r
-        "y": 4977.882298946381,\r
-        "z": "34265cd.7205424",\r
+        "x": 1758.9880981445312,\r
+        "y": 5074.882295131683,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "def6cb8a.75abd",\r
+        "id": "aba2a62.76d55d8",\r
         "type": "save",\r
         "name": "save cp to A&AI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1777.6547355651855,\r
-        "y": 5044.548804759979,\r
-        "z": "34265cd.7205424",\r
+        "x": 1740.6547203063965,\r
+        "y": 5141.548800945282,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "cec4e53.0593898",\r
-                "73e9c7c7.e33118"\r
+                "afcda996.4564e",\r
+                "6cc31709.9e47c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cec4e53.0593898",\r
+        "id": "afcda996.4564e",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1966.6547164916992,\r
-        "y": 5020.215418279171,\r
-        "z": "34265cd.7205424",\r
+        "x": 1929.6547012329102,\r
+        "y": 5117.215414464474,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "6c56796a.9785"\r
+                "d55c685e.dfaad"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c56796a.9785",\r
+        "id": "d55c685e.dfaad",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2133.821464538574,\r
-        "y": 5036.009851872921,\r
-        "z": "34265cd.7205424",\r
+        "x": 2096.821449279785,\r
+        "y": 5133.009848058224,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "56c543eb.6150dc",\r
-                "deea8b7a.34ee38"\r
+                "3296dfd.dbc53a",\r
+                "387bacc5.df1d84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73e9c7c7.e33118",\r
+        "id": "6cc31709.9e47c8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1971.6547164916992,\r
-        "y": 5069.881678044796,\r
-        "z": "34265cd.7205424",\r
+        "x": 1934.6547012329102,\r
+        "y": 5166.881674230099,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "6c56796a.9785"\r
+                "d55c685e.dfaad"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58cb90bc.4bbef8",\r
+        "id": "47726d30.d34cb4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1572.4644355773926,\r
-        "y": 5247.16709280014,\r
-        "z": "34265cd.7205424",\r
+        "x": 1535.4644203186035,\r
+        "y": 5344.167088985443,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "bb7a5471.736f58",\r
-                "8cfa77fd.d126b8",\r
-                "67c600cd.b9cba",\r
-                "def6cb8a.75abd",\r
-                "c24016d.89a2f68",\r
-                "e9947f94.840de"\r
+                "5f7cb894.98d27",\r
+                "bb7020bf.917f88",\r
+                "9c6dc578.9d7fc",\r
+                "aba2a62.76d55d8",\r
+                "dc3b1c12.9b901",\r
+                "e12a435b.3614b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bb7a5471.736f58",\r
+        "id": "5f7cb894.98d27",\r
         "type": "set",\r
         "name": "set connection point data",\r
         "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",\r
         "comments": "",\r
-        "x": 1807.9882774353027,\r
-        "y": 5122.406374454498,\r
-        "z": "34265cd.7205424",\r
+        "x": 1770.9882621765137,\r
+        "y": 5219.406370639801,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "197afe0.8443282",\r
+        "id": "800d9848.2437a8",\r
         "type": "comment",\r
         "name": "Floating IPs",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1368.7500953674316,\r
-        "y": 6104.69149273634,\r
-        "z": "34265cd.7205424",\r
+        "x": 1331.7500801086426,\r
+        "y": 6201.691488921642,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c24016d.89a2f68",\r
+        "id": "dc3b1c12.9b901",\r
         "type": "for",\r
         "name": "for each vnf-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1792.0832786560059,\r
-        "y": 5518.691868305206,\r
-        "z": "34265cd.7205424",\r
+        "x": 1755.0832633972168,\r
+        "y": 5615.691864490509,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "56804039.82c95"\r
+                "f1babc88.16382"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1b4d007d.b0d738",\r
+        "id": "81279dea.3bc048",\r
         "type": "save",\r
         "name": "save cp relationship to l3-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2430.416759490967,\r
-        "y": 5518.358376026154,\r
-        "z": "34265cd.7205424",\r
+        "x": 2393.4167442321777,\r
+        "y": 5615.358372211456,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "925d685c.856048",\r
-                "2b843689.1bb8aa"\r
+                "2abb93be.17e5dc",\r
+                "f8469e10.8f33"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8275ab5.32ae",\r
+        "id": "99581456.eeacb8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2802.249797821045,\r
-        "y": 5491.676324367523,\r
-        "z": "34265cd.7205424",\r
+        "x": 2765.249782562256,\r
+        "y": 5588.676320552826,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "d01f264c.61c318",\r
-                "deea8b7a.34ee38"\r
+                "804becc1.78da28",\r
+                "387bacc5.df1d84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee39eeee.ad11d8",\r
+        "id": "104ad31e.9bcd75",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2802.2498741149902,\r
-        "y": 5544.676083087921,\r
-        "z": "34265cd.7205424",\r
+        "x": 2765.249858856201,\r
+        "y": 5641.676079273224,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "64482d7f.371044",\r
-                "deea8b7a.34ee38"\r
+                "7e2874de.0ebfec",\r
+                "387bacc5.df1d84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "925d685c.856048",\r
+        "id": "2abb93be.17e5dc",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2645.4166831970215,\r
-        "y": 5491.691994190216,\r
-        "z": "34265cd.7205424",\r
+        "x": 2608.4166679382324,\r
+        "y": 5588.691990375519,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c8275ab5.32ae"\r
+                "99581456.eeacb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b843689.1bb8aa",\r
+        "id": "f8469e10.8f33",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2653.9882164001465,\r
-        "y": 5544.311138629913,\r
-        "z": "34265cd.7205424",\r
+        "x": 2616.9882011413574,\r
+        "y": 5641.311134815216,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "ee39eeee.ad11d8"\r
+                "104ad31e.9bcd75"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9947f94.840de",\r
+        "id": "e12a435b.3614b8",\r
         "type": "for",\r
         "name": "for each vm-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1792.0834312438965,\r
-        "y": 5679.358223438263,\r
-        "z": "34265cd.7205424",\r
+        "x": 1755.0834159851074,\r
+        "y": 5776.358219623566,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "a50b0d5a.ce5908"\r
+                "8b1c560f.764dd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8135e354.1212a",\r
+        "id": "e33ae63b.e49888",\r
         "type": "save",\r
         "name": "save cp relationship to l3-network and vlan-tag",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2711.7504386901855,\r
-        "y": 5677.358218669891,\r
-        "z": "34265cd.7205424",\r
+        "x": 2674.7504234313965,\r
+        "y": 5774.358214855194,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "54f5fc79.be774c",\r
-                "c10c7043.50dca8"\r
+                "45ff040c.b512bc",\r
+                "e1063714.f1338"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cffcf5c1.1e4ec8",\r
+        "id": "938725ee.5957b8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3118.583484649658,\r
-        "y": 5650.675517559052,\r
-        "z": "34265cd.7205424",\r
+        "x": 3081.583469390869,\r
+        "y": 5747.675513744355,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "7a163627.fcef3",\r
-                "deea8b7a.34ee38"\r
+                "9d950f64.0102",\r
+                "387bacc5.df1d84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f874e0.8ac4234",\r
+        "id": "cfc84d0d.ef786",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3118.5835609436035,\r
-        "y": 5703.67527627945,\r
-        "z": "34265cd.7205424",\r
+        "x": 3081.5835456848145,\r
+        "y": 5800.675272464753,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "57dc1477.8da4b4",\r
-                "deea8b7a.34ee38"\r
+                "b2d45985.f53aa8",\r
+                "387bacc5.df1d84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54f5fc79.be774c",\r
+        "id": "45ff040c.b512bc",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2961.7503700256348,\r
-        "y": 5650.691187381745,\r
-        "z": "34265cd.7205424",\r
+        "x": 2924.7503547668457,\r
+        "y": 5747.691183567048,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "cffcf5c1.1e4ec8"\r
+                "938725ee.5957b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c10c7043.50dca8",\r
+        "id": "e1063714.f1338",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2970.3219032287598,\r
-        "y": 5703.310331821443,\r
-        "z": "34265cd.7205424",\r
+        "x": 2933.3218879699707,\r
+        "y": 5800.310328006745,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "6f874e0.8ac4234"\r
+                "cfc84d0d.ef786"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b14df7f0.70279",\r
+        "id": "91124630.ba4798",\r
         "type": "for",\r
         "name": "for each related-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2407.750270843506,\r
-        "y": 5677.358219623566,\r
-        "z": "34265cd.7205424",\r
+        "x": 2370.750255584717,\r
+        "y": 5774.358215808868,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "8135e354.1212a"\r
+                "e33ae63b.e49888"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50d2cea2.bb528",\r
+        "id": "43e6fb56.3aad2c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-generate-heat-parameters",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-generate-heat-parameters' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 656.0835952758789,\r
-        "y": 6919.108981132507,\r
-        "z": "34265cd.7205424",\r
+        "x": 619.0835800170898,\r
+        "y": 7016.10897731781,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "886b51f6.cb8c8",\r
+        "id": "8ddb6fb6.8a0038",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vfmoduleheat.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 466.1669006347656,\r
-        "y": 6972.108658790588,\r
-        "z": "34265cd.7205424",\r
+        "x": 429.16688537597656,\r
+        "y": 7069.108654975891,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "14aa8b5.d6278f5",\r
+        "id": "76eaad0d.045934",\r
         "type": "switchNode",\r
         "name": "switch input vf-module-name",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-name`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 638.7499961853027,\r
-        "y": 2404.191040992737,\r
-        "z": "34265cd.7205424",\r
+        "x": 601.7499809265137,\r
+        "y": 2501.1910371780396,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "75d4819e.af875",\r
-                "b5b05f4.3353d2"\r
+                "55d69cd.6f87864",\r
+                "12fb7679.452c52"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "75d4819e.af875",\r
+        "id": "55d69cd.6f87864",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 861.2499618530273,\r
-        "y": 2326.6910009384155,\r
-        "z": "34265cd.7205424",\r
+        "x": 824.2499465942383,\r
+        "y": 2423.6909971237183,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "35aa0744.80b5c8"\r
+                "aeaac31c.b0a03"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5b05f4.3353d2",\r
+        "id": "12fb7679.452c52",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 862.9285621643066,\r
-        "y": 2499.309585571289,\r
-        "z": "34265cd.7205424",\r
+        "x": 825.9285469055176,\r
+        "y": 2596.309581756592,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "857ef89e.1a5408"\r
+                "d8e05d0.e811aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a0f0f960.3140c8",\r
+        "id": "526e48e0.ddfea8",\r
         "type": "for",\r
         "name": "for each vnfc-subnet-role",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1396.2500953674316,\r
-        "y": 3199.1907176971436,\r
-        "z": "34265cd.7205424",\r
+        "x": 1359.2500801086426,\r
+        "y": 3296.1907138824463,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "9d57c772.862988"\r
+                "7ac699be.e8b38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d57c772.862988",\r
+        "id": "7ac699be.e8b38",\r
         "type": "for",\r
         "name": "for each vnfc-address-family",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1644.5833549499512,\r
-        "y": 3199.1907176971436,\r
-        "z": "34265cd.7205424",\r
+        "x": 1607.583339691162,\r
+        "y": 3296.1907138824463,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "400506a5.64a12"\r
+                "5f865ea0.0676c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b70bca8.2d04e4",\r
+        "id": "b55fea55.8a7208",\r
         "type": "for",\r
         "name": "for each vm-type",\r
         "xml": "<for silentFailure='true' index='vm-type-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 602.0832710266113,\r
-        "y": 2917.5240545272827,\r
-        "z": "34265cd.7205424",\r
+        "x": 565.0832557678223,\r
+        "y": 3014.5240507125854,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "76c0436b.ee91fc"\r
+                "1b0f2d74.152693"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76c0436b.ee91fc",\r
+        "id": "1b0f2d74.152693",\r
         "type": "for",\r
         "name": "for each vnfc",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 783.7500495910645,\r
-        "y": 2916.1912031173706,\r
-        "z": "34265cd.7205424",\r
+        "x": 746.7500343322754,\r
+        "y": 3013.1911993026733,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f9241628.26f1"\r
+                "50487ae9.4141e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9241628.26f1",\r
+        "id": "50487ae9.4141e4",\r
         "type": "for",\r
         "name": "for each vnfc-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 984.9166221618652,\r
-        "y": 2916.023892402649,\r
-        "z": "34265cd.7205424",\r
+        "x": 947.9166069030762,\r
+        "y": 3013.0238885879517,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "ba3c1b94.fddce"\r
+                "fc43a65d.ee5618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba3c1b94.fddce",\r
+        "id": "fc43a65d.ee5618",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1197.083293914795,\r
-        "y": 2915.0242528915405,\r
-        "z": "34265cd.7205424",\r
+        "x": 1160.0832786560059,\r
+        "y": 3012.0242490768433,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "dd887364.2936e",\r
-                "ee8eb9ce.fef06",\r
-                "3f48cbb0.25141c",\r
-                "a0f0f960.3140c8"\r
+                "419335de.8f9efc",\r
+                "967eee1a.e0e6a",\r
+                "25438028.49af4",\r
+                "526e48e0.ddfea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd887364.2936e",\r
+        "id": "419335de.8f9efc",\r
         "type": "set",\r
         "name": "set vnf-network-index to -1",\r
         "xml": "<set>\n<parameter name='vnf-network-index' value='-1' />\n",\r
         "comments": "",\r
-        "x": 1408.7500114440918,\r
-        "y": 2868.357466697693,\r
-        "z": "34265cd.7205424",\r
+        "x": 1371.7499961853027,\r
+        "y": 2965.3574628829956,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ee8eb9ce.fef06",\r
+        "id": "967eee1a.e0e6a",\r
         "type": "for",\r
         "name": "for each vnf-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1390.4168014526367,\r
-        "y": 2915.024218559265,\r
-        "z": "34265cd.7205424",\r
+        "x": 1353.4167861938477,\r
+        "y": 3012.024214744568,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "e1cac1a5.f31bf"\r
+                "46dba174.c40b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1cac1a5.f31bf",\r
+        "id": "46dba174.c40b4",\r
         "type": "switchNode",\r
         "name": "switch network-roles match?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1632.0832710266113,\r
-        "y": 2913.357713699341,\r
-        "z": "34265cd.7205424",\r
+        "x": 1595.0832557678223,\r
+        "y": 3010.3577098846436,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "d60f049.7085ef8"\r
+                "a012a02c.291a88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d60f049.7085ef8",\r
+        "id": "a012a02c.291a88",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1828.7499504089355,\r
-        "y": 2913.357632637024,\r
-        "z": "34265cd.7205424",\r
+        "x": 1791.7499351501465,\r
+        "y": 3010.3576288223267,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "4013cdce.5ea73c"\r
+                "1f8e0939.c42ce7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4013cdce.5ea73c",\r
+        "id": "1f8e0939.c42ce7",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1982.0831718444824,\r
-        "y": 2913.3575048446655,\r
-        "z": "34265cd.7205424",\r
+        "x": 1945.0831565856934,\r
+        "y": 3010.3575010299683,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "903a3aca.3e3288",\r
-                "4a6e737f.7ebf6c",\r
-                "9291e114.ac1f58"\r
+                "695e43ac.61996c",\r
+                "dbb88684.a8701",\r
+                "c77499cc.02fca"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "903a3aca.3e3288",\r
+        "id": "695e43ac.61996c",\r
         "type": "set",\r
         "name": "set vnf-network-index",\r
         "xml": "<set>\n<parameter name='vnf-network-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 2188.7500038146973,\r
-        "y": 2861.6908826828003,\r
-        "z": "34265cd.7205424",\r
+        "x": 2151.749988555908,\r
+        "y": 2958.690878868103,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4a6e737f.7ebf6c",\r
+        "id": "dbb88684.a8701",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 2143.7499198913574,\r
-        "y": 2951.690803527832,\r
-        "z": "34265cd.7205424",\r
+        "x": 2106.7499046325684,\r
+        "y": 3048.6907997131348,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3f48cbb0.25141c",\r
+        "id": "25438028.49af4",\r
         "type": "switchNode",\r
         "name": "switch vnf-network-index",\r
         "xml": "<switch test='`$vnf-network-index`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1402.083339691162,\r
-        "y": 2975.0242204666138,\r
-        "z": "34265cd.7205424",\r
+        "x": 1365.083324432373,\r
+        "y": 3072.0242166519165,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b6265ed2.699af8"\r
+                "6ad7f58.4e60e0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6265ed2.699af8",\r
+        "id": "6ad7f58.4e60e0c",\r
         "type": "outcome",\r
         "name": "-1",\r
         "xml": "<outcome value='-1'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1593.7499809265137,\r
-        "y": 2975.0244646072388,\r
-        "z": "34265cd.7205424",\r
+        "x": 1556.7499656677246,\r
+        "y": 3072.0244607925415,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "2ed011a8.f17046"\r
+                "cac91700.4c17"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2ed011a8.f17046",\r
+        "id": "cac91700.4c17",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1742.0831718444824,\r
-        "y": 2973.3575048446655,\r
-        "z": "34265cd.7205424",\r
+        "x": 1705.0831565856934,\r
+        "y": 3070.3575010299683,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "4023444f.ec71fc",\r
-                "f3cab335.7ec9f"\r
+                "a8978c6d.0307c8",\r
+                "1980bda6.0907fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc22dd63.414278",\r
+        "id": "7fe1eda3.4f3ee4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2433.7498893737793,\r
-        "y": 3383.357356071472,\r
-        "z": "34265cd.7205424",\r
+        "x": 2396.7498741149902,\r
+        "y": 3480.357352256775,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "7043f864.7c537",\r
-                "4ca198d0.a53ec8",\r
-                "791dbcea.c3f15c"\r
+                "356bc551.3ec1ca",\r
+                "f041336a.316cd",\r
+                "1f14cd7.70cf733"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7043f864.7c537",\r
+        "id": "356bc551.3ec1ca",\r
         "type": "for",\r
         "name": "for each subnet-data",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2630.4166412353516,\r
-        "y": 3338.3572750091553,\r
-        "z": "34265cd.7205424",\r
+        "x": 2593.4166259765625,\r
+        "y": 3435.357271194458,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "52062448.8dfe2c"\r
+                "82168895.ff1268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "52062448.8dfe2c",\r
+        "id": "82168895.ff1268",\r
         "type": "switchNode",\r
         "name": "address-families match?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2857.083267211914,\r
-        "y": 3338.3572750091553,\r
-        "z": "34265cd.7205424",\r
+        "x": 2820.083251953125,\r
+        "y": 3435.357271194458,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "543cb01a.eba16"\r
+                "a740c25b.db367"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "543cb01a.eba16",\r
+        "id": "a740c25b.db367",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3037.0832328796387,\r
-        "y": 3338.357681274414,\r
-        "z": "34265cd.7205424",\r
+        "x": 3000.0832176208496,\r
+        "y": 3435.357677459717,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "bdf7e6b7.6ee818"\r
+                "80f988bb.accbc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60ebadf1.68a63c",\r
+        "id": "584966d1.c2c31",\r
         "type": "set",\r
         "name": "set tmp.address-family",\r
         "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",\r
         "comments": "",\r
-        "x": 2462.083225250244,\r
-        "y": 3201.6907691955566,\r
-        "z": "34265cd.7205424",\r
+        "x": 2425.083209991455,\r
+        "y": 3298.6907653808594,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "400506a5.64a12",\r
+        "id": "5f865ea0.0676c",\r
         "type": "switchNode",\r
         "name": "switch vnfc-subnet-ip_length",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1907.083568572998,\r
-        "y": 3198.357804298401,\r
-        "z": "34265cd.7205424",\r
+        "x": 1870.083553314209,\r
+        "y": 3295.3578004837036,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "e743e437.36a2c8",\r
-                "57980fd5.eb6b38",\r
-                "67a6a045.51b5d"\r
+                "6181e221.800f7c",\r
+                "b281bb18.f89538",\r
+                "c6664773.42391"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e743e437.36a2c8",\r
+        "id": "6181e221.800f7c",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2108.7500801086426,\r
-        "y": 3098.3573474884033,\r
-        "z": "34265cd.7205424",\r
+        "x": 2071.7500648498535,\r
+        "y": 3195.357343673706,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "14f67782.825778"\r
+                "632ebb0f.6b72ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "57980fd5.eb6b38",\r
+        "id": "b281bb18.f89538",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2105.1787109375,\r
-        "y": 3284.309638977051,\r
-        "z": "34265cd.7205424",\r
+        "x": 2068.178695678711,\r
+        "y": 3381.3096351623535,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "5396132e.ac2ccc"\r
+                "3a798a94.b1022e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14f67782.825778",\r
+        "id": "632ebb0f.6b72ec",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2240.4166297912598,\r
-        "y": 3121.024094581604,\r
-        "z": "34265cd.7205424",\r
+        "x": 2203.4166145324707,\r
+        "y": 3218.0240907669067,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a683f1c3.23c0e",\r
+        "id": "2502e8d8.464bd",\r
         "type": "set",\r
         "name": "set subnet-id to -1",\r
         "xml": "<set>\n<parameter name='subnet-id' value='-1' />\n",\r
         "comments": "",\r
-        "x": 3130.417148590088,\r
-        "y": 3500.024761199951,\r
-        "z": "34265cd.7205424",\r
+        "x": 3093.417133331299,\r
+        "y": 3597.024757385254,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5396132e.ac2ccc",\r
+        "id": "3a798a94.b1022e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2258.7501258850098,\r
-        "y": 3283.357271194458,\r
-        "z": "34265cd.7205424",\r
+        "x": 2221.7501106262207,\r
+        "y": 3380.3572673797607,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "60ebadf1.68a63c",\r
-                "cc22dd63.414278"\r
+                "584966d1.c2c31",\r
+                "7fe1eda3.4f3ee4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8baea399.050c9",\r
+        "id": "c5140624.bb6f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4390.416746139526,\r
-        "y": 3671.6912381649017,\r
-        "z": "34265cd.7205424",\r
+        "x": 4353.416730880737,\r
+        "y": 3768.6912343502045,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "2294588d.69be78",\r
-                "7cf89eba.e30e88"\r
+                "f25057b4.2e266",\r
+                "c542a135.ef0f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7cf89eba.e30e88",\r
+        "id": "c542a135.ef0f5",\r
         "type": "execute",\r
         "name": "execute isInSameSubnet",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4605.416748046875,\r
-        "y": 3721.6909120082855,\r
-        "z": "34265cd.7205424",\r
+        "x": 4568.416732788086,\r
+        "y": 3818.6909081935883,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b43b85f4.a3f6f"\r
+                "ba13c0d4.a61928"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2294588d.69be78",\r
+        "id": "f25057b4.2e266",\r
         "type": "switchNode",\r
         "name": "switch tmp.address-family",\r
         "xml": "<switch test='`$tmp.address-family`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4607.083904266357,\r
-        "y": 3628.3578984737396,\r
-        "z": "34265cd.7205424",\r
+        "x": 4570.083889007568,\r
+        "y": 3725.3578946590424,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "594b959.c2361ec",\r
-                "9b3a3849.f2667"\r
+                "dc137b5d.faff98",\r
+                "837132a3.44baa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "594b959.c2361ec",\r
+        "id": "dc137b5d.faff98",\r
         "type": "outcome",\r
         "name": "ipv4",\r
         "xml": "<outcome value='ipv4'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4810.417166392008,\r
-        "y": 3601.6911288102465,\r
-        "z": "34265cd.7205424",\r
+        "x": 4773.417151133219,\r
+        "y": 3698.691124995549,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "6a520cb3.77f044"\r
+                "f7d6a129.7a1b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9b3a3849.f2667",\r
+        "id": "837132a3.44baa",\r
         "type": "outcome",\r
         "name": "ipv6",\r
         "xml": "<outcome value='ipv6'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4810.416839599609,\r
-        "y": 3648.3576562404633,\r
-        "z": "34265cd.7205424",\r
+        "x": 4773.41682434082,\r
+        "y": 3745.357652425766,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "7af13a32.5ffc94"\r
+                "2617d4d6.3cfd54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a520cb3.77f044",\r
+        "id": "f7d6a129.7a1b8",\r
         "type": "set",\r
         "name": "set ip-type parameter to IPv4",\r
         "xml": "<set>\n<parameter name='ip-type' value='IPv4' />\n",\r
         "comments": "",\r
-        "x": 5007.083652496338,\r
-        "y": 3600.024602651596,\r
-        "z": "34265cd.7205424",\r
+        "x": 4970.083637237549,\r
+        "y": 3697.024598836899,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7af13a32.5ffc94",\r
+        "id": "2617d4d6.3cfd54",\r
         "type": "set",\r
         "name": "set ip-type parameter to IPv6",\r
         "xml": "<set>\n<parameter name='ip-type' value='IPv6' />\n",\r
         "comments": "",\r
-        "x": 5012.083530426025,\r
-        "y": 3648.3576753139496,\r
-        "z": "34265cd.7205424",\r
+        "x": 4975.083515167236,\r
+        "y": 3745.3576714992523,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ab82723f.61758",\r
+        "id": "40290279.211ecc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4945.416778564453,\r
-        "y": 3721.3576753139496,\r
-        "z": "34265cd.7205424",\r
+        "x": 4908.416763305664,\r
+        "y": 3818.3576714992523,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b1e91b4.62d23e8",\r
-                "7d551750.2413e8"\r
+                "add111d3.22588",\r
+                "d03c05a2.3fa848"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b1e91b4.62d23e8",\r
+        "id": "add111d3.22588",\r
         "type": "set",\r
         "name": "set subnet-id",\r
         "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",\r
         "comments": "",\r
-        "x": 5123.750099182129,\r
-        "y": 3698.024162054062,\r
-        "z": "34265cd.7205424",\r
+        "x": 5086.75008392334,\r
+        "y": 3795.0241582393646,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7d551750.2413e8",\r
+        "id": "d03c05a2.3fa848",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 5108.750102996826,\r
-        "y": 3744.6911561489105,\r
-        "z": "34265cd.7205424",\r
+        "x": 5071.750087738037,\r
+        "y": 3841.6911523342133,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "99f86360.f7c048",\r
+        "id": "9fc4555.7a3cfa8",\r
         "type": "switchNode",\r
         "name": "switch subnet-id",\r
         "xml": "<switch test='`$subnet-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3122.083023071289,\r
-        "y": 3661.6914958953857,\r
-        "z": "34265cd.7205424",\r
+        "x": 3085.0830078125,\r
+        "y": 3758.6914920806885,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "3596c952.3e6b56"\r
+                "4688ca4f.b10a14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3596c952.3e6b56",\r
+        "id": "4688ca4f.b10a14",\r
         "type": "outcome",\r
         "name": "-1",\r
         "xml": "<outcome value='-1'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3278.7495880126953,\r
-        "y": 3661.691431045532,\r
-        "z": "34265cd.7205424",\r
+        "x": 3241.7495727539062,\r
+        "y": 3758.691427230835,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "6bb9a9d2.d4614"\r
+                "1418484.c2e4038"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6bb9a9d2.d4614",\r
+        "id": "1418484.c2e4038",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3427.082778930664,\r
-        "y": 3660.024471282959,\r
-        "z": "34265cd.7205424",\r
+        "x": 3390.082763671875,\r
+        "y": 3757.0244674682617,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "1c39b653.2b576a",\r
-                "f3cab335.7ec9f"\r
+                "cb1415b6.cece5",\r
+                "1980bda6.0907fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e59b7e1.f58dd8",\r
+        "id": "911a7c16.59a3f",\r
         "type": "set",\r
         "name": "set subnet-id in vnfc-ip-assignments (temp variable)",\r
         "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",\r
         "comments": "",\r
-        "x": 3233.749668121338,\r
-        "y": 3738.3582668304443,\r
-        "z": "34265cd.7205424",\r
+        "x": 3196.749652862549,\r
+        "y": 3835.358263015747,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fcdfebce.a935a8",\r
+        "id": "52376e41.5c3c28",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vfmodulec.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 587.0832633972168,\r
-        "y": 3333.3575048446655,\r
-        "z": "34265cd.7205424",\r
+        "x": 550.0832481384277,\r
+        "y": 3430.3575010299683,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b43b85f4.a3f6f",\r
+        "id": "ba13c0d4.a61928",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4792.083351135254,\r
-        "y": 3721.6914002895355,\r
-        "z": "34265cd.7205424",\r
+        "x": 4755.083335876465,\r
+        "y": 3818.6913964748383,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "ab82723f.61758"\r
+                "40290279.211ecc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9291e114.ac1f58",\r
+        "id": "c77499cc.02fca",\r
         "type": "set",\r
         "name": "set network-id",\r
         "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",\r
         "comments": "",\r
-        "x": 2165.4165077209473,\r
-        "y": 2906.690965652466,\r
-        "z": "34265cd.7205424",\r
+        "x": 2128.416492462158,\r
+        "y": 3003.6909618377686,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "67190c0.7b4b2f4",\r
+        "id": "73fcbf14.3fdec",\r
         "type": "switchNode",\r
         "name": "switch nfc-naming-code",\r
         "xml": "<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].nfc-naming-code`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1363.7499732971191,\r
-        "y": 4521.6906933784485,\r
-        "z": "34265cd.7205424",\r
+        "x": 1326.74995803833,\r
+        "y": 4618.690689563751,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "fbe686e0.5f0fd",\r
-                "957bd493.746db8"\r
+                "ce72c455.4b3538",\r
+                "d1d7edf9.9feb88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fbe686e0.5f0fd",\r
+        "id": "ce72c455.4b3538",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1548.7499198913574,\r
-        "y": 4496.690512180328,\r
-        "z": "34265cd.7205424",\r
+        "x": 1511.7499046325684,\r
+        "y": 4593.690508365631,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "accede8.fdef6a"\r
+                "d9f4827a.0412b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "957bd493.746db8",\r
+        "id": "d1d7edf9.9feb88",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1546.8451919555664,\r
-        "y": 4543.476339817047,\r
-        "z": "34265cd.7205424",\r
+        "x": 1509.8451766967773,\r
+        "y": 4640.47633600235,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "3d2d20a5.318a68"\r
+                "22a96688.1f4e6a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "accede8.fdef6a",\r
+        "id": "d9f4827a.0412b8",\r
         "type": "set",\r
         "name": "set tmp.nfc-naming-code to DEFAULT",\r
         "xml": "<set>\n<parameter name='tmp.nfc-naming-code' value='DEFAULT' />\n",\r
         "comments": "",\r
-        "x": 1780.416690826416,\r
-        "y": 4495.023862361908,\r
-        "z": "34265cd.7205424",\r
+        "x": 1743.416675567627,\r
+        "y": 4592.023858547211,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3d2d20a5.318a68",\r
+        "id": "22a96688.1f4e6a",\r
         "type": "set",\r
         "name": "set tmp.nfc-naming-code",\r
         "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",\r
         "comments": "",\r
-        "x": 1737.0832023620605,\r
-        "y": 4543.357360363007,\r
-        "z": "34265cd.7205424",\r
+        "x": 1700.0831871032715,\r
+        "y": 4640.357356548309,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2591369f.6e45f2",\r
+        "id": "94b5136b.b8b098",\r
         "type": "switchNode",\r
         "name": "switch nfc-function",\r
         "xml": "<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].nfc-function`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1352.0833053588867,\r
-        "y": 4620.0238671302795,\r
-        "z": "34265cd.7205424",\r
+        "x": 1315.0832901000977,\r
+        "y": 4717.023863315582,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "db65fbda.8eb47",\r
-                "25e9a13b.27b69e"\r
+                "2ffbc916.fecb7e",\r
+                "e74db6e4.b95498"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db65fbda.8eb47",\r
+        "id": "2ffbc916.fecb7e",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1548.749912261963,\r
-        "y": 4595.0236649513245,\r
-        "z": "34265cd.7205424",\r
+        "x": 1511.7498970031738,\r
+        "y": 4692.023661136627,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "402342b6.e54cbc"\r
+                "6b879f7a.6f22e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25e9a13b.27b69e",\r
+        "id": "e74db6e4.b95498",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1546.8451843261719,\r
-        "y": 4641.809492588043,\r
-        "z": "34265cd.7205424",\r
+        "x": 1509.8451690673828,\r
+        "y": 4738.809488773346,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "fc9c94e4.1cab6"\r
+                "176069ae.2f780e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "402342b6.e54cbc",\r
+        "id": "6b879f7a.6f22e8",\r
         "type": "set",\r
         "name": "set tmp.nfc-function to DEFAULT",\r
         "xml": "<set>\n<parameter name='tmp.nfc-function' value='DEFAULT' />\n",\r
         "comments": "",\r
-        "x": 1760.4166946411133,\r
-        "y": 4593.356873989105,\r
-        "z": "34265cd.7205424",\r
+        "x": 1723.4166793823242,\r
+        "y": 4690.356870174408,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fc9c94e4.1cab6",\r
+        "id": "176069ae.2f780e",\r
         "type": "set",\r
         "name": "set tmp.nfc-function",\r
         "xml": "<set>\n<parameter name='tmp.nfc-function' value='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].nfc-function`' />\n",\r
         "comments": "",\r
-        "x": 1718.7498245239258,\r
-        "y": 4641.690535068512,\r
-        "z": "34265cd.7205424",\r
+        "x": 1681.7498092651367,\r
+        "y": 4738.690531253815,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "56804039.82c95",\r
+        "id": "f1babc88.16382",\r
         "type": "switchNode",\r
         "name": "switch network-roles match?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2025.4166221618652,\r
-        "y": 5518.690894603729,\r
-        "z": "34265cd.7205424",\r
+        "x": 1988.4166069030762,\r
+        "y": 5615.690890789032,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "d7344243.b04a2"\r
+                "468a8949.ce6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d7344243.b04a2",\r
+        "id": "468a8949.ce6",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2223.7500915527344,\r
-        "y": 5518.358049869537,\r
-        "z": "34265cd.7205424",\r
+        "x": 2186.7500762939453,\r
+        "y": 5615.35804605484,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "1b4d007d.b0d738"\r
+                "81279dea.3bc048"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a50b0d5a.ce5908",\r
+        "id": "8b1c560f.764dd",\r
         "type": "switchNode",\r
         "name": "switch network-roles match?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2028.7499656677246,\r
-        "y": 5678.357342243195,\r
-        "z": "34265cd.7205424",\r
+        "x": 1991.7499504089355,\r
+        "y": 5775.357338428497,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "ecf473bc.4b56a8"\r
+                "90110945.ead0e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ecf473bc.4b56a8",\r
+        "id": "90110945.ead0e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2227.0834350585938,\r
-        "y": 5678.024497509003,\r
-        "z": "34265cd.7205424",\r
+        "x": 2190.0834197998047,\r
+        "y": 5775.024493694305,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b14df7f0.70279"\r
+                "91124630.ba4798"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f2b022e3.1f756",\r
+        "id": "ddc96fa8.7a60c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1932.0832481384277,\r
-        "y": 6256.690762042999,\r
-        "z": "34265cd.7205424",\r
+        "x": 1895.0832328796387,\r
+        "y": 6353.690758228302,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "cd3cd499.458be8",\r
-                "8f630208.bc1d7"\r
+                "26b909fe.b46aae",\r
+                "5e6235d3.e2f47c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d27afbea.8fdbb",\r
+        "id": "ea947930.9aa72",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1933.7499961853027,\r
-        "y": 6571.690773487091,\r
-        "z": "34265cd.7205424",\r
+        "x": 1896.7499809265137,\r
+        "y": 6668.690769672394,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "636270ad.cb1f1",\r
-                "8293c8c0.560c58"\r
+                "8bf7fa79.126fb",\r
+                "ee383b52.01d438"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f630208.bc1d7",\r
+        "id": "5e6235d3.e2f47c",\r
         "type": "for",\r
         "name": "for each vnfc-network-role",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2148.7501945495605,\r
-        "y": 6315.023932933807,\r
-        "z": "34265cd.7205424",\r
+        "x": 2111.7501792907715,\r
+        "y": 6412.02392911911,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "a6245c2f.d57048"\r
+                "c5614b8.e3a3a38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5f5f167.b223a",\r
+        "id": "19871893.cc9847",\r
         "type": "save",\r
         "name": "save vip-ipv4-address-list relationship to cp",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2823.7501182556152,\r
-        "y": 6315.023771762848,\r
-        "z": "34265cd.7205424",\r
+        "x": 2786.750102996826,\r
+        "y": 6412.023767948151,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "af4f9563.46c848",\r
-                "20889d25.78e392"\r
+                "4d809b52.05f224",\r
+                "6355c7af.050d9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "24613f9d.2d98c",\r
+        "id": "a3d18e25.19c118",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3215.583209991455,\r
-        "y": 6288.341553211212,\r
-        "z": "34265cd.7205424",\r
+        "x": 3178.583194732666,\r
+        "y": 6385.341549396515,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "4923f1db.2fcc2",\r
-                "269063c8.ce5a84"\r
+                "fde5bb25.6eab78",\r
+                "96fecd53.204d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "215b3725.6db0e8",\r
+        "id": "10e03ab.3830ec5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3215.5832862854004,\r
-        "y": 6341.34131193161,\r
-        "z": "34265cd.7205424",\r
+        "x": 3178.5832710266113,\r
+        "y": 6438.341308116913,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "97a750a7.0acbc8",\r
-                "269063c8.ce5a84"\r
+                "66f00f4e.933f1",\r
+                "96fecd53.204d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af4f9563.46c848",\r
+        "id": "4d809b52.05f224",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3058.7500953674316,\r
-        "y": 6288.357223033905,\r
-        "z": "34265cd.7205424",\r
+        "x": 3021.7500801086426,\r
+        "y": 6385.357219219208,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "24613f9d.2d98c"\r
+                "a3d18e25.19c118"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20889d25.78e392",\r
+        "id": "6355c7af.050d9",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3067.3216285705566,\r
-        "y": 6340.976367473602,\r
-        "z": "34265cd.7205424",\r
+        "x": 3030.3216133117676,\r
+        "y": 6437.976363658905,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "215b3725.6db0e8"\r
+                "10e03ab.3830ec5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8293c8c0.560c58",\r
+        "id": "ee383b52.01d438",\r
         "type": "for",\r
         "name": "for each vnfc-network-role",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2150.416591644287,\r
-        "y": 6638.357342243195,\r
-        "z": "34265cd.7205424",\r
+        "x": 2113.416576385498,\r
+        "y": 6735.357338428497,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "69d9fcf7.12a64c"\r
+                "8083303a.d06a3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0a7f2e0.3a2078",\r
+        "id": "61408d34.a74df4",\r
         "type": "save",\r
         "name": "save vip-ipv6-address-list relationship to cp",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2820.41654586792,\r
-        "y": 6636.690124988556,\r
-        "z": "34265cd.7205424",\r
+        "x": 2783.416530609131,\r
+        "y": 6733.690121173859,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "84935ce4.e84668",\r
-                "5e735e5d.b462a8"\r
+                "f01d7d25.2f7cb",\r
+                "2d4c9713.b3b4b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32fbd7c1.249f1",\r
+        "id": "bd84552.fe7fe28",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3212.2496376037598,\r
-        "y": 6610.00790643692,\r
-        "z": "34265cd.7205424",\r
+        "x": 3175.2496223449707,\r
+        "y": 6707.007902622223,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "fc4213a2.47c98",\r
-                "269063c8.ce5a84"\r
+                "98387e99.104df8",\r
+                "96fecd53.204d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d624a09c.620df",\r
+        "id": "55bd1a97.bc2b8c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3212.249713897705,\r
-        "y": 6663.007665157318,\r
-        "z": "34265cd.7205424",\r
+        "x": 3175.249698638916,\r
+        "y": 6760.007661342621,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "fd80fcb3.880c8",\r
-                "269063c8.ce5a84"\r
+                "819cfbd9.9a75b8",\r
+                "96fecd53.204d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84935ce4.e84668",\r
+        "id": "f01d7d25.2f7cb",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3055.4165229797363,\r
-        "y": 6610.023576259613,\r
-        "z": "34265cd.7205424",\r
+        "x": 3018.4165077209473,\r
+        "y": 6707.023572444916,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "32fbd7c1.249f1"\r
+                "bd84552.fe7fe28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e735e5d.b462a8",\r
+        "id": "2d4c9713.b3b4b",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3063.9880561828613,\r
-        "y": 6662.64272069931,\r
-        "z": "34265cd.7205424",\r
+        "x": 3026.9880409240723,\r
+        "y": 6759.642716884613,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "d624a09c.620df"\r
+                "55bd1a97.bc2b8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6245c2f.d57048",\r
+        "id": "c5614b8.e3a3a38",\r
         "type": "switchNode",\r
         "name": "switch network-roles match?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2402.083263397217,\r
-        "y": 6315.023609638214,\r
-        "z": "34265cd.7205424",\r
+        "x": 2365.0832481384277,\r
+        "y": 6412.023605823517,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "372012a9.b14566"\r
+                "5a9b0fe2.51ad78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "372012a9.b14566",\r
+        "id": "5a9b0fe2.51ad78",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2588.7501068115234,\r
-        "y": 6315.02409696579,\r
-        "z": "34265cd.7205424",\r
+        "x": 2551.7500915527344,\r
+        "y": 6412.0240931510925,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c5f5f167.b223a"\r
+                "19871893.cc9847"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69d9fcf7.12a64c",\r
+        "id": "8083303a.d06a3",\r
         "type": "switchNode",\r
         "name": "switch network-roles match?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2398.749843597412,\r
-        "y": 6636.690350055695,\r
-        "z": "34265cd.7205424",\r
+        "x": 2361.749828338623,\r
+        "y": 6733.690346240997,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "fc024c49.f1c3f"\r
+                "34a7a8dc.e2f4c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc024c49.f1c3f",\r
+        "id": "34a7a8dc.e2f4c8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2585.4166870117188,\r
-        "y": 6636.69083738327,\r
-        "z": "34265cd.7205424",\r
+        "x": 2548.4166717529297,\r
+        "y": 6733.690833568573,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "d0a7f2e0.3a2078"\r
+                "61408d34.a74df4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d4a09e3.74f01e",\r
+        "id": "1a648e8e.d27131",\r
         "type": "comment",\r
         "name": "SELF-SERVE FORK",\r
         "info": "",\r
         "comments": "",\r
-        "x": 748.4642944335938,\r
-        "y": 968.7976198196411,\r
-        "z": "34265cd.7205424",\r
+        "x": 711.4642791748047,\r
+        "y": 1065.7976160049438,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bb6a45ed.04707",\r
+        "id": "4ee41069.1b1f68",\r
         "type": "comment",\r
         "name": "First, count the subnets for this address family",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2763.750400543213,\r
-        "y": 3247.999765396118,\r
-        "z": "34265cd.7205424",\r
+        "x": 2726.750385284424,\r
+        "y": 3344.999761581421,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b1ade774.cfc288",\r
+        "id": "8fa4cbde.d96c08",\r
         "type": "for",\r
         "name": "for each subnet-data",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3137.0830879211426,\r
-        "y": 3543.000268936157,\r
-        "z": "34265cd.7205424",\r
+        "x": 3100.0830726623535,\r
+        "y": 3640.00026512146,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "1d2a481b.bb5bc8"\r
+                "d467b1f.701725"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d2a481b.bb5bc8",\r
+        "id": "d467b1f.701725",\r
         "type": "switchNode",\r
         "name": "address-families match?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3363.749713897705,\r
-        "y": 3543.000268936157,\r
-        "z": "34265cd.7205424",\r
+        "x": 3326.749698638916,\r
+        "y": 3640.00026512146,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "79d9b537.c3936c"\r
+                "8bb6b15a.782b98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "79d9b537.c3936c",\r
+        "id": "8bb6b15a.782b98",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3543.7496795654297,\r
-        "y": 3543.000675201416,\r
-        "z": "34265cd.7205424",\r
+        "x": 3506.7496643066406,\r
+        "y": 3640.0006713867188,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "d1d8beb4.cea2d8"\r
+                "698bc3f7.e95c9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ca198d0.a53ec8",\r
+        "id": "f041336a.316cd",\r
         "type": "set",\r
         "name": "set af-count to 0",\r
         "xml": "<set>\n<parameter name='af-count' value='0' />\n",\r
         "comments": "",\r
-        "x": 2618.749973297119,\r
-        "y": 3289.6665172576904,\r
-        "z": "34265cd.7205424",\r
+        "x": 2581.74995803833,\r
+        "y": 3386.666513442993,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "70a514e0.1d9e4c",\r
+        "id": "d76c4f09.8e10b8",\r
         "type": "set",\r
         "name": "increment af-count",\r
         "xml": "<set>\n<parameter name='af-count' value='`$af-count + 1`' />\n",\r
         "comments": "",\r
-        "x": 3367.083339691162,\r
-        "y": 3356.333267211914,\r
-        "z": "34265cd.7205424",\r
+        "x": 3330.083324432373,\r
+        "y": 3453.333263397217,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bdf7e6b7.6ee818",\r
+        "id": "80f988bb.accbc8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3183.749713897705,\r
-        "y": 3337.999952316284,\r
-        "z": "34265cd.7205424",\r
+        "x": 3146.749698638916,\r
+        "y": 3434.999948501587,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "70a514e0.1d9e4c",\r
-                "5bb16a61.6e69bc"\r
+                "d76c4f09.8e10b8",\r
+                "1f44979a.e02c88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5bb16a61.6e69bc",\r
+        "id": "1f44979a.e02c88",\r
         "type": "set",\r
         "name": "set subnet-id",\r
         "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",\r
         "comments": "",\r
-        "x": 3348.7497596740723,\r
-        "y": 3311.3332653045654,\r
-        "z": "34265cd.7205424",\r
+        "x": 3311.749744415283,\r
+        "y": 3408.333261489868,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "791dbcea.c3f15c",\r
+        "id": "1f14cd7.70cf733",\r
         "type": "switchNode",\r
         "name": "switch af-count",\r
         "xml": "<switch test='`$af-count`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2608.750385284424,\r
-        "y": 3526.3334341049194,\r
-        "z": "34265cd.7205424",\r
+        "x": 2571.7503700256348,\r
+        "y": 3623.333430290222,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "ed47a0ef.b1bf78",\r
-                "79ae7762.a4525"\r
+                "16183673.7b26a2",\r
+                "30204a0d.e2b17e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ed47a0ef.b1bf78",\r
+        "id": "16183673.7b26a2",\r
         "type": "outcome",\r
         "name": "1",\r
         "xml": "<outcome value='1'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2768.7499046325684,\r
-        "y": 3424.666603088379,\r
-        "z": "34265cd.7205424",\r
+        "x": 2731.7498893737793,\r
+        "y": 3521.6665992736816,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "e053fb41.4c10f8"\r
+                "80e4ac5b.ed4d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e053fb41.4c10f8",\r
+        "id": "80e4ac5b.ed4d6",\r
         "type": "set",\r
         "name": "set subnet-id in vnfc-ip-assignments (temp variable)",\r
         "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",\r
         "comments": "",\r
-        "x": 3042.083209991455,\r
-        "y": 3422.999952316284,\r
-        "z": "34265cd.7205424",\r
+        "x": 3005.083194732666,\r
+        "y": 3519.999948501587,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "79ae7762.a4525",\r
+        "id": "30204a0d.e2b17e",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2768.7498207092285,\r
-        "y": 3626.333522796631,\r
-        "z": "34265cd.7205424",\r
+        "x": 2731.7498054504395,\r
+        "y": 3723.3335189819336,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f9e96cae.86b4f8"\r
+                "60bde60d.7fdc3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9e96cae.86b4f8",\r
+        "id": "60bde60d.7fdc3",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2925.41646194458,\r
-        "y": 3626.333204269409,\r
-        "z": "34265cd.7205424",\r
+        "x": 2888.416446685791,\r
+        "y": 3723.333200454712,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "a683f1c3.23c0e",\r
-                "b1ade774.cfc288",\r
-                "99f86360.f7c048",\r
-                "5e59b7e1.f58dd8"\r
+                "2502e8d8.464bd",\r
+                "8fa4cbde.d96c08",\r
+                "9fc4555.7a3cfa8",\r
+                "911a7c16.59a3f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d1d8beb4.cea2d8",\r
+        "id": "698bc3f7.e95c9c",\r
         "type": "switchNode",\r
         "name": "switch network-start-address",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3738.749858856201,\r
-        "y": 3541.3335189819336,\r
-        "z": "34265cd.7205424",\r
+        "x": 3701.749843597412,\r
+        "y": 3638.3335151672363,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "2066aba2.d3bb4c",\r
-                "f3e101cd.85b1b8"\r
+                "319a767b.d617b2",\r
+                "ccaed42d.bbe328"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2066aba2.d3bb4c",\r
+        "id": "319a767b.d617b2",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3935.416706085205,\r
-        "y": 3476.333129644394,\r
-        "z": "34265cd.7205424",\r
+        "x": 3898.416690826416,\r
+        "y": 3573.3331258296967,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c6a0914d.3826e8"\r
+                "8b1ae825.01b258"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3e101cd.85b1b8",\r
+        "id": "ccaed42d.bbe328",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3928.512104034424,\r
-        "y": 3610.6190412044525,\r
-        "z": "34265cd.7205424",\r
+        "x": 3891.5120887756348,\r
+        "y": 3707.6190373897552,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "4cd6ad1.9e140d4"\r
+                "e6e8901e.ce83d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4cd6ad1.9e140d4",\r
+        "id": "e6e8901e.ce83d8",\r
         "type": "switchNode",\r
         "name": "switch cidr-mask",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4083.749897003174,\r
-        "y": 3609.6662480831146,\r
-        "z": "34265cd.7205424",\r
+        "x": 4046.7498817443848,\r
+        "y": 3706.6662442684174,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f5b0bc14.89cdb8",\r
-                "78b8442f.309bb4"\r
+                "32f80f7a.7278e",\r
+                "5d27e1c1.0a5b88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5b0bc14.89cdb8",\r
+        "id": "32f80f7a.7278e",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4238.749973297119,\r
-        "y": 3539.66654753685,\r
-        "z": "34265cd.7205424",\r
+        "x": 4201.74995803833,\r
+        "y": 3636.6665437221527,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "892836a6.bb30b8"\r
+                "fe4ceb3b.c7ac88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "78b8442f.309bb4",\r
+        "id": "5d27e1c1.0a5b88",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4241.845769882202,\r
-        "y": 3672.2856347560883,\r
-        "z": "34265cd.7205424",\r
+        "x": 4204.845754623413,\r
+        "y": 3769.285630941391,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "8baea399.050c9"\r
+                "c5140624.bb6f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67a6a045.51b5d",\r
+        "id": "c6664773.42391",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2110.4165840148926,\r
-        "y": 3146.333204269409,\r
-        "z": "34265cd.7205424",\r
+        "x": 2073.4165687561035,\r
+        "y": 3243.333200454712,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "14f67782.825778"\r
+                "632ebb0f.6b72ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c6a0914d.3826e8",\r
+        "id": "8b1ae825.01b258",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4080.416633605957,\r
-        "y": 3476.3328969478607,\r
-        "z": "34265cd.7205424",\r
+        "x": 4043.416618347168,\r
+        "y": 3573.3328931331635,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "38e6ba0e.ecd3ae",\r
-                "f3cab335.7ec9f"\r
+                "cb15322d.db07d8",\r
+                "1980bda6.0907fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "892836a6.bb30b8",\r
+        "id": "fe4ceb3b.c7ac88",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4385.416488647461,\r
-        "y": 3537.9997642040253,\r
-        "z": "34265cd.7205424",\r
+        "x": 4348.416473388672,\r
+        "y": 3634.999760389328,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "5e50004f.2c9f",\r
-                "f3cab335.7ec9f"\r
+                "7d616bdb.daafe4",\r
+                "1980bda6.0907fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eafa8b76.275b48",\r
+        "id": "66035d73.07c344",\r
         "type": "comment",\r
         "name": "Ignore address families with no addresses",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2384.74995803833,\r
-        "y": 3076.666700363159,\r
-        "z": "34265cd.7205424",\r
+        "x": 2347.749942779541,\r
+        "y": 3173.666696548462,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5615f88.05ae28",\r
+        "id": "c3cf109b.3ee48",\r
         "type": "switchNode",\r
         "name": "switch invariant-uuid",\r
         "xml": "<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].invariant-uuid`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1355.4167976379395,\r
-        "y": 4706.333078384399,\r
-        "z": "34265cd.7205424",\r
+        "x": 1318.4167823791504,\r
+        "y": 4803.333074569702,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "32f079b9.ff27d6",\r
-                "1e96f66.5d21f8a"\r
+                "1816f4a4.8ea5ab",\r
+                "faa47b4f.e3b78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32f079b9.ff27d6",\r
+        "id": "1816f4a4.8ea5ab",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1537.083209991455,\r
-        "y": 4682.999708175659,\r
-        "z": "34265cd.7205424",\r
+        "x": 1500.083194732666,\r
+        "y": 4779.999704360962,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f9cc9731.038f7"\r
+                "927d4431.204cf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e96f66.5d21f8a",\r
+        "id": "faa47b4f.e3b78",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1535.178482055664,\r
-        "y": 4729.785535812378,\r
-        "z": "34265cd.7205424",\r
+        "x": 1498.178466796875,\r
+        "y": 4826.785531997681,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c87af5c.2b49f88"\r
+                "486da9cb.5e0db"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9cc9731.038f7",\r
+        "id": "927d4431.204cf",\r
         "type": "save",\r
         "name": "save vnfc to A&AI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1698.7498359680176,\r
-        "y": 4684.666700363159,\r
-        "z": "34265cd.7205424",\r
+        "x": 1661.7498207092285,\r
+        "y": 4781.666696548462,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "d4c69512.b7a85",\r
-                "cb5ae333.4bb6c"\r
+                "ed23263a.02e4b",\r
+                "fd219437.f0a108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6f8df46.880ce8",\r
+        "id": "32e92ddc.ae5c1a",\r
         "type": "switchNode",\r
         "name": "switch input cloud-owner",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 614.4641952514648,\r
-        "y": 358.65472888946533,\r
-        "z": "34265cd.7205424",\r
+        "x": 577.4641799926758,\r
+        "y": 455.65472507476807,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "6677fe8a.aff6a",\r
-                "6295c766.2daaa8"\r
+                "6af710a4.0530e8",\r
+                "2bef5348.d878fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6677fe8a.aff6a",\r
+        "id": "6af710a4.0530e8",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 797.7975692749023,\r
-        "y": 328.65471744537354,\r
-        "z": "34265cd.7205424",\r
+        "x": 760.7975540161133,\r
+        "y": 425.65471363067627,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "39261ade.66ad8e"\r
+                "53f56a83.697074"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6295c766.2daaa8",\r
+        "id": "2bef5348.d878fc",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 797.5594749450684,\r
-        "y": 369.6072111129761,\r
-        "z": "34265cd.7205424",\r
+        "x": 760.5594596862793,\r
+        "y": 466.6072072982788,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "a2677766.fe3f"\r
+                "cd4db176.affc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39261ade.66ad8e",\r
+        "id": "53f56a83.697074",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 932.7975234985352,\r
-        "y": 326.98805713653564,\r
-        "z": "34265cd.7205424",\r
+        "x": 895.7975082397461,\r
+        "y": 423.9880533218384,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a2677766.fe3f",\r
+        "id": "cd4db176.affc4",\r
         "type": "set",\r
         "name": "set prop.cloud-region.cloud-owner",\r
         "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`' />\n",\r
         "comments": "",\r
-        "x": 1014.4641799926758,\r
-        "y": 368.6547384262085,\r
-        "z": "34265cd.7205424",\r
+        "x": 977.4641647338867,\r
+        "y": 465.65473461151123,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d918a5d3.4b678",\r
+        "id": "bb29ba7b.f486c",\r
         "type": "call",\r
         "name": "call self-serve-vf-module-forking-logic",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-forking-logic' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 646.0515670776367,\r
-        "y": 910.048059463501,\r
-        "z": "34265cd.7205424",\r
+        "x": 609.0515518188477,\r
+        "y": 1007.0480556488037,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7933c6b5.bef96",\r
+        "id": "ac910a9d.5490c8",\r
         "type": "switchNode",\r
         "name": "switch ss.self-serve-flag",\r
         "xml": "<switch test=\"`$ss.self-serve-flag`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 604.1943054199219,\r
-        "y": 1137.0481281280518,\r
-        "z": "34265cd.7205424",\r
+        "x": 567.1942901611328,\r
+        "y": 1234.0481243133545,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "aa4d9d31.8db2d",\r
-                "8b34e2b6.f12a5"\r
+                "4dc0eb9c.507774",\r
+                "edaf5038.5b0c1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa4d9d31.8db2d",\r
+        "id": "4dc0eb9c.507774",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 824.908504486084,\r
-        "y": 1254.6190271377563,\r
-        "z": "34265cd.7205424",\r
+        "x": 787.9084892272949,\r
+        "y": 1351.619023323059,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b2cbded2.837b2"\r
+                "b209b55a.0520c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b34e2b6.f12a5",\r
+        "id": "edaf5038.5b0c1",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 825.4799575805664,\r
-        "y": 1013.4766645431519,\r
-        "z": "34265cd.7205424",\r
+        "x": 788.4799423217773,\r
+        "y": 1110.4766607284546,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "be10b89.7317448"\r
+                "c72ffbe.21eac88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66d0262b.c1316",\r
+        "id": "6e1b2ed4.8fd6b8",\r
         "type": "call",\r
         "name": "call check for VNF-API-preload and copy",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='gw-vfmodule-update' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 657.2499923706055,\r
-        "y": 7316.2509298324585,\r
-        "z": "34265cd.7205424",\r
+        "x": 620.2499771118164,\r
+        "y": 7413.250926017761,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b097fd2d.1c3e2",\r
+        "id": "bdff604f.42ef3",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 979.9999618530273,\r
-        "y": 487.6302709579468,\r
-        "z": "34265cd.7205424",\r
+        "x": 942.9999465942383,\r
+        "y": 584.6302671432495,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "7e3f0173.cdd7c8",\r
-                "52adbd59.e3948c"\r
+                "bac0765.fd1d008",\r
+                "3e420238.62f4c6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "52adbd59.e3948c",\r
+        "id": "3e420238.62f4c6",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"If svc-action is 'assign' then request-action must be 'CreateVfModuleInstance'\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1167.9166450500488,\r
-        "y": 471.26124906539917,\r
-        "z": "34265cd.7205424",\r
+        "x": 1130.9166297912598,\r
+        "y": 568.2612452507019,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2b23f970.b0e516",\r
+        "id": "a8481a22.9610b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1082.2022666931152,\r
-        "y": 536.1183648109436,\r
-        "z": "34265cd.7205424",\r
+        "x": 1045.2022514343262,\r
+        "y": 633.1183609962463,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "fd16e118.302da8",\r
-                "7e3f0173.cdd7c8"\r
+                "8f2747d2.b35a78",\r
+                "bac0765.fd1d008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd16e118.302da8",\r
+        "id": "8f2747d2.b35a78",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error reading VF_MODULE_MODEL table\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1279.5236701965332,\r
-        "y": 514.6540641784668,\r
-        "z": "34265cd.7205424",\r
+        "x": 1242.5236549377441,\r
+        "y": 611.6540603637695,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "19ca61b5.8fa5c6",\r
+        "id": "12fc934c.3bd04d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1096.4879722595215,\r
-        "y": 581.2612175941467,\r
-        "z": "34265cd.7205424",\r
+        "x": 1059.4879570007324,\r
+        "y": 678.2612137794495,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "cb67a353.3c75b",\r
-                "7e3f0173.cdd7c8"\r
+                "6cfbe00a.c48468",\r
+                "bac0765.fd1d008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb67a353.3c75b",\r
+        "id": "6cfbe00a.c48468",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1291.130859375,\r
-        "y": 558.2255039215088,\r
-        "z": "34265cd.7205424",\r
+        "x": 1254.130844116211,\r
+        "y": 655.2255001068115,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "57fdbbee.7122f4",\r
+        "id": "b40ea227.e7972",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1058.095230102539,\r
-        "y": 709.3326988220215,\r
-        "z": "34265cd.7205424",\r
+        "x": 1021.09521484375,\r
+        "y": 806.3326950073242,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f134d1f3.94396",\r
-                "7e3f0173.cdd7c8"\r
+                "4f3db911.0a293",\r
+                "bac0765.fd1d008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f134d1f3.94396",\r
+        "id": "4f3db911.0a293",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"There are no VNFs defined in MD-SAL\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1265.0594863891602,\r
-        "y": 680.3684234619141,\r
-        "z": "34265cd.7205424",\r
+        "x": 1228.059471130371,\r
+        "y": 777.3684196472168,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a0d2ddbe.4ce55",\r
+        "id": "5cd79a68.a802ec",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 922.3809356689453,\r
-        "y": 817.3326988220215,\r
-        "z": "34265cd.7205424",\r
+        "x": 885.3809204101562,\r
+        "y": 914.3326950073242,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "bb2e5ad9.46ca68",\r
-                "7e3f0173.cdd7c8"\r
+                "866d0c00.2ab2",\r
+                "bac0765.fd1d008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bb2e5ad9.46ca68",\r
+        "id": "866d0c00.2ab2",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1124.345230102539,\r
-        "y": 792.6898679733276,\r
-        "z": "34265cd.7205424",\r
+        "x": 1087.34521484375,\r
+        "y": 889.6898641586304,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b91cfedb.3fa03",\r
+        "id": "58bfc070.0570d8",\r
         "type": "call",\r
         "name": "call self-serve-vf-module-assign",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-assign' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1247.3325996398926,\r
-        "y": 926.1062297821045,\r
-        "z": "34265cd.7205424",\r
+        "x": 1210.3325843811035,\r
+        "y": 1023.1062259674072,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "70c27670.277bc"\r
+                "d28cd7af.2db2a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70c27670.277bc",\r
+        "id": "d28cd7af.2db2a8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1467.6301803588867,\r
-        "y": 925.5942611694336,\r
-        "z": "34265cd.7205424",\r
+        "x": 1430.6301651000977,\r
+        "y": 1022.5942573547363,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "adee9682.834c08"\r
+                "dbee4993.a7efc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b74d386.947184",\r
+        "id": "9f93468d.33b288",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 1200.035270690918,\r
-        "y": 1171.367787361145,\r
-        "z": "34265cd.7205424",\r
+        "x": 1163.035255432129,\r
+        "y": 1268.3677835464478,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f3642c27.ec6008",\r
+        "id": "b8c19138.abe93",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vnfend.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1186.2494812011719,\r
-        "y": 1017.1094055175781,\r
-        "z": "34265cd.7205424",\r
+        "x": 1149.2494659423828,\r
+        "y": 1114.1094017028809,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d714905.ce5a3f",\r
+        "id": "62bf18c3.b6afd8",\r
         "type": "set",\r
         "name": "set order-status to PendingCreate",\r
         "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",\r
         "comments": "",\r
-        "x": 1255.2732429504395,\r
-        "y": 971.0702590942383,\r
-        "z": "34265cd.7205424",\r
+        "x": 1218.2732276916504,\r
+        "y": 1068.070255279541,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "be10b89.7317448",\r
+        "id": "c72ffbe.21eac88",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 996.3687133789062,\r
-        "y": 1012.5700912475586,\r
-        "z": "34265cd.7205424",\r
+        "x": 959.3686981201172,\r
+        "y": 1109.5700874328613,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b91cfedb.3fa03",\r
-                "d714905.ce5a3f",\r
-                "f3642c27.ec6008",\r
-                "2b74d386.947184",\r
-                "57df4d97.1b3e74",\r
-                "60730953.c387"\r
+                "58bfc070.0570d8",\r
+                "62bf18c3.b6afd8",\r
+                "b8c19138.abe93",\r
+                "9f93468d.33b288",\r
+                "b7e13818.1bbbd",\r
+                "f83606b1.57aa68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e3f0173.cdd7c8",\r
+        "id": "bac0765.fd1d008",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1706.5477905273438,\r
-        "y": 1193.904673576355,\r
-        "z": "34265cd.7205424",\r
+        "x": 1669.5477752685547,\r
+        "y": 1290.9046697616577,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "78f1021d.4797bc",\r
-                "d65a69c8.cf6ba"\r
+                "50c201dc.9bc778",\r
+                "adbc50ce.7d37f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "adee9682.834c08",\r
+        "id": "dbee4993.a7efc8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1613.6309051513672,\r
-        "y": 924.9756164550781,\r
-        "z": "34265cd.7205424",\r
+        "x": 1576.6308898925781,\r
+        "y": 1021.9756126403809,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "f38280a4.feb028",\r
-                "7e3f0173.cdd7c8"\r
+                "dece85a0.4a47e",\r
+                "bac0765.fd1d008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f38280a4.feb028",\r
+        "id": "dece85a0.4a47e",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1811.3096618652344,\r
-        "y": 904.2613258361816,\r
-        "z": "34265cd.7205424",\r
+        "x": 1774.3096466064453,\r
+        "y": 1001.2613220214844,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "41d32aa.5f68754",\r
+        "id": "39450462.cb0f84",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2518.750015258789,\r
-        "y": 1423.4688367843628,\r
-        "z": "34265cd.7205424",\r
+        "x": 2481.75,\r
+        "y": 1520.4688329696655,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bdb7e590.4bbf98",\r
+        "id": "2a30af16.7b82",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2324.8211059570312,\r
-        "y": 1442.9331254959106,\r
-        "z": "34265cd.7205424",\r
+        "x": 2287.821090698242,\r
+        "y": 1539.9331216812134,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "41d32aa.5f68754",\r
-                "1d6f9b4e.71254d"\r
+                "39450462.cb0f84",\r
+                "8964842b.6432c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e750571d.ca626",\r
+        "id": "7e580eff.038e2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1029.8213348388672,\r
-        "y": 1660.5997676849365,\r
-        "z": "34265cd.7205424",\r
+        "x": 992.8213195800781,\r
+        "y": 1757.5997638702393,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "1a7b6a78.6a325e",\r
-                "1d6f9b4e.71254d"\r
+                "d95a6d03.0b146",\r
+                "8964842b.6432c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "71cefe31.79b508",\r
+        "id": "caeb64b7.ba2878",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1031.488021850586,\r
-        "y": 1703.933141708374,\r
-        "z": "34265cd.7205424",\r
+        "x": 994.4880065917969,\r
+        "y": 1800.9331378936768,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "808569e9.5d9618",\r
-                "1d6f9b4e.71254d"\r
+                "6195cb44.48d0f4",\r
+                "8964842b.6432c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a7b6a78.6a325e",\r
+        "id": "d95a6d03.0b146",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Cloud region not found in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1233.75,\r
-        "y": 1637.3855438232422,\r
-        "z": "34265cd.7205424",\r
+        "x": 1196.749984741211,\r
+        "y": 1734.385540008545,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "808569e9.5d9618",\r
+        "id": "6195cb44.48d0f4",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error retrieving cloud region from AAI.  Is AAI down?\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1229.1667404174805,\r
-        "y": 1685.7188806533813,\r
-        "z": "34265cd.7205424",\r
+        "x": 1192.1667251586914,\r
+        "y": 1782.718876838684,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2b8167ac.ee8e3",\r
+        "id": "42e790a.f88747",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 914.4045486450195,\r
-        "y": 1884.599820137024,\r
-        "z": "34265cd.7205424",\r
+        "x": 877.4045333862305,\r
+        "y": 1981.5998163223267,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b31a2d90.6e6418",\r
-                "1d6f9b4e.71254d"\r
+                "69f063a.3b46c9c",\r
+                "8964842b.6432c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b31a2d90.6e6418",\r
+        "id": "69f063a.3b46c9c",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1107.0832061767578,\r
-        "y": 1857.3855504989624,\r
-        "z": "34265cd.7205424",\r
+        "x": 1070.0831909179688,\r
+        "y": 1954.3855466842651,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1d6f9b4e.71254d",\r
+        "id": "8964842b.6432c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1708.5714492797852,\r
-        "y": 2145.540556907654,\r
-        "z": "34265cd.7205424",\r
+        "x": 1671.571434020996,\r
+        "y": 2242.5405530929565,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "caca347e.8787d",\r
-                "a38241eb.287ec8"\r
+                "3728e3f3.742a9c",\r
+                "3312acbf.c98b04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20ed866d.bb0ce2",\r
+        "id": "6152a91e.e447b",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2823.74991607666,\r
-        "y": 2633.7741470336914,\r
-        "z": "34265cd.7205424",\r
+        "x": 2786.749900817871,\r
+        "y": 2730.774143218994,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9af3e55f.6087e",\r
+        "id": "fddcb313.1cf958",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2441.011405944824,\r
-        "y": 2684.19135761261,\r
-        "z": "34265cd.7205424",\r
+        "x": 2404.011390686035,\r
+        "y": 2781.1913537979126,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "20ed866d.bb0ce2",\r
-                "9ea0a8d5.338e78",\r
-                "bb2b8a64.4eda98"\r
+                "6152a91e.e447b",\r
+                "d8f50cf3.b660b8",\r
+                "7e407330.b6b2bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b201b2ed.f32f68",\r
+        "id": "8d60dce.3fe77a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3002.083209991455,\r
-        "y": 2324.524369239807,\r
-        "z": "34265cd.7205424",\r
+        "x": 2965.083194732666,\r
+        "y": 2421.52436542511,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "c392950a.4cd7e",\r
-                "9af3e55f.6087e"\r
+                "61ebd127.67b2b",\r
+                "fddcb313.1cf958"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c392950a.4cd7e",\r
+        "id": "61ebd127.67b2b",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3201.6664505004883,\r
-        "y": 2291.1673135757446,\r
-        "z": "34265cd.7205424",\r
+        "x": 3164.666435241699,\r
+        "y": 2388.1673097610474,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "886e3c52.8c2238",\r
+        "id": "59ff4e4b.8c6b68",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2173.987762451172,\r
-        "y": 2472.1076765060425,\r
-        "z": "34265cd.7205424",\r
+        "x": 2136.987747192383,\r
+        "y": 2569.107672691345,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "3be3b1ce.879d46",\r
-                "9af3e55f.6087e"\r
+                "9b4ca4c4.41e2c8",\r
+                "fddcb313.1cf958"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3be3b1ce.879d46",\r
+        "id": "9b4ca4c4.41e2c8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error retrieving preload-information\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2379.999870300293,\r
-        "y": 2446.750412940979,\r
-        "z": "34265cd.7205424",\r
+        "x": 2342.999855041504,\r
+        "y": 2543.7504091262817,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b6c26cf.773831",\r
+        "id": "59263ccb.02e03c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4247.083518981934,\r
-        "y": 4512.246376037598,\r
-        "z": "34265cd.7205424",\r
+        "x": 4210.0835037231445,\r
+        "y": 4609.2463722229,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f3cab335.7ec9f",\r
+        "id": "1980bda6.0907fa",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3859.3447341918945,\r
-        "y": 4558.913317203522,\r
-        "z": "34265cd.7205424",\r
+        "x": 3822.3447189331055,\r
+        "y": 4655.9133133888245,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b6c26cf.773831",\r
-                "3a601dac.7a4482",\r
-                "aee71bd7.cb4458"\r
+                "59263ccb.02e03c",\r
+                "15beb6ed.58fac9",\r
+                "98fe2567.5c7fd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4023444f.ec71fc",\r
+        "id": "a8978c6d.0307c8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1942.0833206176758,\r
-        "y": 2955.718928337097,\r
-        "z": "34265cd.7205424",\r
+        "x": 1905.0833053588867,\r
+        "y": 3052.7189245224,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "38e6ba0e.ecd3ae",\r
+        "id": "cb15322d.db07d8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4271.666809082031,\r
-        "y": 3431.413005590439,\r
-        "z": "34265cd.7205424",\r
+        "x": 4234.666793823242,\r
+        "y": 3528.4130017757416,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5e50004f.2c9f",\r
+        "id": "7d616bdb.daafe4",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4586.666831970215,\r
-        "y": 3508.9130125045776,\r
-        "z": "34265cd.7205424",\r
+        "x": 4549.666816711426,\r
+        "y": 3605.9130086898804,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1c39b653.2b576a",\r
+        "id": "cb1415b6.cece5",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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      `\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3634.1667861938477,\r
-        "y": 3628.9130296707153,\r
-        "z": "34265cd.7205424",\r
+        "x": 3597.1667709350586,\r
+        "y": 3725.913025856018,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d4e308ce.5712b",\r
+        "id": "e1550da4.520918",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error reading VFC_RELATED_NETWORK_ROLE table\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2074.861038208008,\r
-        "y": 3865.441397666931,\r
-        "z": "34265cd.7205424",\r
+        "x": 2037.8610229492188,\r
+        "y": 3962.441393852234,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e1873883.a0b338",\r
+        "id": "7b08fad7.a132ec",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2882.361099243164,\r
-        "y": 4050.4411458969116,\r
-        "z": "34265cd.7205424",\r
+        "x": 2845.361083984375,\r
+        "y": 4147.441142082214,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "64b6a50b.0e40cc",\r
+        "id": "ce58c07c.b817d",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error saving vnfc to AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2258.7499465942383,\r
-        "y": 4673.080787658691,\r
-        "z": "34265cd.7205424",\r
+        "x": 2221.749931335449,\r
+        "y": 4770.080783843994,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b8f70cec.245ee",\r
+        "id": "c7eb84c5.f0e708",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3735.555435180664,\r
-        "y": 5868.081328392029,\r
-        "z": "34265cd.7205424",\r
+        "x": 3698.555419921875,\r
+        "y": 5965.0813245773315,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "deea8b7a.34ee38",\r
+        "id": "387bacc5.df1d84",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3349.066925048828,\r
-        "y": 5910.998540878296,\r
-        "z": "34265cd.7205424",\r
+        "x": 3312.066909790039,\r
+        "y": 6007.998537063599,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b8f70cec.245ee",\r
-                "c7108bf6.17f21",\r
-                "eb62798f.37c47"\r
+                "c7eb84c5.f0e708",\r
+                "e35102b5.ead4c",\r
+                "62bbfbdf.d34f3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ecec95d0.f03d18",\r
+        "id": "8a14b675.cd4478",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating vnfc relationships in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1896.09130859375,\r
-        "y": 4786.83000087738,\r
-        "z": "34265cd.7205424",\r
+        "x": 1859.091293334961,\r
+        "y": 4883.829997062683,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4b5a4f9a.72aaf8",\r
+        "id": "b8157190.3209b8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Not-found error updating vnfc relationships\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1895.5556297302246,\r
-        "y": 4843.794567108154,\r
-        "z": "34265cd.7205424",\r
+        "x": 1858.5556144714355,\r
+        "y": 4940.794563293457,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "56c543eb.6150dc",\r
+        "id": "3296dfd.dbc53a",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error saving cp object to AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2338.055639266968,\r
-        "y": 5013.080267906189,\r
-        "z": "34265cd.7205424",\r
+        "x": 2301.0556240081787,\r
+        "y": 5110.080264091492,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d01f264c.61c318",\r
+        "id": "804becc1.78da28",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating cp relationship to l3-network in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2993.0557022094727,\r
-        "y": 5465.302522659302,\r
-        "z": "34265cd.7205424",\r
+        "x": 2956.0556869506836,\r
+        "y": 5562.3025188446045,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "64482d7f.371044",\r
+        "id": "7e2874de.0ebfec",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating cp relationship to l3-network\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2995.5557022094727,\r
-        "y": 5527.802525520325,\r
-        "z": "34265cd.7205424",\r
+        "x": 2958.5556869506836,\r
+        "y": 5624.802521705627,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7a163627.fcef3",\r
+        "id": "9d950f64.0102",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating cp relationship to l3-network and vlan-tag in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3324.1273040771484,\r
-        "y": 5625.302538871765,\r
-        "z": "34265cd.7205424",\r
+        "x": 3287.1272888183594,\r
+        "y": 5722.302535057068,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "57dc1477.8da4b4",\r
+        "id": "b2d45985.f53aa8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating cp relationship to l3-network and vlan-tag\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3326.6274032592773,\r
-        "y": 5687.802539825439,\r
-        "z": "34265cd.7205424",\r
+        "x": 3289.6273880004883,\r
+        "y": 5784.802536010742,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a7be1c39.6ee63",\r
+        "id": "c5ce8f8a.5c8cc",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error creating l3-interface-ipv4-address-list object in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4015.9730072021484,\r
-        "y": 5096.552495002747,\r
-        "z": "34265cd.7205424",\r
+        "x": 3978.9729919433594,\r
+        "y": 5193.552491188049,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a4494b11.30c988",\r
+        "id": "d6d217c2.575b08",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating l3-interface-ipv4-address-list relationships in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4013.4730072021484,\r
-        "y": 5175.3025007247925,\r
-        "z": "34265cd.7205424",\r
+        "x": 3976.4729919433594,\r
+        "y": 5272.302496910095,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3b6a1bff.11e25c",\r
+        "id": "eacb1b8b.899fc",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating l3-interface-ipv4-address-list relationships\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4015.97274017334,\r
-        "y": 5235.302507400513,\r
-        "z": "34265cd.7205424",\r
+        "x": 3978.972724914551,\r
+        "y": 5332.302503585815,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1d21480c.1addf8",\r
+        "id": "e1c04fe9.9abb6",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error creating l3-interface-ipv6-address-list object in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4019.7227478027344,\r
-        "y": 5285.302512168884,\r
-        "z": "34265cd.7205424",\r
+        "x": 3982.7227325439453,\r
+        "y": 5382.302508354187,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e3d10ed9.82b7b8",\r
+        "id": "b00c290a.190b9",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating l3-interface-ipv6-address-list relationships in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4018.472480773926,\r
-        "y": 5346.552515029907,\r
-        "z": "34265cd.7205424",\r
+        "x": 3981.4724655151367,\r
+        "y": 5443.55251121521,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fedf80c9.88e5f",\r
+        "id": "f9dafb05.46c9b",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating l3-interface-ipv6-address-list relationships\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4019.722480773926,\r
-        "y": 5406.5525159835815,\r
-        "z": "34265cd.7205424",\r
+        "x": 3982.7224655151367,\r
+        "y": 5503.552512168884,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "aee903cd.9f721",\r
+        "id": "cf7438ea.85212",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4429.722415924072,\r
-        "y": 5532.802444458008,\r
-        "z": "34265cd.7205424",\r
+        "x": 4392.722400665283,\r
+        "y": 5629.802440643311,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b8d50b6.e90cc78",\r
+        "id": "4f9c607a.ce1c88",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4049.483901977539,\r
-        "y": 5577.469656944275,\r
-        "z": "34265cd.7205424",\r
+        "x": 4012.48388671875,\r
+        "y": 5674.469653129578,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "aee903cd.9f721",\r
-                "28125649.296d72",\r
-                "a39b4b61.59b038"\r
+                "cf7438ea.85212",\r
+                "a33ba8b8.1d7cc",\r
+                "de495219.3e8f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8395e0d5.a4ecb8",\r
+        "id": "26a60a34.f6645e",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3853.1943283081055,\r
-        "y": 6997.246689796448,\r
-        "z": "34265cd.7205424",\r
+        "x": 3816.1943130493164,\r
+        "y": 7094.2466859817505,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "269063c8.ce5a84",\r
+        "id": "96fecd53.204d4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3465.455551147461,\r
-        "y": 7047.663359642029,\r
-        "z": "34265cd.7205424",\r
+        "x": 3428.455535888672,\r
+        "y": 7144.6633558273315,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "8395e0d5.a4ecb8",\r
-                "8d26e950.2b598",\r
-                "a7b746c4.2d389"\r
+                "26a60a34.f6645e",\r
+                "ac95a18e.e9d4e8",\r
+                "23f95643.5a124a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd80fcb3.880c8",\r
+        "id": "819cfbd9.9a75b8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating vip-ipv4-address-list relationship to cp\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3403.194622039795,\r
-        "y": 6635.996907234192,\r
-        "z": "34265cd.7205424",\r
+        "x": 3366.194606781006,\r
+        "y": 6732.996903419495,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fc4213a2.47c98",\r
+        "id": "98387e99.104df8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv4-address-list relationship to cp in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3396.944892883301,\r
-        "y": 6572.247441291809,\r
-        "z": "34265cd.7205424",\r
+        "x": 3359.9448776245117,\r
+        "y": 6669.247437477112,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "97a750a7.0acbc8",\r
+        "id": "66f00f4e.933f1",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating vip-ipv4-address-list relationship to cp\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3408.194625854492,\r
-        "y": 6323.496886253357,\r
-        "z": "34265cd.7205424",\r
+        "x": 3371.194610595703,\r
+        "y": 6420.49688243866,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4923f1db.2fcc2",\r
+        "id": "fde5bb25.6eab78",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv4-address-list relationship to cp in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3408.194892883301,\r
-        "y": 6262.247422218323,\r
-        "z": "34265cd.7205424",\r
+        "x": 3371.1948776245117,\r
+        "y": 6359.2474184036255,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "84c51507.94d668",\r
+        "id": "131ea97.a877f57",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating vip-ipv6-address-list relationships\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2775.6945877075195,\r
-        "y": 6523.496897697449,\r
-        "z": "34265cd.7205424",\r
+        "x": 2738.6945724487305,\r
+        "y": 6620.4968938827515,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4a19d7b6.f2c47",\r
+        "id": "7345e678.7bf88",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv6-address-list relationships in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2774.444580078125,\r
-        "y": 6465.997433662415,\r
-        "z": "34265cd.7205424",\r
+        "x": 2737.444564819336,\r
+        "y": 6562.997429847717,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "48c2cba4.91f6cc",\r
+        "id": "3bd1f48b.4c0b2c",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error saving vip-ipv6-address-list\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2438.194564819336,\r
-        "y": 6409.746890068054,\r
-        "z": "34265cd.7205424",\r
+        "x": 2401.194549560547,\r
+        "y": 6506.746886253357,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "37375282.76ddb6",\r
+        "id": "67c04d7.9f55234",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error saving vip-ipv6-address-list in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2438.194564819336,\r
-        "y": 6355.996887207031,\r
-        "z": "34265cd.7205424",\r
+        "x": 2401.194549560547,\r
+        "y": 6452.996883392334,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bdc62da9.93398",\r
+        "id": "703340a7.64aea8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error updating vip-ipv4-address-list relationships\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2784.4445838928223,\r
-        "y": 6198.496878623962,\r
-        "z": "34265cd.7205424",\r
+        "x": 2747.444568634033,\r
+        "y": 6295.496874809265,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c60c031b.634f38",\r
+        "id": "1eb209e1.85fe36",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating vip-ipv4-address-list relationships in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2785.6945877075195,\r
-        "y": 6140.996874809265,\r
-        "z": "34265cd.7205424",\r
+        "x": 2748.6945724487305,\r
+        "y": 6237.996870994568,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5573d94b.dc5",\r
+        "id": "5c926ac4.441d54",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Not-found error saving vip-ipv4-address-list\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2441.944564819336,\r
-        "y": 6097.246870994568,\r
-        "z": "34265cd.7205424",\r
+        "x": 2404.944549560547,\r
+        "y": 6194.246867179871,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f4049c01.0aeaf",\r
+        "id": "ac68386.d27d148",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error saving vip-ipv4-address-list in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2438.194564819336,\r
-        "y": 6029.746867179871,\r
-        "z": "34265cd.7205424",\r
+        "x": 2401.194549560547,\r
+        "y": 6126.746863365173,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "21dc9b2.c9b4164",\r
+        "id": "8ce17d26.7481f8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1935.6945304870605,\r
-        "y": 5954.746864318848,\r
-        "z": "34265cd.7205424",\r
+        "x": 1898.6945152282715,\r
+        "y": 6051.74686050415,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c98dc3b.19af54",\r
+        "id": "bcecc401.bf37b",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating vf-module relationships in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1936.9445266723633,\r
-        "y": 5895.996856212616,\r
-        "z": "34265cd.7205424",\r
+        "x": 1899.9445114135742,\r
+        "y": 5992.996852397919,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "23db4204.137326",\r
+        "id": "9929cc19.031428",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n    <parameter name=\"error-message\" value=\"Error updating vf-module in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1088.749984741211,\r
-        "y": 4326.830564498901,\r
-        "z": "34265cd.7205424",\r
+        "x": 1051.7499694824219,\r
+        "y": 4423.830560684204,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c333832f.3cfc3",\r
+        "id": "da0980a4.747a78",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1092.499984741211,\r
-        "y": 4403.080567359924,\r
-        "z": "34265cd.7205424",\r
+        "x": 1055.4999694824219,\r
+        "y": 4500.080563545227,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9f112544.7f8a58",\r
+        "id": "ebdeb223.d9f918",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vfmodule.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 476.07337188720703,\r
-        "y": 7964.7099623680115,\r
-        "z": "34265cd.7205424",\r
+        "x": 439.07335662841797,\r
+        "y": 8061.709958553314,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "84fdd3bf.927fd",\r
+        "id": "54266176.fdc52",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode - PUT vf-module",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 573.4065093994141,\r
-        "y": 7823.908843040466,\r
-        "z": "34265cd.7205424",\r
+        "x": 536.406494140625,\r
+        "y": 7920.908839225769,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "48031f36.06a36",\r
-                "61c1ba7d.9ba324"\r
+                "1c4e5947.7ebd1f",\r
+                "8333ad7b.b22908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48031f36.06a36",\r
+        "id": "1c4e5947.7ebd1f",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 854.1906814575195,\r
-        "y": 7844.6049218177795,\r
-        "z": "34265cd.7205424",\r
+        "x": 817.1906661987305,\r
+        "y": 7941.604918003082,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b517797c.221e9"\r
+                "abc9858a.0d3df8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61c1ba7d.9ba324",\r
+        "id": "8333ad7b.b22908",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 846.6193161010742,\r
-        "y": 7803.10494184494,\r
-        "z": "34265cd.7205424",\r
+        "x": 809.6193008422852,\r
+        "y": 7900.104938030243,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "b517797c.221e9"\r
+                "abc9858a.0d3df8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b517797c.221e9",\r
+        "id": "abc9858a.0d3df8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1055.5494270324707,\r
-        "y": 7823.273902416229,\r
-        "z": "34265cd.7205424",\r
+        "x": 1018.5494117736816,\r
+        "y": 7920.273898601532,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "3d40ba87.1beba6",\r
-                "1a40ddac.06f67a"\r
+                "2a8c3363.38afe4",\r
+                "7d6098e9.a14988"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91e9c48a.4b386",\r
+        "id": "e61f24da.fdfe2",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1809.799674987793,\r
-        "y": 7965.4422726631165,\r
-        "z": "34265cd.7205424",\r
+        "x": 1772.799659729004,\r
+        "y": 8062.442268848419,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1a40ddac.06f67a",\r
+        "id": "7d6098e9.a14988",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1428.846923828125,\r
-        "y": 8017.465929508209,\r
-        "z": "34265cd.7205424",\r
+        "x": 1391.846908569336,\r
+        "y": 8114.465925693512,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             [\r
-                "91e9c48a.4b386",\r
-                "c1b9561e.c76ae8",\r
-                "c58f8414.25a99"\r
+                "e61f24da.fdfe2",\r
+                "24f79f9e.6a9758",\r
+                "77199d84.b65ee4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d40ba87.1beba6",\r
+        "id": "2a8c3363.38afe4",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error doing PUT of vf-module\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1260.0498428344727,\r
-        "y": 7795.798916339874,\r
-        "z": "34265cd.7205424",\r
+        "x": 1223.0498275756836,\r
+        "y": 7892.798912525177,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4c0ccb17.3b1804",\r
+        "id": "23e90598.1ab01a",\r
         "type": "comment",\r
         "name": "This should have been removed from Dublin",\r
         "info": "",\r
         "comments": "",\r
-        "x": 728.7499923706055,\r
-        "y": 7285.302035331726,\r
-        "z": "34265cd.7205424",\r
+        "x": 691.7499771118164,\r
+        "y": 7382.302031517029,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b13baffe.18c468",\r
+        "id": "bf8d316e.62c2d",\r
         "type": "set",\r
         "name": "Initialize SO 500 reponse params",\r
         "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`\" />",\r
         "comments": "",\r
-        "x": 644.9999313354492,\r
-        "y": 270.02429485321045,\r
-        "z": "34265cd.7205424",\r
+        "x": 607.9999160766602,\r
+        "y": 367.0242910385132,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "78f1021d.4797bc",\r
+        "id": "50c201dc.9bc778",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2013.749870300293,\r
-        "y": 1172.3854970932007,\r
-        "z": "34265cd.7205424",\r
+        "x": 1976.749855041504,\r
+        "y": 1269.3854932785034,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "caca347e.8787d",\r
+        "id": "3728e3f3.742a9c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2021.2499160766602,\r
-        "y": 2124.6077165603638,\r
-        "z": "34265cd.7205424",\r
+        "x": 1984.249900817871,\r
+        "y": 2221.6077127456665,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "60730953.c387",\r
+        "id": "f83606b1.57aa68",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1309.9998931884766,\r
-        "y": 1120.3020401000977,\r
-        "z": "34265cd.7205424",\r
+        "x": 1272.9998779296875,\r
+        "y": 1217.3020362854004,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "57df4d97.1b3e74",\r
+        "id": "b7e13818.1bbbd",\r
         "type": "set",\r
         "name": "set so.reponse-code = 200",\r
         "xml": "<set>\n<parameter name=\"so.response-code\" value=\"200\" />\n",\r
         "comments": "",\r
-        "x": 1238.7499160766602,\r
-        "y": 1064.0520524978638,\r
-        "z": "34265cd.7205424",\r
+        "x": 1201.749900817871,\r
+        "y": 1161.0520486831665,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9ea0a8d5.338e78",\r
+        "id": "d8f50cf3.b660b8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2766.249897003174,\r
-        "y": 2684.330011367798,\r
-        "z": "34265cd.7205424",\r
+        "x": 2729.2498817443848,\r
+        "y": 2781.3300075531006,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3a601dac.7a4482",\r
+        "id": "15beb6ed.58fac9",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4188.888832092285,\r
-        "y": 4559.885304450989,\r
-        "z": "34265cd.7205424",\r
+        "x": 4151.888816833496,\r
+        "y": 4656.8853006362915,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "28125649.296d72",\r
+        "id": "a33ba8b8.1d7cc",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4371.388870239258,\r
-        "y": 5576.691199302673,\r
-        "z": "34265cd.7205424",\r
+        "x": 4334.388854980469,\r
+        "y": 5673.691195487976,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c7108bf6.17f21",\r
+        "id": "e35102b5.ead4c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3672.638832092285,\r
-        "y": 5913.496632575989,\r
-        "z": "34265cd.7205424",\r
+        "x": 3635.638816833496,\r
+        "y": 6010.4966287612915,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8d26e950.2b598",\r
+        "id": "ac95a18e.e9d4e8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3792.638832092285,\r
-        "y": 7047.524464607239,\r
-        "z": "34265cd.7205424",\r
+        "x": 3755.638816833496,\r
+        "y": 7144.5244607925415,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c1b9561e.c76ae8",\r
+        "id": "24f79f9e.6a9758",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1750.694320678711,\r
-        "y": 8018.21951341629,\r
-        "z": "34265cd.7205424",\r
+        "x": 1713.6943054199219,\r
+        "y": 8115.219509601593,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a1c5d05.89a983",\r
+        "id": "2f669bfa.b0d904",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 594.4444427490234,\r
-        "y": 8071.97101354599,\r
-        "z": "34265cd.7205424",\r
+        "x": 557.4444274902344,\r
+        "y": 8168.971009731293,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5b817e7f.0206",\r
+        "id": "db29530f.c21f7",\r
         "type": "set",\r
         "name": "set so.reponse-code = 200",\r
         "xml": "<set>\n<parameter name=\"so.response-code\" value=\"200\" />\n",\r
         "comments": "",\r
-        "x": 524.4444427490234,\r
-        "y": 8017.942268848419,\r
-        "z": "34265cd.7205424",\r
+        "x": 487.4444274902344,\r
+        "y": 8114.942265033722,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c58f8414.25a99",\r
+        "id": "77199d84.b65ee4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1631.9443817138672,\r
-        "y": 8066.969216823578,\r
-        "z": "34265cd.7205424",\r
+        "x": 1594.9443664550781,\r
+        "y": 8163.969213008881,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a7b746c4.2d389",\r
+        "id": "23f95643.5a124a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3672.361000061035,\r
-        "y": 7096.135304450989,\r
-        "z": "34265cd.7205424",\r
+        "x": 3635.360984802246,\r
+        "y": 7193.1353006362915,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb62798f.37c47",\r
+        "id": "62bbfbdf.d34f3c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3551.111000061035,\r
-        "y": 5958.774464607239,\r
-        "z": "34265cd.7205424",\r
+        "x": 3514.110984802246,\r
+        "y": 6055.7744607925415,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a39b4b61.59b038",\r
+        "id": "de495219.3e8f9",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4254.861000061035,\r
-        "y": 5621.274464607239,\r
-        "z": "34265cd.7205424",\r
+        "x": 4217.860984802246,\r
+        "y": 5718.2744607925415,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aee71bd7.cb4458",\r
+        "id": "98fe2567.5c7fd",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4069.861000061035,\r
-        "y": 4604.052296638489,\r
-        "z": "34265cd.7205424",\r
+        "x": 4032.860984802246,\r
+        "y": 4701.0522928237915,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bb2b8a64.4eda98",\r
+        "id": "7e407330.b6b2bc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2649.99991607666,\r
-        "y": 2730.4409685134888,\r
-        "z": "34265cd.7205424",\r
+        "x": 2612.999900817871,\r
+        "y": 2827.4409646987915,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a38241eb.287ec8",\r
+        "id": "3312acbf.c98b04",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1902.4999160766602,\r
-        "y": 2166.2742204666138,\r
-        "z": "34265cd.7205424",\r
+        "x": 1865.499900817871,\r
+        "y": 2263.2742166519165,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d65a69c8.cf6ba",\r
+        "id": "adbc50ce.7d37f",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1893.7499160766602,\r
-        "y": 1215.0243425369263,\r
-        "z": "34265cd.7205424",\r
+        "x": 1856.749900817871,\r
+        "y": 1312.024338722229,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7e168e6e.8d02f8",\r
+        "id": "d6e0298e.3c1e8",\r
         "type": "set",\r
         "name": "copy vf-module data",\r
         "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",\r
         "comments": "",\r
-        "x": 493.0711898803711,\r
-        "y": 7468.457430839539,\r
-        "z": "34265cd.7205424",\r
+        "x": 456.07117462158203,\r
+        "y": 7565.457427024841,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c1894905.cb3d58",\r
+        "id": "d3460755.d852e",\r
         "type": "execute",\r
         "name": "generate vf-module URL (sub service-instance-id)",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 592.1782302856445,\r
-        "y": 7552.745089530945,\r
-        "z": "34265cd.7205424",\r
+        "x": 555.1782150268555,\r
+        "y": 7649.745085716248,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7badb381.1fbf0c",\r
+        "id": "d35134f0.fec4d",\r
         "type": "execute",\r
         "name": "generate vf-module URL (sub vnf-id)",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 546.821044921875,\r
-        "y": 7597.923043251038,\r
-        "z": "34265cd.7205424",\r
+        "x": 509.82102966308594,\r
+        "y": 7694.92303943634,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2d6c7dfc.640b9a",\r
+        "id": "7916d324.cb3bf4",\r
         "type": "execute",\r
         "name": "generate vf-module URL (sub vf-module-id)",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 571.9997024536133,\r
-        "y": 7644.530034065247,\r
-        "z": "34265cd.7205424",\r
+        "x": 534.9996871948242,\r
+        "y": 7741.530030250549,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bcdb4bf7.c65098",\r
+        "id": "1d9375e8.fa4aba",\r
         "type": "comment",\r
         "name": "'New' version of DG, called for flows where SO expects async response (so-bpmn-infra)",\r
         "info": "",\r
         "comments": "",\r
-        "x": 528,\r
-        "y": 64,\r
-        "z": "34265cd.7205424",\r
+        "x": 490.99998474121094,\r
+        "y": 160.99999618530273,\r
+        "z": "1e5d41b0.b1168e",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "54659cd5.5a9534",\r
+        "type": "switchNode",\r
+        "name": "cloud-owner passed in input?",\r
+        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner != ''`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 678,\r
+        "y": 320,\r
+        "z": "1e5d41b0.b1168e",\r
+        "wires": [\r
+            [\r
+                "47e0f28c.35157c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "47e0f28c.35157c",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 975,\r
+        "y": 320,\r
+        "z": "1e5d41b0.b1168e",\r
+        "wires": [\r
+            [\r
+                "55504f2e.1c2d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "55504f2e.1c2d8",\r
+        "type": "set",\r
+        "name": "set prop.cloud-region.cloud-owner to input cloud-owner",\r
+        "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`' />\n",\r
+        "comments": "",\r
+        "x": 1346,\r
+        "y": 316,\r
+        "z": "1e5d41b0.b1168e",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index 9411b85..d10c6be 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "d899f0c1.6bd748",\r
+        "id": "56f6ceeb.2f9068",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 140,\r
-        "y": 125.02430057525635,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 114,\r
+        "y": 139,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "aaa14e6d.86dda8"\r
+                "1c7e6bd.909eb14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aaa14e6d.86dda8",\r
+        "id": "1c7e6bd.909eb14",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 253.85713577270508,\r
-        "y": 164.8338384628296,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 227.85713577270508,\r
+        "y": 178.80953788757324,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "769bc2ea.c9d65c"\r
+                "394269ca.2493d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "769bc2ea.c9d65c",\r
+        "id": "394269ca.2493d6",\r
         "type": "method",\r
         "name": "method vf-module-topology-operation-assign-sync",\r
         "xml": "<method rpc='vf-module-topology-operation-assign-sync' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 253.42862701416016,\r
-        "y": 205.02430057525635,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 227.42862701416016,\r
+        "y": 219,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "b1406c81.923cc"\r
+                "f31d4136.dbad18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a460891c.0d1ba",\r
+        "id": "8b850552.873b78",\r
         "type": "comment",\r
         "name": "vf-module-topology-operation-assign-sync",\r
         "info": "",\r
         "comments": "",\r
-        "x": 398.32110595703125,\r
-        "y": 51,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 372.32110595703125,\r
+        "y": 64.97569942474365,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6fdfcdf3.2ecd44",\r
+        "id": "76da2351.1e772c",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 545.1905097961426,\r
-        "y": 380.548122882843,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 519.1905097961426,\r
+        "y": 394.52382230758667,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "5fb65925.ac9",\r
-                "f896fbfa.e4db38"\r
+                "4f2046cb.97cad",\r
+                "6f4baeb7.64b6a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5fb65925.ac9",\r
+        "id": "4f2046cb.97cad",\r
         "type": "outcome",\r
         "name": "CreateVfModuleInstance",\r
         "xml": "<outcome value='CreateVfModuleInstance'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 807.2381248474121,\r
-        "y": 357.6910090446472,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 781.2381248474121,\r
+        "y": 371.66670846939087,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a252c97a.96867"\r
+                "bc41f28e.925478"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f896fbfa.e4db38",\r
+        "id": "6f4baeb7.64b6a",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 750.9047698974609,\r
-        "y": 403.07199811935425,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 724.9047698974609,\r
+        "y": 417.0476975440979,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "acc70f07.86c54"\r
+                "e7106bf3.cd4de"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a252c97a.96867",\r
+        "id": "bc41f28e.925478",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 997.0952892303467,\r
-        "y": 357.69104051589966,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 971.0952892303467,\r
+        "y": 371.6667399406433,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "acc70f07.86c54",\r
+        "id": "e7106bf3.cd4de",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1015.9047775268555,\r
-        "y": 403.40531063079834,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 989.9047775268555,\r
+        "y": 417.381010055542,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c5b83baf.fcb2b8",\r
+        "id": "729b2317.d41764",\r
         "type": "get-resource",\r
         "name": "get-resource VF_MODULE_MODEL",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 592.5237770080566,\r
-        "y": 471.6910729408264,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 566.5237770080566,\r
+        "y": 485.66677236557007,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "2d0c3ac2.95728e",\r
-                "71d0e645.eeba9"\r
+                "987fd6a8.61bdd8",\r
+                "20959f4f.3eb5d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "986ddeb5.121a08",\r
+        "id": "85b6ba66.001968",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1033.9521980285645,\r
-        "y": 496.1195454597473,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1007.9521980285645,\r
+        "y": 510.09524488449097,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2d0c3ac2.95728e",\r
+        "id": "987fd6a8.61bdd8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 858.3094673156738,\r
-        "y": 452.0719037055969,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 832.3094673156738,\r
+        "y": 466.0476031303406,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a604e12e.a8eed8"\r
+                "b104acae.235de"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "71d0e645.eeba9",\r
+        "id": "20959f4f.3eb5d8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 866.8808975219727,\r
-        "y": 496.3576169013977,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 840.8808975219727,\r
+        "y": 510.33331632614136,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "986ddeb5.121a08"\r
+                "85b6ba66.001968"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a604e12e.a8eed8",\r
+        "id": "b104acae.235de",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1033.309398651123,\r
-        "y": 451.21480417251587,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1007.309398651123,\r
+        "y": 465.1905035972595,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "58f29161.867a9",\r
+        "id": "ebe8b394.b57a1",\r
         "type": "switchNode",\r
         "name": "switch service-data.vnfs.vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 587.6190414428711,\r
-        "y": 680.2624082565308,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 561.6190414428711,\r
+        "y": 694.2381076812744,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4d071976.5050c",\r
-                "c3315f66.868788"\r
+                "cc1ff8d8.e54a",\r
+                "25f65cf0.a13c74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d071976.5050c",\r
+        "id": "cc1ff8d8.e54a",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 828.3333129882812,\r
-        "y": 657.4051485061646,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 802.3333129882812,\r
+        "y": 671.3808479309082,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "550ea296.96c2cc"\r
+                "e620f2a.d32df1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3315f66.868788",\r
+        "id": "25f65cf0.a13c74",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 828.0951538085938,\r
-        "y": 698.3576669692993,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 802.0951538085938,\r
+        "y": 712.333366394043,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "1218b6d8.cadda9"\r
+                "f839c9ee.7363c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43e1e208.1c9204",\r
+        "id": "cdb40a91.68e35",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 166.19043731689453,\r
-        "y": 3161.92930662632,\r
-        "z": "9167bcd1.0dd69",\r
-        "wires": [\r
-            [\r
-                "badfdbc9.022e2",\r
-                "1265e597.326aea",\r
-                "d904000a.ab2f38",\r
-                "b9dd9667.33695",\r
-                "b4b281fa.e85d5",\r
-                "68dfa5ea.e5019c",\r
-                "a1e477f0.0b584",\r
-                "fa229a92.ce9da8",\r
-                "43deefc2.c1bae8",\r
-                "2312018e.28175e",\r
-                "bab10e90.55c028",\r
-                "5554f045.52dd38",\r
-                "dd4f4eeb.8d24e",\r
-                "7af69df8.0374dc",\r
-                "453e667a.37bcb",\r
-                "5245ba39.530f94",\r
-                "fee3a1a8.2d1ad8",\r
-                "a61a195a.95b1e8",\r
-                "7314ccc5.2134a4",\r
-                "ad9d0c92.4b3468",\r
-                "9535b7df.620268",\r
-                "cf140a5d.20d0a",\r
-                "c8b952a9.c78298",\r
-                "e5e2fde7.2191d",\r
-                "8534c826.13da18",\r
-                "75790bd1.e8defc",\r
-                "c898fd55.fa0688",\r
-                "f1de476.813b738",\r
-                "cc91d00d.836b9",\r
-                "709b1630.8dd8b8",\r
-                "6f90d0a3.4f5888"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "550ea296.96c2cc",\r
+        "x": 140.19043731689453,\r
+        "y": 3175.9050060510635,\r
+        "z": "f3a72141.88f688",\r
+        "wires": [\r
+            [\r
+                "22e5e45e.411d54",\r
+                "aab26fce.f8257",\r
+                "d90a1287.58a548",\r
+                "beda92ef.691fd8",\r
+                "68d89a29.07cf94",\r
+                "2568cf35.f17b4",\r
+                "2930947a.5fb83c",\r
+                "50b9a90a.fc82d",\r
+                "23cc94b1.59977c",\r
+                "d4c27c38.cb815",\r
+                "83666c5c.749a58",\r
+                "9931e32c.9b539",\r
+                "32580d0f.1a87f2",\r
+                "a3e2c0ba.ee212",\r
+                "be655d76.fadfe8",\r
+                "a5b2add1.64cc98",\r
+                "3a0e8e07.615d92",\r
+                "d3f07b7.dd74b88",\r
+                "8005f008.78f808",\r
+                "e1af8d51.2ba338",\r
+                "8fd60795.26d88",\r
+                "a146e36e.bc5ed",\r
+                "cda23fd1.47e1a8",\r
+                "4f9ff09e.f47468",\r
+                "a248e487.7d841",\r
+                "bf14b0a9.d3e2d",\r
+                "56373ee9.f19b2",\r
+                "61b10d9d.cb5ec4",\r
+                "6758cc3d.63107c",\r
+                "758d4da0.c2995c",\r
+                "ee77fdb8.d87748"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e620f2a.d32df1",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 994.999927520752,\r
-        "y": 656.6909036636353,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 968.999927520752,\r
+        "y": 670.6666030883789,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1218b6d8.cadda9",\r
+        "id": "f839c9ee.7363c8",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 990.3332977294922,\r
-        "y": 698.0242853164673,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 964.3332977294922,\r
+        "y": 711.9999847412109,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "9a0906d8.7ab488"\r
+                "64c8c312.1061f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a0906d8.7ab488",\r
+        "id": "64c8c312.1061f4",\r
         "type": "switchNode",\r
         "name": "switch service data vnf == input vnf",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1241.6665954589844,\r
-        "y": 697.6910133361816,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1215.6665954589844,\r
+        "y": 711.6667127609253,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "34a2a2c8.9ed3d6"\r
+                "b6bafc8a.6df098"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "34a2a2c8.9ed3d6",\r
+        "id": "b6bafc8a.6df098",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1471.6666069030762,\r
-        "y": 697.0243263244629,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1445.6666069030762,\r
+        "y": 711.0000257492065,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "38dbdaf8.de3b36"\r
+                "eac623e8.5e60c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "169ef671.ac8942",\r
+        "id": "c81a4e60.7d0e28",\r
         "type": "set",\r
         "name": "set vnf-index to -1",\r
         "xml": "<set>\n<parameter name='vnf-index' value='-1' />\n",\r
         "comments": "",\r
-        "x": 536.6666641235352,\r
-        "y": 611.6909074783325,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 510.66666412353516,\r
+        "y": 625.6666069030762,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8699ebe3.da5b5",\r
+        "id": "5d5edd84.2d5f2c",\r
         "type": "set",\r
         "name": "set vnf-index to idx",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1793.3332443237305,\r
-        "y": 668.024284362793,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1767.3332443237305,\r
+        "y": 681.9999837875366,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3a7d1430.c71c54",\r
+        "id": "a8e5db24.a73738",\r
         "type": "switchNode",\r
         "name": "switch vnf-index",\r
         "xml": "<switch test='`$vnf-index`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 526.6666717529297,\r
-        "y": 748.3576040267944,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 500.6666717529297,\r
+        "y": 762.3333034515381,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "d200952e.82a"\r
+                "87ecd247.e52678"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d200952e.82a",\r
+        "id": "87ecd247.e52678",\r
         "type": "outcome",\r
         "name": "-1",\r
         "xml": "<outcome value='-1'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 705.000057220459,\r
-        "y": 747.6909799575806,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 679.000057220459,\r
+        "y": 761.6666793823242,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "df336439.6441b8"\r
+                "4e06f17a.d0856"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df336439.6441b8",\r
+        "id": "4e06f17a.d0856",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 864.9999656677246,\r
-        "y": 747.0242834091187,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 838.9999656677246,\r
+        "y": 760.9999828338623,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "badfdbc9.022e2",\r
+        "id": "22e5e45e.411d54",\r
         "type": "switchNode",\r
         "name": "switch vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 543.3333930969238,\r
-        "y": 1378.3578004837036,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 517.3333930969238,\r
+        "y": 1392.3334999084473,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "46bc83ea.153584",\r
-                "6bf719df.db171"\r
+                "14229ff2.8aa128",\r
+                "b10cf2c1.50f1b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46bc83ea.153584",\r
+        "id": "14229ff2.8aa128",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 800.7143478393555,\r
-        "y": 1345.5005741119385,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 774.7143478393555,\r
+        "y": 1359.4762735366821,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a719934f.fd479"\r
+                "bfd42049.5713c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a719934f.fd479",\r
+        "id": "bfd42049.5713c8",\r
         "type": "set",\r
         "name": "set vf-module-index=0",\r
         "xml": "<set>\n<parameter name='vf-module-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 988.3333854675293,\r
-        "y": 1346.1673488616943,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 962.3333854675293,\r
+        "y": 1360.143048286438,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6bf719df.db171",\r
+        "id": "b10cf2c1.50f1b",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 801.1428909301758,\r
-        "y": 1409.7864322662354,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 775.1428909301758,\r
+        "y": 1423.762131690979,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "8d56de21.005688"\r
+                "4d58fe6c.1bc33"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7bb74faf.1a3bf",\r
+        "id": "82cd745.5985888",\r
         "type": "set",\r
         "name": "set vf-module-index = vf-module_length",\r
         "xml": "<set>\n<parameter name='vf-module-index' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n",\r
         "comments": "",\r
-        "x": 1186.3334312438965,\r
-        "y": 1389.97682762146,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1160.3334312438965,\r
+        "y": 1403.9525270462036,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "20d53539.793ec2",\r
+        "id": "f5e9c444.577ec8",\r
         "type": "for",\r
         "name": "for each existing VF module",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1145.428524017334,\r
-        "y": 1434.072057723999,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1119.428524017334,\r
+        "y": 1448.0477571487427,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "c80b7ff5.a77ae8"\r
+                "77f0e5e3.b50b0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d56de21.005688",\r
+        "id": "4d58fe6c.1bc33",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 937.8571701049805,\r
-        "y": 1409.7863578796387,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 911.8571701049805,\r
+        "y": 1423.7620573043823,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "7bb74faf.1a3bf",\r
-                "20d53539.793ec2"\r
+                "82cd745.5985888",\r
+                "f5e9c444.577ec8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c80b7ff5.a77ae8",\r
+        "id": "77f0e5e3.b50b0c",\r
         "type": "switchNode",\r
         "name": "switch vf-module-information.vf-module-id == service-data.vnfs.vnf[].vf-modules.vf-module[].vf-module-id",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1649.0476264953613,\r
-        "y": 1433.6434688568115,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1623.0476264953613,\r
+        "y": 1447.6191682815552,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4b42022b.8dc95c"\r
+                "d89d248c.26c058"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b42022b.8dc95c",\r
+        "id": "d89d248c.26c058",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2091.666675567627,\r
-        "y": 1433.2149200439453,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2065.666675567627,\r
+        "y": 1447.190619468689,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "b16fc4ad.46cbc"\r
+                "52475e31.0d704"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b16fc4ad.46cbc",\r
+        "id": "52475e31.0d704",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2243.5715560913086,\r
-        "y": 1433.2149066925049,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2217.5715560913086,\r
+        "y": 1447.1906061172485,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6bc28de3.9197f4",\r
+        "id": "d2a9bffe.3868f",\r
         "type": "comment",\r
         "name": "make sure this VF module doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1675.4999732971191,\r
-        "y": 1388.2709608078003,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1649.4999732971191,\r
+        "y": 1402.246660232544,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1265e597.326aea",\r
+        "id": "aab26fce.f8257",\r
         "type": "set",\r
         "name": "set new vf-module_length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-module-index + 1`' />\n",\r
         "comments": "",\r
-        "x": 553.9999732971191,\r
-        "y": 1489.3576555252075,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 527.9999732971191,\r
+        "y": 1503.3333549499512,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d904000a.ab2f38",\r
+        "id": "d90a1287.58a548",\r
         "type": "set",\r
         "name": "set vf-module-topology data",\r
         "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",\r
         "comments": "",\r
-        "x": 560.4999923706055,\r
-        "y": 1601.857762336731,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 534.4999923706055,\r
+        "y": 1615.8334617614746,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8e6d01f4.b1a178",\r
+        "id": "52b2c2fd.f94b84",\r
         "type": "set",\r
         "name": "set aic-clli",\r
         "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",\r
         "comments": "",\r
-        "x": 1321.4522514343262,\r
-        "y": 1761.0956888198853,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1295.4522514343262,\r
+        "y": 1775.071388244629,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b9dd9667.33695",\r
+        "id": "beda92ef.691fd8",\r
         "type": "switchNode",\r
         "name": "switch aic-clli",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 520.4999122619629,\r
-        "y": 1875.0480289459229,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 494.4999122619629,\r
+        "y": 1889.0237283706665,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4138e9bf.74e39"\r
+                "f0c65b19.86b048"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4138e9bf.74e39",\r
+        "id": "f0c65b19.86b048",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 665.7856025695801,\r
-        "y": 1875.0480976104736,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 639.7856025695801,\r
+        "y": 1889.0237970352173,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "d3d7ad76.5bcb38"\r
+                "dcf514cb.dd0c78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d3d7ad76.5bcb38",\r
+        "id": "dcf514cb.dd0c78",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 812.9284629821777,\r
-        "y": 1874.6195316314697,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 786.9284629821777,\r
+        "y": 1888.5952310562134,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b4b281fa.e85d5",\r
+        "id": "68d89a29.07cf94",\r
         "type": "get-resource",\r
         "name": "get-resource cloud region",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 559.3571281433105,\r
-        "y": 1675.1913003921509,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 533.3571281433105,\r
+        "y": 1689.1669998168945,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "c2f7e9d3.776b",\r
-                "1f1578fa.24f767"\r
+                "70243d82.24a30c",\r
+                "f46b3e9e.8d6668"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f1578fa.24f767",\r
+        "id": "f46b3e9e.8d6668",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 773.6033210754395,\r
-        "y": 1693.3421564102173,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 747.6033210754395,\r
+        "y": 1707.317855834961,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "657da328.17e1b4"\r
+                "91f2a24b.1b4878"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "657da328.17e1b4",\r
+        "id": "91f2a24b.1b4878",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 948.6032943725586,\r
-        "y": 1693.3421926498413,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 922.6032943725586,\r
+        "y": 1707.317892074585,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c2f7e9d3.776b",\r
+        "id": "70243d82.24a30c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 782.5319175720215,\r
-        "y": 1651.6278896331787,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 756.5319175720215,\r
+        "y": 1665.6035890579224,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "f1454109.93f188"\r
+                "19c79205.64aec6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1454109.93f188",\r
+        "id": "19c79205.64aec6",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 948.8811950683594,\r
-        "y": 1650.933466911316,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 922.8811950683594,\r
+        "y": 1664.9091663360596,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "38dbdaf8.de3b36",\r
+        "id": "eac623e8.5e60c8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1620.0000686645508,\r
-        "y": 695.9440250396729,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1594.0000686645508,\r
+        "y": 709.9197244644165,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "8699ebe3.da5b5",\r
-                "bf6a8dc5.58a6a8"\r
+                "5d5edd84.2d5f2c",\r
+                "cf8fe3f6.94c17"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bf6a8dc5.58a6a8",\r
+        "id": "cf8fe3f6.94c17",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 1755.0000343322754,\r
-        "y": 717.6106109619141,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1729.0000343322754,\r
+        "y": 731.5863103866577,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9382afb.71420d",\r
+        "id": "f023a409.07cdc8",\r
         "type": "set",\r
         "name": "set from DB",\r
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-invariant-uuid'\n  value='`$db.vf-module-model.invariant-uuid`' />\n",\r
         "comments": "",\r
-        "x": 934.833251953125,\r
-        "y": 1916.44402217865,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 908.833251953125,\r
+        "y": 1930.4197216033936,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "68dfa5ea.e5019c",\r
+        "id": "2568cf35.f17b4",\r
         "type": "switchNode",\r
         "name": "switch input model-invariant-uuid",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 578.6903266906738,\r
-        "y": 1939.2684659957886,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 552.6903266906738,\r
+        "y": 1953.2441654205322,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "e49707ca.7af328",\r
-                "812a586e.32e2f"\r
+                "2966e953.50db6e",\r
+                "aa0220f1.1c7508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e49707ca.7af328",\r
+        "id": "2966e953.50db6e",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 784.3569984436035,\r
-        "y": 1916.4114294052124,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 758.3569984436035,\r
+        "y": 1930.387128829956,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "9382afb.71420d"\r
+                "f023a409.07cdc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "812a586e.32e2f",\r
+        "id": "aa0220f1.1c7508",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 785.7855949401855,\r
-        "y": 1960.6970205307007,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 759.7855949401855,\r
+        "y": 1974.6727199554443,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "b87936af.b7f308"\r
+                "36a1b2f5.8b27ee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b87936af.b7f308",\r
+        "id": "36a1b2f5.8b27ee",\r
         "type": "set",\r
         "name": "set from input",\r
         "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",\r
         "comments": "",\r
-        "x": 940.0713310241699,\r
-        "y": 1960.1255927085876,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 914.0713310241699,\r
+        "y": 1974.1012921333313,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "118d8bd8.da309c",\r
+        "id": "f5ac6aff.db1c88",\r
         "type": "set",\r
         "name": "set from DB",\r
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-uuid'\n  value='`$db.vf-module-model.uuid`' />\n",\r
         "comments": "",\r
-        "x": 935.7855224609375,\r
-        "y": 2004.9826984405518,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 909.7855224609375,\r
+        "y": 2018.9583978652954,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a1e477f0.0b584",\r
+        "id": "2930947a.5fb83c",\r
         "type": "switchNode",\r
         "name": "switch input model-uuid",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 551.3093452453613,\r
-        "y": 2027.8072032928467,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 525.3093452453613,\r
+        "y": 2041.7829027175903,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "6305d1b8.c1dda8",\r
-                "ccca0eb9.c0c188"\r
+                "b3c44516.bf01f",\r
+                "c8c7af7f.bda348"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6305d1b8.c1dda8",\r
+        "id": "b3c44516.bf01f",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 785.3093185424805,\r
-        "y": 2004.950135231018,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 759.3093185424805,\r
+        "y": 2018.9258346557617,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "118d8bd8.da309c"\r
+                "f5ac6aff.db1c88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ccca0eb9.c0c188",\r
+        "id": "c8c7af7f.bda348",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 786.7379150390625,\r
-        "y": 2049.2357263565063,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 760.7379150390625,\r
+        "y": 2063.21142578125,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "6b7d1d6.80304e4"\r
+                "9ee74458.70cbf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b7d1d6.80304e4",\r
+        "id": "9ee74458.70cbf8",\r
         "type": "set",\r
         "name": "set from input",\r
         "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",\r
         "comments": "",\r
-        "x": 941.0236511230469,\r
-        "y": 2048.6642985343933,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 915.0236511230469,\r
+        "y": 2062.639997959137,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e5be2743.5d4508",\r
+        "id": "137c0b44.9e7df5",\r
         "type": "set",\r
         "name": "set from DB",\r
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-version'\n  value='`$db.vf-module-model.version`' />\n",\r
         "comments": "",\r
-        "x": 932.9284553527832,\r
-        "y": 2093.8399057388306,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 906.9284553527832,\r
+        "y": 2107.815605163574,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fa229a92.ce9da8",\r
+        "id": "50b9a90a.fc82d",\r
         "type": "switchNode",\r
         "name": "switch input model-version",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-version`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 559.4522171020508,\r
-        "y": 2116.6643505096436,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 533.4522171020508,\r
+        "y": 2130.640049934387,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "34c4c596.157f8a",\r
-                "847f3b10.726578"\r
+                "1eea34fe.5390a3",\r
+                "6c98f90.4d63188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "34c4c596.157f8a",\r
+        "id": "1eea34fe.5390a3",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 782.4522018432617,\r
-        "y": 2093.807312965393,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 756.4522018432617,\r
+        "y": 2107.7830123901367,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "e5be2743.5d4508"\r
+                "137c0b44.9e7df5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "847f3b10.726578",\r
+        "id": "6c98f90.4d63188",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 783.8807983398438,\r
-        "y": 2138.0929040908813,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 757.8807983398438,\r
+        "y": 2152.068603515625,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "9764857e.e18c18"\r
+                "699947d7.d4326"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9764857e.e18c18",\r
+        "id": "699947d7.d4326",\r
         "type": "set",\r
         "name": "set from input",\r
         "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",\r
         "comments": "",\r
-        "x": 938.1665344238281,\r
-        "y": 2137.5214762687683,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 912.1665344238281,\r
+        "y": 2151.497175693512,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9b53eb1f.f2e23",\r
+        "id": "a7fd32d7.026dc8",\r
         "type": "set",\r
         "name": "set from DB",\r
         "xml": "<set>\n<parameter name='tmp.vf-module-topology.onap-model-information.model-name'\n  value='`$db.vf-module-model.name`' />\n",\r
         "comments": "",\r
-        "x": 932.9284553527832,\r
-        "y": 2180.9827280044556,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 906.9284553527832,\r
+        "y": 2194.958427429199,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "43deefc2.c1bae8",\r
+        "id": "23cc94b1.59977c",\r
         "type": "switchNode",\r
         "name": "switch input model-name",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-name`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 554.4522171020508,\r
-        "y": 2203.8071727752686,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 528.4522171020508,\r
+        "y": 2217.782872200012,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "1728f46d.49d514",\r
-                "c03e99e4.3d5358"\r
+                "e3af7baa.c4981",\r
+                "3ab505bb.0b8a4a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1728f46d.49d514",\r
+        "id": "e3af7baa.c4981",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 782.4522018432617,\r
-        "y": 2180.950135231018,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 756.4522018432617,\r
+        "y": 2194.9258346557617,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "9b53eb1f.f2e23"\r
+                "a7fd32d7.026dc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c03e99e4.3d5358",\r
+        "id": "3ab505bb.0b8a4a",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 783.8807983398438,\r
-        "y": 2225.2357263565063,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 757.8807983398438,\r
+        "y": 2239.21142578125,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "f18842f5.5d912"\r
+                "2d788c97.c9e78c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f18842f5.5d912",\r
+        "id": "2d788c97.c9e78c",\r
         "type": "set",\r
         "name": "set from input",\r
         "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",\r
         "comments": "",\r
-        "x": 938.1665344238281,\r
-        "y": 2224.6642985343933,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 912.1665344238281,\r
+        "y": 2238.639997959137,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2312018e.28175e",\r
+        "id": "d4c27c38.cb815",\r
         "type": "set",\r
         "name": "set model-customization-uuid",\r
         "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",\r
         "comments": "",\r
-        "x": 568.9045524597168,\r
-        "y": 2276.316162109375,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 542.9045524597168,\r
+        "y": 2290.2918615341187,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bab10e90.55c028",\r
+        "id": "83666c5c.749a58",\r
         "type": "set",\r
         "name": "set vf-module-id",\r
         "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",\r
         "comments": "",\r
-        "x": 522.0951995849609,\r
-        "y": 1545.0393381118774,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 496.09519958496094,\r
+        "y": 1559.015037536621,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5554f045.52dd38",\r
+        "id": "9931e32c.9b539",\r
         "type": "for",\r
         "name": "for each cloud-region relationship",\r
         "xml": "<for index='idx' start='0' end='`$aai.cloud-region.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 581.6109428405762,\r
-        "y": 1763.6979837417603,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 555.6109428405762,\r
+        "y": 1777.673683166504,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "65c117a1.56bd9"\r
+                "c780cafa.90153"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "65c117a1.56bd9",\r
+        "id": "c780cafa.90153",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$aai.cloud-region.relationship-list.relationship[$idx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 829.2894859313965,\r
-        "y": 1763.4479131698608,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 803.2894859313965,\r
+        "y": 1777.4236125946045,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "b53c4970.3c3e18"\r
+                "229e7db2.d0a45a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b53c4970.3c3e18",\r
+        "id": "229e7db2.d0a45a",\r
         "type": "outcome",\r
         "name": "complex",\r
         "xml": "<outcome value='complex'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 998.7538070678711,\r
-        "y": 1762.8407354354858,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 972.7538070678711,\r
+        "y": 1776.8164348602295,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "31580412.a83eb4"\r
+                "acb46213.14fd98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e303b58.a257cd",\r
+        "id": "f7e18dd6.c3ff2",\r
         "type": "execute",\r
         "name": "split related-link",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1338.848964691162,\r
-        "y": 1717.269310951233,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1312.848964691162,\r
+        "y": 1731.2450103759766,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "31580412.a83eb4",\r
+        "id": "acb46213.14fd98",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1158.51566696167,\r
-        "y": 1763.9360990524292,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1132.51566696167,\r
+        "y": 1777.9117984771729,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "1e303b58.a257cd",\r
-                "7debff63.6d9ad",\r
-                "8e6d01f4.b1a178"\r
+                "f7e18dd6.c3ff2",\r
+                "c0d0286c.f8db38",\r
+                "52b2c2fd.f94b84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7debff63.6d9ad",\r
+        "id": "c0d0286c.f8db38",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 1308.5156288146973,\r
-        "y": 1807.269395828247,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1282.5156288146973,\r
+        "y": 1821.2450952529907,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "43097907.f1acb8",\r
+        "id": "8e5c6ccb.163dc",\r
         "type": "execute",\r
         "name": "execute PropertiesNode",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 559.0476226806641,\r
-        "y": 234.5481081008911,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 563.047607421875,\r
+        "y": 179.5238037109375,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7314ccc5.2134a4",\r
+        "id": "8005f008.78f808",\r
         "type": "set",\r
         "name": "set order-status to PendingCreate",\r
         "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",\r
         "comments": "",\r
-        "x": 464.2622375488281,\r
-        "y": 7372.904296875,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 438.2622375488281,\r
+        "y": 7386.879996299744,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9535b7df.620268",\r
+        "id": "8fd60795.26d88",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 403.8335418701172,\r
-        "y": 7486.522626876831,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 377.8335418701172,\r
+        "y": 7500.498326301575,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a61a195a.95b1e8",\r
+        "id": "d3f07b7.dd74b88",\r
         "type": "set",\r
         "name": "copy input data",\r
         "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",\r
         "comments": "",\r
-        "x": 420.11924743652344,\r
-        "y": 7229.252753674984,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 394.11924743652344,\r
+        "y": 7243.228453099728,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fee3a1a8.2d1ad8",\r
+        "id": "3a0e8e07.615d92",\r
         "type": "set",\r
         "name": "copy vf-module-topology data",\r
         "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",\r
         "comments": "",\r
-        "x": 465.00025177001953,\r
-        "y": 7181.038265645504,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 439.00025177001953,\r
+        "y": 7195.013965070248,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad9d0c92.4b3468",\r
+        "id": "e1af8d51.2ba338",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vfmodule.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 398.71449279785156,\r
-        "y": 7438.752443313599,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 372.71449279785156,\r
+        "y": 7452.728142738342,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7af69df8.0374dc",\r
+        "id": "a3e2c0ba.ee212",\r
         "type": "save",\r
         "name": "update vf-module",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 484.1429786682129,\r
-        "y": 4383.039919495583,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 458.1429786682129,\r
+        "y": 4397.015618920326,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "ff28151e.c99568",\r
-                "84d4e577.067c6"\r
+                "ab0703e.11e55",\r
+                "f03457b2.f371"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "829bb1f4.830f08",\r
+        "id": "e60106b.28aadf8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 989.1906547546387,\r
-        "y": 4417.801350176334,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 963.1906547546387,\r
+        "y": 4431.777049601078,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ff28151e.c99568",\r
+        "id": "ab0703e.11e55",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 659.2146186828613,\r
-        "y": 4351.420541405678,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 633.2146186828613,\r
+        "y": 4365.396240830421,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "c0a6d69d.c741f8"\r
+                "16daf1fb.74eafe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84d4e577.067c6",\r
+        "id": "f03457b2.f371",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 667.7859916687012,\r
-        "y": 4420.039631426334,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 641.7859916687012,\r
+        "y": 4434.015330851078,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "9fa62cc3.2f0038"\r
+                "cf4b3a59.c0e438"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3f4159f.aadd9",\r
+        "id": "9f7ab13.96daed",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 994.2145729064941,\r
-        "y": 4369.564098000526,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 968.2145729064941,\r
+        "y": 4383.53979742527,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dd4f4eeb.8d24e",\r
+        "id": "32580d0f.1a87f2",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
         "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",\r
         "comments": "",\r
-        "x": 507.80978775024414,\r
-        "y": 4258.564148545265,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 481.80978775024414,\r
+        "y": 4272.539847970009,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "98920223.9d1788",\r
+        "id": "c0d1ee17.6f56f",\r
         "type": "save",\r
         "name": "save vf-module relationships",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1277.8335342407227,\r
-        "y": 5941.192313909531,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1251.8335342407227,\r
+        "y": 5955.168013334274,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "3760c1b8.f1b83e",\r
-                "e7d6710.a6ccc1"\r
+                "7141904.0c5e2f",\r
+                "2951128e.c9a6fe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3760c1b8.f1b83e",\r
+        "id": "7141904.0c5e2f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1497.666877746582,\r
-        "y": 5912.064058065414,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1471.666877746582,\r
+        "y": 5926.039757490158,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "5010a64f.2f3dc"\r
+                "ba15facd.605eb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e7d6710.a6ccc1",\r
+        "id": "2951128e.c9a6fe",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1506.238410949707,\r
-        "y": 5964.683202505112,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1480.238410949707,\r
+        "y": 5978.658901929855,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4bde1cab.c0624c"\r
+                "18873198.c57256"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da526891.6d6948",\r
+        "id": "a267bbc6.a0ea2",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1832.6670112609863,\r
-        "y": 5931.873954534531,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1806.6670112609863,\r
+        "y": 5945.849653959274,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "453e667a.37bcb",\r
+        "id": "be655d76.fadfe8",\r
         "type": "for",\r
         "name": "for each vm-type",\r
         "xml": "<for silentFailure='true' index='vm-type-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 457.50025939941406,\r
-        "y": 5706.5258667469025,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 431.50025939941406,\r
+        "y": 5720.501566171646,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "9e617b8e.e0967"\r
+                "9ef55446.fb8ff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b22bc2e1.6fc3a8",\r
+        "id": "b6dec962.68a7c",\r
         "type": "for",\r
         "name": "for each vm-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 854.5002708435059,\r
-        "y": 6125.192698955536,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 828.5002708435059,\r
+        "y": 6139.1683983802795,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "e3a4933c.85a3c8"\r
+                "338a7f2e.d4c058"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91bf4a81.2bbfb",\r
+        "id": "ab32c032.f2d458",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1834.5003852844238,\r
-        "y": 5981.858495473862,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1808.5003852844238,\r
+        "y": 5995.834194898605,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5245ba39.530f94",\r
+        "id": "a5b2add1.64cc98",\r
         "type": "for",\r
         "name": "for each vm-type",\r
         "xml": "<for silentFailure='true' index='vm-type-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 431.92879486083984,\r
-        "y": 7073.571922242641,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 405.92879486083984,\r
+        "y": 7087.547621667385,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "801c847a.0c2ab8"\r
+                "e36a023.cd3fb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "801c847a.0c2ab8",\r
+        "id": "e36a023.cd3fb",\r
         "type": "for",\r
         "name": "for each vm",\r
         "xml": "<for index='vm-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-count`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 626.928825378418,\r
-        "y": 7072.904930055141,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 600.928825378418,\r
+        "y": 7086.880629479885,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "9048210a.638ad"\r
+                "434730cd.aa95a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1404a29d.dfd36d",\r
+        "id": "7d25dc74.1b248c",\r
         "type": "save",\r
         "name": "save VIPR_CONFIGURATION",\r
         "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 )\" >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1018.5955276489258,\r
-        "y": 7095.57258027792,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 992.5955276489258,\r
+        "y": 7109.548279702663,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "698fdfc8.5c59c"\r
+                "aa481da1.69dd38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2fc7ee54.674b22",\r
+        "id": "5fef6728.83d2",\r
         "type": "comment",\r
         "name": "Not a failure",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1538.5954284667969,\r
-        "y": 7095.572585046291,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1512.5954284667969,\r
+        "y": 7109.548284471035,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "698fdfc8.5c59c",\r
+        "id": "aa481da1.69dd38",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1228.5955123901367,\r
-        "y": 7095.572730004787,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1202.5955123901367,\r
+        "y": 7109.548429429531,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "46d81bad.b0cf7c"\r
+                "b7f52d22.6f1a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46d81bad.b0cf7c",\r
+        "id": "b7f52d22.6f1a6",\r
         "type": "record",\r
         "name": "record",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1371.928955078125,\r
-        "y": 7095.572567880154,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1345.928955078125,\r
+        "y": 7109.548267304897,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "87a12e16.c1c8e",\r
+        "id": "dd8f2dbc.1424c8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1401.9290771484375,\r
-        "y": 7046.904281556606,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1375.9290771484375,\r
+        "y": 7060.87998098135,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "faaa33d2.7941d8"\r
+                "105602e9.282d2d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a365224.c1009c",\r
+        "id": "d079e008.5f24",\r
         "type": "comment",\r
         "name": "Not a failure",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1725.2621307373047,\r
-        "y": 7045.2381038069725,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1699.2621307373047,\r
+        "y": 7059.213803231716,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "faaa33d2.7941d8",\r
+        "id": "105602e9.282d2d",\r
         "type": "record",\r
         "name": "record",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1547.929012298584,\r
-        "y": 7046.904914796352,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1521.929012298584,\r
+        "y": 7060.880614221096,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9048210a.638ad",\r
+        "id": "434730cd.aa95a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 795.2622184753418,\r
-        "y": 7071.904774606228,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 769.2622184753418,\r
+        "y": 7085.8804740309715,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "cc3d7eaa.03db28",\r
-                "1404a29d.dfd36d"\r
+                "c4265324.dc984",\r
+                "7d25dc74.1b248c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc3d7eaa.03db28",\r
+        "id": "c4265324.dc984",\r
         "type": "delete",\r
         "name": "delete any pre-existing records in VIPR_CONFIGURATION",\r
         "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]' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1108.5955429077148,\r
-        "y": 7047.238914430141,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1082.5955429077148,\r
+        "y": 7061.214613854885,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "87a12e16.c1c8e"\r
+                "dd8f2dbc.1424c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c0a6d69d.c741f8",\r
+        "id": "16daf1fb.74eafe",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 817.500186920166,\r
-        "y": 4351.191212296486,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 791.500186920166,\r
+        "y": 4365.16691172123,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "f3f4159f.aadd9",\r
-                "6f96a138.acc9c8"\r
+                "9f7ab13.96daed",\r
+                "99a0939e.edd618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9fa62cc3.2f0038",\r
+        "id": "cf4b3a59.c0e438",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 818.5001029968262,\r
-        "y": 4417.857502520084,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 792.5001029968262,\r
+        "y": 4431.833201944828,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "829bb1f4.830f08",\r
-                "6f96a138.acc9c8"\r
+                "e60106b.28aadf8",\r
+                "99a0939e.edd618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5010a64f.2f3dc",\r
+        "id": "ba15facd.605eb8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1666.1668815612793,\r
-        "y": 5911.858327627182,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1640.1668815612793,\r
+        "y": 5925.834027051926,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "da526891.6d6948",\r
-                "b976bf80.a00868"\r
+                "a267bbc6.a0ea2",\r
+                "89b0c713.c7a1a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4bde1cab.c0624c",\r
+        "id": "18873198.c57256",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1661.1668815612793,\r
-        "y": 5964.85817027092,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1635.1668815612793,\r
+        "y": 5978.833869695663,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "91bf4a81.2bbfb",\r
-                "b976bf80.a00868"\r
+                "ab32c032.f2d458",\r
+                "89b0c713.c7a1a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6529b298.61d4a4",\r
+        "id": "c68814e7.3e7978",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode - get preload-list",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1003.3333778381348,\r
-        "y": 2421.1915349960327,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 977.3333778381348,\r
+        "y": 2435.1672344207764,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "8fa815b3.c373e8",\r
-                "d50aff26.86ca6"\r
+                "7721826a.263bbc",\r
+                "1da5a68e.f50659"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8fa815b3.c373e8",\r
+        "id": "7721826a.263bbc",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1266.6666933695474,\r
-        "y": 2384.524751345316,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1240.6666933695474,\r
+        "y": 2398.5004507700596,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "72fd863f.96d978"\r
+                "744a6e59.c4d87"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d50aff26.86ca6",\r
+        "id": "1da5a68e.f50659",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1269.9999809265137,\r
-        "y": 2459.5247468948364,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1243.9999809265137,\r
+        "y": 2473.50044631958,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "3381b8ad.4cf26"\r
+                "1a97623c.4236ee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72fd863f.96d978",\r
+        "id": "744a6e59.c4d87",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1428.333381652832,\r
-        "y": 2382.8580360412598,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1402.333381652832,\r
+        "y": 2396.8337354660034,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "ddcdfbdc.02069"\r
+                "a9ea6465.0e1a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3381b8ad.4cf26",\r
+        "id": "1a97623c.4236ee",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1424.9999885559082,\r
-        "y": 2459.5245885849,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1398.9999885559082,\r
+        "y": 2473.5002880096436,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "5fd67b5c.1966a4"\r
+                "7895ddc8.adca34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ddcdfbdc.02069",\r
+        "id": "a9ea6465.0e1a",\r
         "type": "switchNode",\r
         "name": "switch mdsal-preload.response-code",\r
         "xml": "<switch test='`$mdsal-preload.response-code`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1656.6666831970215,\r
-        "y": 2382.8580770492554,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1630.6666831970215,\r
+        "y": 2396.833776473999,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "1032eb5c.8c7bfd",\r
-                "fe3501c8.ebdf28"\r
+                "6fc37eb4.61cff8",\r
+                "e6efb736.3838e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1032eb5c.8c7bfd",\r
+        "id": "6fc37eb4.61cff8",\r
         "type": "outcome",\r
         "name": "404 (not found)",\r
         "xml": "<outcome value='404'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1908.3334197998047,\r
-        "y": 2346.191451072693,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1882.3334197998047,\r
+        "y": 2360.1671504974365,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a37b13e8.33b938"\r
+                "751c0b43.04587c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a37b13e8.33b938",\r
+        "id": "751c0b43.04587c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign-no-preload",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-no-preload' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2304.9998893737793,\r
-        "y": 2344.5245790481567,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2278.9998893737793,\r
+        "y": 2358.5002784729004,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "233356b2.248a72"\r
+                "a300226a.2a6a9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "233356b2.248a72",\r
+        "id": "a300226a.2a6a9",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2675.0000381469727,\r
-        "y": 2342.858115196228,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2649.0000381469727,\r
+        "y": 2356.8338146209717,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "5f9b54a9.c1cdd4"\r
+                "854c8589.9f57c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c88feb78.b7ccd",\r
+        "id": "4b1cfdbb.d134fc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n",\r
         "comments": "",\r
-        "x": 2983.3334159851074,\r
-        "y": 2374.5248517990112,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2957.3334159851074,\r
+        "y": 2388.500551223755,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fe3501c8.ebdf28",\r
+        "id": "e6efb736.3838e8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1883.3334999084473,\r
-        "y": 2402.8579416275024,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1857.3334999084473,\r
+        "y": 2416.833641052246,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "f6f1c5d8.dc0ab"\r
+                "ce26b35e.dec2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a69f1ed.4762a8",\r
+        "id": "fae1cd84.a9bd78",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2196.666404724121,\r
-        "y": 2419.52436542511,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2170.666404724121,\r
+        "y": 2433.5000648498535,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5fd67b5c.1966a4",\r
+        "id": "7895ddc8.adca34",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign-preload",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-preload' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1788.3332786560059,\r
-        "y": 2461.191336631775,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1762.3332786560059,\r
+        "y": 2475.1670360565186,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "eeab2ed9.18515"\r
+                "abc28c19.d114f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eeab2ed9.18515",\r
+        "id": "abc28c19.d114f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2144.000141143799,\r
-        "y": 2459.5249547958374,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2118.000141143799,\r
+        "y": 2473.500654220581,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4331007b.e83998"\r
+                "e2bf8646.281a5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff44880b.925a9",\r
+        "id": "19d62bdc.450b0c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n",\r
         "comments": "",\r
-        "x": 2452.333393096924,\r
-        "y": 2481.191849708557,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2426.333393096924,\r
+        "y": 2495.167549133301,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9e617b8e.e0967",\r
+        "id": "9ef55446.fb8ff",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 648.0003280639648,\r
-        "y": 5707.35910153389,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 622.0003280639648,\r
+        "y": 5721.334800958633,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "b22bc2e1.6fc3a8",\r
-                "938e3050.854e5"\r
+                "b6dec962.68a7c",\r
+                "95f7cff4.36b8a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "938e3050.854e5",\r
+        "id": "95f7cff4.36b8a",\r
         "type": "for",\r
         "name": "for each vnfc",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 899.0003776550293,\r
-        "y": 4912.025192737579,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 873.0003776550293,\r
+        "y": 4926.000892162323,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "6085493.53a3238"\r
+                "f3b94caa.1b1fa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bf5629c7.b8c548",\r
+        "id": "d289e33f.82de9",\r
         "type": "save",\r
         "name": "save vnfc to A&AI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1625.00044631958,\r
-        "y": 4720.3591232299805,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1599.00044631958,\r
+        "y": 4734.334822654724,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "57f9125a.f4f11c",\r
-                "c29ebd4.1b8af4"\r
+                "bf47efb9.ef7f",\r
+                "569de2d6.f82d54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6085493.53a3238",\r
+        "id": "f3b94caa.1b1fa8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1067.3336791992188,\r
-        "y": 4912.692019939423,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1041.3336791992188,\r
+        "y": 4926.667719364166,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "efdceadd.e8246",\r
-                "1fc575ba.ed4b2a",\r
-                "1a5d8b36.aeca65",\r
-                "6f6678f2.1bf2e",\r
-                "c11e7bb7.050ab8",\r
-                "dc86b143.7bc0f"\r
+                "64a79036.af227",\r
+                "1453c597.eede0a",\r
+                "4ddfdd9a.1fb534",\r
+                "3812039f.e87b54",\r
+                "c84f1dbb.f047b",\r
+                "1a6fc532.9edecb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "57f9125a.f4f11c",\r
+        "id": "bf47efb9.ef7f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1816.0004844665527,\r
-        "y": 4672.692457199097,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1790.0004844665527,\r
+        "y": 4686.66815662384,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "e06eae25.746e28"\r
+                "6e86a94c.fb3c98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25a824ba.d2e37c",\r
+        "id": "f7569ccb.527fb8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2155.0006370544434,\r
-        "y": 4706.835712790489,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2129.0006370544434,\r
+        "y": 4720.811412215233,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e06eae25.746e28",\r
+        "id": "6e86a94c.fb3c98",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1981.1671714782715,\r
-        "y": 4686.820290505886,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1955.1671714782715,\r
+        "y": 4700.79598993063,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "25a824ba.d2e37c",\r
-                "3db10379.cadefc"\r
+                "f7569ccb.527fb8",\r
+                "5306b235.f40434"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a5d8b36.aeca65",\r
+        "id": "4ddfdd9a.1fb534",\r
         "type": "save",\r
         "name": "save vnfc relationships",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1291.9049644470215,\r
-        "y": 4820.978354930878,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1265.9049644470215,\r
+        "y": 4834.954054355621,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "fbea59e9.f333f",\r
-                "14799014.2fab18"\r
+                "c2be51fa.60e598",\r
+                "2a3d4c91.ac8394"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7572056c.67fde4",\r
+        "id": "3a0d84a1.dc1034",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1801.904899597168,\r
-        "y": 4812.64519071579,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1775.904899597168,\r
+        "y": 4826.620890140533,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a494aad.c286a4",\r
+        "id": "afe00e2d.a0f838",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1797.0718078613281,\r
-        "y": 4864.296397686005,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1771.0718078613281,\r
+        "y": 4878.272097110748,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3e10eb95.8e38dc",\r
+        "id": "c56add47.3caa38",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1623.7381553649902,\r
-        "y": 4794.29597902298,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1597.7381553649902,\r
+        "y": 4808.271678447723,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "7572056c.67fde4",\r
-                "3db10379.cadefc"\r
+                "3a0d84a1.dc1034",\r
+                "5306b235.f40434"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb8fe9e3.991998",\r
+        "id": "efc908b3.5b4f1",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1623.7382316589355,\r
-        "y": 4847.295737743378,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1597.7382316589355,\r
+        "y": 4861.271437168121,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "7a494aad.c286a4",\r
-                "3db10379.cadefc"\r
+                "afe00e2d.a0f838",\r
+                "5306b235.f40434"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fbea59e9.f333f",\r
+        "id": "c2be51fa.60e598",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1466.9050407409668,\r
-        "y": 4794.311648845673,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1440.9050407409668,\r
+        "y": 4808.287348270416,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "3e10eb95.8e38dc"\r
+                "c56add47.3caa38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14799014.2fab18",\r
+        "id": "2a3d4c91.ac8394",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1475.4765739440918,\r
-        "y": 4846.93079328537,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1449.4765739440918,\r
+        "y": 4860.9064927101135,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "eb8fe9e3.991998"\r
+                "efc908b3.5b4f1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "efdceadd.e8246",\r
+        "id": "64a79036.af227",\r
         "type": "for",\r
         "name": "for each vnfc-network-role",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1289.3810844421387,\r
-        "y": 5237.834763050079,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1263.3810844421387,\r
+        "y": 5251.810462474823,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "bc7e2484.e69228"\r
+                "c0124012.781378"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf140a5d.20d0a",\r
+        "id": "a146e36e.bc5ed",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vfmoduleb.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 509.9999885559082,\r
-        "y": 2545.73858499527,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 483.9999885559082,\r
+        "y": 2559.7142844200134,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "502f6d13.ee70cc",\r
+        "id": "5fca11f4.669f4",\r
         "type": "for",\r
         "name": "for each vnfc-subnetwork-role",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1745.3336219787598,\r
-        "y": 5201.025196552277,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1719.3336219787598,\r
+        "y": 5215.00089597702,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "3183d8e5.672be"\r
+                "85888402.2be4b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3183d8e5.672be",\r
+        "id": "85888402.2be4b8",\r
         "type": "for",\r
         "name": "for each vnfc-address-family",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2012.6669654846191,\r
-        "y": 5200.025684833527,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1986.6669654846191,\r
+        "y": 5214.00138425827,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "779f95e4.f78a8c"\r
+                "9a087527.d5ab28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5357cf02.932768",\r
+        "id": "1e939e61.89f482",\r
         "type": "for",\r
         "name": "for each vnfc-ip-address",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2444.666576385498,\r
-        "y": 5266.691384315491,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2418.666576385498,\r
+        "y": 5280.667083740234,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "3c7bceb4.1549ba"\r
+                "7bcb5345.4ee26c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "779f95e4.f78a8c",\r
+        "id": "9a087527.d5ab28",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2223.666736602783,\r
-        "y": 5200.025141239166,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2197.666736602783,\r
+        "y": 5214.00084066391,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a3b35b4c.65bd08",\r
-                "5357cf02.932768"\r
+                "cb5d5c29.e70c1",\r
+                "1e939e61.89f482"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3b35b4c.65bd08",\r
+        "id": "cb5d5c29.e70c1",\r
         "type": "set",\r
         "name": "set tmp.address-family",\r
         "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",\r
         "comments": "",\r
-        "x": 2443.667064666748,\r
-        "y": 5120.025038719177,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2417.667064666748,\r
+        "y": 5134.000738143921,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3c7bceb4.1549ba",\r
+        "id": "7bcb5345.4ee26c",\r
         "type": "switchNode",\r
         "name": "switch address family",\r
         "xml": "<switch test='`$tmp.address-family`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2683.6666679382324,\r
-        "y": 5265.025206565857,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2657.6666679382324,\r
+        "y": 5279.000905990601,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "3dbb3b5c.4b19bc",\r
-                "5644f796.d8b738"\r
+                "a5ee9f3c.a8b118",\r
+                "cbf318c7.aa7798"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3dbb3b5c.4b19bc",\r
+        "id": "a5ee9f3c.a8b118",\r
         "type": "outcome",\r
         "name": "ipv4",\r
         "xml": "<outcome value='ipv4'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2880.809673309326,\r
-        "y": 5168.596467018127,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2854.809673309326,\r
+        "y": 5182.572166442871,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "98a03a47.d1bb1"\r
+                "af8d9d5c.4e2818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5644f796.d8b738",\r
+        "id": "cbf318c7.aa7798",\r
         "type": "outcome",\r
         "name": "ipv6",\r
         "xml": "<outcome value='ipv6'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2878.4287452697754,\r
-        "y": 5348.358498573303,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2852.4287452697754,\r
+        "y": 5362.334197998047,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "831b99d7.14637"\r
+                "38fedc99.f67e84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8eaadf17.3b8f38",\r
+        "id": "8093133b.217ed8",\r
         "type": "comment",\r
         "name": "Fixed IPs",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1762.3336372375488,\r
-        "y": 5162.692573547363,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1736.3336372375488,\r
+        "y": 5176.668272972107,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9054c457.8f5da",\r
+        "id": "512883d4.a75cdc",\r
         "type": "save",\r
         "name": "save l3-interface-ipv4-address-list object to A&AI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3324.1428031921387,\r
-        "y": 5116.929546991985,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3298.1428031921387,\r
+        "y": 5130.905246416729,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "2621f47c.ef48fc"\r
+                "caeff4c7.0f0308"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "98a03a47.d1bb1",\r
+        "id": "af8d9d5c.4e2818",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3030.809673309326,\r
-        "y": 5168.59638563792,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3004.809673309326,\r
+        "y": 5182.572085062664,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "9054c457.8f5da",\r
-                "cff14283.064d58"\r
+                "512883d4.a75cdc",\r
+                "8418bbb6.06414"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef84b8c0.919f68",\r
+        "id": "31b70f0e.de26f",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3907.4763221740723,\r
-        "y": 5135.263206164043,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3881.4763221740723,\r
+        "y": 5149.238905588787,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "74ceecc0.c34db4",\r
+        "id": "544248a1.55df98",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3737.642677307129,\r
-        "y": 5116.914039293926,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3711.642677307129,\r
+        "y": 5130.88973871867,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "ef84b8c0.919f68",\r
-                "379792a1.9d134e"\r
+                "31b70f0e.de26f",\r
+                "c4597b10.c8c598"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2621f47c.ef48fc",\r
+        "id": "caeff4c7.0f0308",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3580.8095626831055,\r
-        "y": 5116.929709116619,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3554.8095626831055,\r
+        "y": 5130.905408541363,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "74ceecc0.c34db4"\r
+                "544248a1.55df98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cff14283.064d58",\r
+        "id": "8418bbb6.06414",\r
         "type": "save",\r
         "name": "save l3-interface-ipv4-address-list relationships",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3319.1430473327637,\r
-        "y": 5215.262965838116,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3293.1430473327637,\r
+        "y": 5229.238665262859,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "298ae030.16817",\r
-                "72d565c9.1fdcd4"\r
+                "ede48cf8.ee34a",\r
+                "6164433f.493c0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ca890e0.85d5d",\r
+        "id": "4c64363c.6d06a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3905.809429168701,\r
-        "y": 5206.929637591045,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3879.809429168701,\r
+        "y": 5220.905337015789,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5bb6eebc.15be48",\r
+        "id": "2d13a4f0.bd25d4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3905.976291656494,\r
-        "y": 5256.914095560711,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3879.976291656494,\r
+        "y": 5270.8897949854545,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "602f85ca.3af6ec",\r
+        "id": "c041ca58.d5cef",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3739.309299468994,\r
-        "y": 5186.914010683697,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3713.309299468994,\r
+        "y": 5200.88971010844,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "6ca890e0.85d5d",\r
-                "379792a1.9d134e"\r
+                "4c64363c.6d06a",\r
+                "c4597b10.c8c598"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "671adf60.dbe2f",\r
+        "id": "99e2f815.bdbdd8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3739.3093757629395,\r
-        "y": 5239.913769404095,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3713.3093757629395,\r
+        "y": 5253.889468828838,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "5bb6eebc.15be48",\r
-                "379792a1.9d134e"\r
+                "2d13a4f0.bd25d4",\r
+                "c4597b10.c8c598"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "298ae030.16817",\r
+        "id": "ede48cf8.ee34a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3582.4761848449707,\r
-        "y": 5186.92968050639,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3556.4761848449707,\r
+        "y": 5200.905379931133,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "602f85ca.3af6ec"\r
+                "c041ca58.d5cef"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72d565c9.1fdcd4",\r
+        "id": "6164433f.493c0c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3591.0477180480957,\r
-        "y": 5239.548824946087,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3565.0477180480957,\r
+        "y": 5253.5245243708305,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "671adf60.dbe2f"\r
+                "99e2f815.bdbdd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13f0f3c7.903904",\r
+        "id": "f831731c.2fd57",\r
         "type": "save",\r
         "name": "save l3-interface-ipv6-address-list object to A&AI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3322.9525413513184,\r
-        "y": 5295.977602958679,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3296.9525413513184,\r
+        "y": 5309.953302383423,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "cd295240.6fd0c"\r
+                "2bc07238.f95d5e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "831b99d7.14637",\r
+        "id": "38fedc99.f67e84",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3029.619411468506,\r
-        "y": 5347.644441604614,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3003.619411468506,\r
+        "y": 5361.620141029358,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "13f0f3c7.903904",\r
-                "9e5eb4e4.990e68"\r
+                "f831731c.2fd57",\r
+                "b7a7473f.797278"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91bc7464.bf1b48",\r
+        "id": "cf91be24.b998f",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3906.286060333252,\r
-        "y": 5314.311262130737,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3880.286060333252,\r
+        "y": 5328.286961555481,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2ba2dbf4.a9426c",\r
+        "id": "ea259af2.224e08",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3736.4524154663086,\r
-        "y": 5295.96209526062,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3710.4524154663086,\r
+        "y": 5309.937794685364,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "91bc7464.bf1b48",\r
-                "379792a1.9d134e"\r
+                "cf91be24.b998f",\r
+                "c4597b10.c8c598"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd295240.6fd0c",\r
+        "id": "2bc07238.f95d5e",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3579.619300842285,\r
-        "y": 5295.977765083313,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3553.619300842285,\r
+        "y": 5309.953464508057,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "2ba2dbf4.a9426c"\r
+                "ea259af2.224e08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e5eb4e4.990e68",\r
+        "id": "b7a7473f.797278",\r
         "type": "save",\r
         "name": "save l3-interface-ipv6-address-list relationships",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3317.9527854919434,\r
-        "y": 5394.31102180481,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3291.9527854919434,\r
+        "y": 5408.286721229553,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "821e155.0c03768",\r
-                "d1daf5a7.4e5038"\r
+                "d5743cde.2a99a",\r
+                "654cf89c.3dd958"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "702086e5.a87928",\r
+        "id": "6dc75c34.cbb114",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3904.619167327881,\r
-        "y": 5385.977693557739,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3878.619167327881,\r
+        "y": 5399.953392982483,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "810daf5d.d981a",\r
+        "id": "1830af79.d932b9",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3908.1193885803223,\r
-        "y": 5432.628710031509,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3882.1193885803223,\r
+        "y": 5446.604409456253,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a387fb05.ace298",\r
+        "id": "bf7ed658.687448",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3738.119037628174,\r
-        "y": 5365.962066650391,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3712.119037628174,\r
+        "y": 5379.937766075134,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "702086e5.a87928",\r
-                "379792a1.9d134e"\r
+                "6dc75c34.cbb114",\r
+                "c4597b10.c8c598"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e5a57f5.b0c6d",\r
+        "id": "6452b9f7.7198e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3738.119113922119,\r
-        "y": 5418.961825370789,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3712.119113922119,\r
+        "y": 5432.937524795532,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "810daf5d.d981a",\r
-                "379792a1.9d134e"\r
+                "1830af79.d932b9",\r
+                "c4597b10.c8c598"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "821e155.0c03768",\r
+        "id": "d5743cde.2a99a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3581.2859230041504,\r
-        "y": 5365.9777364730835,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3555.2859230041504,\r
+        "y": 5379.953435897827,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a387fb05.ace298"\r
+                "bf7ed658.687448"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d1daf5a7.4e5038",\r
+        "id": "654cf89c.3dd958",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3589.8574562072754,\r
-        "y": 5418.596880912781,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3563.8574562072754,\r
+        "y": 5432.572580337524,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "2e5a57f5.b0c6d"\r
+                "6452b9f7.7198e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3a4933c.85a3c8",\r
+        "id": "338a7f2e.d4c058",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1044.3335914611816,\r
-        "y": 6124.692138195038,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1018.3335914611816,\r
+        "y": 6138.6678376197815,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "977e1113.8ffe08",\r
-                "98920223.9d1788",\r
-                "4e4aa877.9d0b4",\r
-                "509b4c19.fe40b4"\r
+                "cdfadd41.c27e88",\r
+                "c0d1ee17.6f56f",\r
+                "29da88d2.619828",\r
+                "778d41ae.068ed"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41944760.d8c68",\r
+        "id": "f73cf5ca.890db",\r
         "type": "for",\r
         "name": "for each vnfc",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1692.3337669372559,\r
-        "y": 6247.025886058807,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1666.3337669372559,\r
+        "y": 6261.001585483551,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "61dec192.4d7148"\r
+                "f728c8ba.23c06"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c022e9c3.807898",\r
+        "id": "1824604b.2416d",\r
         "type": "save",\r
         "name": "save vip-ipv4-address-list object to A&AI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1775.3336219787598,\r
-        "y": 6078.358897686005,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1749.3336219787598,\r
+        "y": 6092.334597110748,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "7a0ce7a9.67d428",\r
-                "8bc67e6d.794ba8"\r
+                "438a7d62.57f234",\r
+                "1ad76478.51609c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e4aa877.9d0b4",\r
+        "id": "29da88d2.619828",\r
         "type": "for",\r
         "name": "for each floating ipv4 address",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1283.3336143493652,\r
-        "y": 6136.358970165253,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1257.3336143493652,\r
+        "y": 6150.334669589996,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "ad98d310.ff19b"\r
+                "37c98a04.bb93de"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad98d310.ff19b",\r
+        "id": "37c98a04.bb93de",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1509.3336143493652,\r
-        "y": 6134.358970165253,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1483.3336143493652,\r
+        "y": 6148.334669589996,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "c022e9c3.807898",\r
-                "db158df8.1167b",\r
-                "41944760.d8c68"\r
+                "1824604b.2416d",\r
+                "83dc1a75.df99f",\r
+                "f73cf5ca.890db"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ef8032.ed11efc",\r
+        "id": "9e39d198.93b71",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2337.3336219787598,\r
-        "y": 6068.358897686005,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2311.3336219787598,\r
+        "y": 6082.334597110748,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e03d6e17.c3c688",\r
+        "id": "61f82df6.e1bc7c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2337.5004844665527,\r
-        "y": 6118.34335565567,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2311.5004844665527,\r
+        "y": 6132.319055080414,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fbbe1588.40205",\r
+        "id": "70e4e939.7a5698",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2170.8334922790527,\r
-        "y": 6048.343270778656,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2144.8334922790527,\r
+        "y": 6062.3189702034,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "7ef8032.ed11efc",\r
-                "2e738df3.a266b2"\r
+                "9e39d198.93b71",\r
+                "197c2a2b.1fd476"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a573c62.740a54",\r
+        "id": "122e2a34.2cb72e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2170.833568572998,\r
-        "y": 6101.343029499054,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2144.833568572998,\r
+        "y": 6115.318728923798,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "e03d6e17.c3c688",\r
-                "2e738df3.a266b2"\r
+                "61f82df6.e1bc7c",\r
+                "197c2a2b.1fd476"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a0ce7a9.67d428",\r
+        "id": "438a7d62.57f234",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2014.0003776550293,\r
-        "y": 6048.358940601349,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1988.0003776550293,\r
+        "y": 6062.3346400260925,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "fbbe1588.40205"\r
+                "70e4e939.7a5698"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8bc67e6d.794ba8",\r
+        "id": "1ad76478.51609c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2022.5719108581543,\r
-        "y": 6100.978085041046,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1996.5719108581543,\r
+        "y": 6114.95378446579,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "2a573c62.740a54"\r
+                "122e2a34.2cb72e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d116331.dbe40c",\r
+        "id": "65898e8.b71e1f",\r
         "type": "save",\r
         "name": "save vip-ipv4-address-list relationships",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2111.000217437744,\r
-        "y": 6191.0255608558655,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2085.000217437744,\r
+        "y": 6205.001260280609,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "5c248e68.67eca8",\r
-                "b00109fd.7018a"\r
+                "402e9d9b.733204",\r
+                "70c9212c.bbca1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "194ccbea.7b2314",\r
+        "id": "ace25aed.ae464",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2680.6666259765625,\r
-        "y": 6183.025530397892,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2654.6666259765625,\r
+        "y": 6197.001229822636,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "24399d85.a919ca",\r
+        "id": "31548e06.a1695a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2680.833595275879,\r
-        "y": 6233.009704113007,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2654.833595275879,\r
+        "y": 6246.98540353775,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "215feb82.3c18c4",\r
+        "id": "50f58ee.2b436f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2514.1664962768555,\r
-        "y": 6163.009903490543,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2488.1664962768555,\r
+        "y": 6176.985602915287,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "194ccbea.7b2314",\r
-                "2e738df3.a266b2"\r
+                "ace25aed.ae464",\r
+                "197c2a2b.1fd476"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd320fdf.1dd3",\r
+        "id": "d18b7bf8.606268",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2514.166572570801,\r
-        "y": 6216.009662210941,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2488.166572570801,\r
+        "y": 6229.985361635685,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "24399d85.a919ca",\r
-                "2e738df3.a266b2"\r
+                "31548e06.a1695a",\r
+                "197c2a2b.1fd476"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c248e68.67eca8",\r
+        "id": "402e9d9b.733204",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2357.333381652832,\r
-        "y": 6163.025573313236,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2331.333381652832,\r
+        "y": 6177.00127273798,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "215feb82.3c18c4"\r
+                "50f58ee.2b436f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b00109fd.7018a",\r
+        "id": "70c9212c.bbca1",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2365.904914855957,\r
-        "y": 6215.6447177529335,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2339.904914855957,\r
+        "y": 6229.620417177677,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "bd320fdf.1dd3"\r
+                "d18b7bf8.606268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14908e4.0b7c572",\r
+        "id": "7fc77ef2.07aa8",\r
         "type": "save",\r
         "name": "save vip-ipv6-address-list object to A&AI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1778.66695022583,\r
-        "y": 6401.691581249237,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1752.66695022583,\r
+        "y": 6415.667280673981,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "5b0cff7c.4a4298",\r
-                "31df6b80.4ae1ac"\r
+                "809737d2.f14978",\r
+                "965dffd5.95084"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "509b4c19.fe40b4",\r
+        "id": "778d41ae.068ed",\r
         "type": "for",\r
         "name": "for each floating ipv6 address",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1286.6669425964355,\r
-        "y": 6458.691653728485,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1260.6669425964355,\r
+        "y": 6472.667353153229,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "3c84431b.8f327c"\r
+                "8f96d394.0feec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c84431b.8f327c",\r
+        "id": "8f96d394.0feec",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1512.6669425964355,\r
-        "y": 6457.691653728485,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1486.6669425964355,\r
+        "y": 6471.667353153229,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "14908e4.0b7c572",\r
-                "c9260312.daf868",\r
-                "5aa22816.429f48"\r
+                "7fc77ef2.07aa8",\r
+                "155a1d21.29a5db",\r
+                "ec86e082.0ebd08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd2eb416.73c908",\r
+        "id": "6546b9c9.b685b8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2340.66695022583,\r
-        "y": 6391.691581249237,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2314.66695022583,\r
+        "y": 6405.667280673981,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "10c3fbcd.513b94",\r
+        "id": "8dfef510.d4b698",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2340.833812713623,\r
-        "y": 6441.676039218903,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2314.833812713623,\r
+        "y": 6455.651738643646,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "28179059.d61ef8",\r
+        "id": "4ccd550e.0b5b84",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2174.166820526123,\r
-        "y": 6371.675954341888,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2148.166820526123,\r
+        "y": 6385.651653766632,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "dd2eb416.73c908",\r
-                "2e738df3.a266b2"\r
+                "6546b9c9.b685b8",\r
+                "197c2a2b.1fd476"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "35207268.e2e96e",\r
+        "id": "4638bb37.c9cf24",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2174.1668968200684,\r
-        "y": 6424.675713062286,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2148.1668968200684,\r
+        "y": 6438.65141248703,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "10c3fbcd.513b94",\r
-                "2e738df3.a266b2"\r
+                "8dfef510.d4b698",\r
+                "197c2a2b.1fd476"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5b0cff7c.4a4298",\r
+        "id": "809737d2.f14978",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2017.3337059020996,\r
-        "y": 6371.691624164581,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1991.3337059020996,\r
+        "y": 6385.667323589325,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "28179059.d61ef8"\r
+                "4ccd550e.0b5b84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "31df6b80.4ae1ac",\r
+        "id": "965dffd5.95084",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2025.9052391052246,\r
-        "y": 6424.310768604279,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1999.9052391052246,\r
+        "y": 6438.286468029022,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "35207268.e2e96e"\r
+                "4638bb37.c9cf24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "be05c61f.2a3f48",\r
+        "id": "1bfe393d.78ce37",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2674.0002059936523,\r
-        "y": 6504.6916318535805,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2648.0002059936523,\r
+        "y": 6518.667331278324,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4ddaaa06.7ec0e4",\r
+        "id": "8e452db7.9148e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2674.1670684814453,\r
-        "y": 6554.676089823246,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2648.1670684814453,\r
+        "y": 6568.65178924799,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6169d8f1.0fca9",\r
+        "id": "d1798ee3.3c5528",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2507.5000762939453,\r
-        "y": 6484.676004946232,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2481.5000762939453,\r
+        "y": 6498.6517043709755,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "be05c61f.2a3f48",\r
-                "2e738df3.a266b2"\r
+                "1bfe393d.78ce37",\r
+                "197c2a2b.1fd476"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "104ad559.84aa1b",\r
+        "id": "6080e54e.a2c7bc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2507.5001525878906,\r
-        "y": 6537.67576366663,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2481.5001525878906,\r
+        "y": 6551.651463091373,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4ddaaa06.7ec0e4",\r
-                "2e738df3.a266b2"\r
+                "8e452db7.9148e",\r
+                "197c2a2b.1fd476"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3625278f.94f36",\r
+        "id": "1eacc679.59eb8a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2350.666961669922,\r
-        "y": 6484.691674768925,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2324.666961669922,\r
+        "y": 6498.667374193668,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "6169d8f1.0fca9"\r
+                "d1798ee3.3c5528"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dbaa45c3.a58ac8",\r
+        "id": "60fbd117.43ed78",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2359.238494873047,\r
-        "y": 6537.310819208622,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2333.238494873047,\r
+        "y": 6551.286518633366,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "104ad559.84aa1b"\r
+                "6080e54e.a2c7bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6bd05851.cda258",\r
+        "id": "870acd7f.91e8a",\r
         "type": "save",\r
         "name": "save vip-ipv6-address-list relationships",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2106.3338050842285,\r
-        "y": 6513.358093738556,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2080.3338050842285,\r
+        "y": 6527.3337931633,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "3625278f.94f36",\r
-                "dbaa45c3.a58ac8"\r
+                "1eacc679.59eb8a",\r
+                "60fbd117.43ed78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f96a138.acc9c8",\r
+        "id": "99a0939e.edd618",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1162.3334770202637,\r
-        "y": 4321.691486895084,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1136.3334770202637,\r
+        "y": 4335.667186319828,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3db10379.cadefc",\r
+        "id": "5306b235.f40434",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2327.0004234313965,\r
-        "y": 4659.692221999168,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2301.0004234313965,\r
+        "y": 4673.667921423912,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b976bf80.a00868",\r
+        "id": "89b0c713.c7a1a8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2035.6670036315918,\r
-        "y": 5876.6920592188835,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2009.6670036315918,\r
+        "y": 5890.667758643627,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2e738df3.a266b2",\r
+        "id": "197c2a2b.1fd476",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2984.667133331299,\r
-        "y": 5995.691905498505,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2958.667133331299,\r
+        "y": 6009.667604923248,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "379792a1.9d134e",\r
+        "id": "c4597b10.c8c598",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4304.0001220703125,\r
-        "y": 5043.357985436916,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 4278.0001220703125,\r
+        "y": 5057.33368486166,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1fc575ba.ed4b2a",\r
+        "id": "1453c597.eede0a",\r
         "type": "set",\r
         "name": "set created_flag",\r
         "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",\r
         "comments": "",\r
-        "x": 1269.0002479553223,\r
-        "y": 4760.691877782345,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1243.0002479553223,\r
+        "y": 4774.6675772070885,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "977e1113.8ffe08",\r
+        "id": "cdfadd41.c27e88",\r
         "type": "set",\r
         "name": "set created-flag",\r
         "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",\r
         "comments": "",\r
-        "x": 1239.6670036315918,\r
-        "y": 6008.6920592188835,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1213.6670036315918,\r
+        "y": 6022.667758643627,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "db158df8.1167b",\r
+        "id": "83dc1a75.df99f",\r
         "type": "set",\r
         "name": "set created-ipv4-flag",\r
         "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",\r
         "comments": "",\r
-        "x": 1712.6669692993164,\r
-        "y": 6136.6921390891075,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1686.6669692993164,\r
+        "y": 6150.667838513851,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9260312.daf868",\r
+        "id": "155a1d21.29a5db",\r
         "type": "set",\r
         "name": "set created-ipv6-flag",\r
         "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",\r
         "comments": "",\r
-        "x": 1718.0003051757812,\r
-        "y": 6462.691742360592,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1692.0003051757812,\r
+        "y": 6476.6674417853355,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c29ebd4.1b8af4",\r
+        "id": "569de2d6.f82d54",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1819.0004234313965,\r
-        "y": 4720.692116677761,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1793.0004234313965,\r
+        "y": 4734.667816102505,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "e06eae25.746e28"\r
+                "6e86a94c.fb3c98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8b952a9.c78298",\r
+        "id": "cda23fd1.47e1a8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-vlan-tagging-assign",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-vlan-tagging-assign' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 602.6667823791504,\r
-        "y": 6800.691919803619,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 576.6667823791504,\r
+        "y": 6814.667619228363,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "644ad1c5.87cc3"\r
+                "e90bb7c8.08e178"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "644ad1c5.87cc3",\r
+        "id": "e90bb7c8.08e178",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 947.0001983642578,\r
-        "y": 6800.025414943695,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 921.0001983642578,\r
+        "y": 6814.001114368439,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "52273fde.82a9b"\r
+                "18d401ff.91ad6e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "52273fde.82a9b",\r
+        "id": "18d401ff.91ad6e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1102.000072479248,\r
-        "y": 6800.025210857391,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1076.000072479248,\r
+        "y": 6814.000910282135,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "cf013b75.034798",\r
-                "6bc578d2.be185",\r
-                "d4d7a21f.792e98"\r
+                "9c285c4.54c07a",\r
+                "53893b7.1824544",\r
+                "1e2c10de.ec2827"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf013b75.034798",\r
+        "id": "9c285c4.54c07a",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1450.3333625793457,\r
-        "y": 6745.025630712509,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1424.3333625793457,\r
+        "y": 6759.001330137253,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6bc578d2.be185",\r
+        "id": "53893b7.1824544",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n",\r
         "comments": "",\r
-        "x": 1278.6668014526367,\r
-        "y": 6843.358858704567,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1252.6668014526367,\r
+        "y": 6857.334558129311,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d4d7a21f.792e98",\r
+        "id": "1e2c10de.ec2827",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vlantaggingfailure.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1273.6666984558105,\r
-        "y": 6796.691714763641,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1247.6666984558105,\r
+        "y": 6810.667414188385,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b1406c81.923cc",\r
+        "id": "f31d4136.dbad18",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 240.8928680419922,\r
-        "y": 556.5714416503906,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 214.8928680419922,\r
+        "y": 570.5471410751343,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "43097907.f1acb8",\r
-                "6fdfcdf3.2ecd44",\r
-                "c5b83baf.fcb2b8",\r
-                "169ef671.ac8942",\r
-                "58f29161.867a9",\r
-                "3a7d1430.c71c54",\r
-                "cfe429db.9ee878",\r
-                "59c722cd.d5e3ac",\r
-                "9ed32d4f.dbd058"\r
+                "8e5c6ccb.163dc",\r
+                "76da2351.1e772c",\r
+                "729b2317.d41764",\r
+                "c81a4e60.7d0e28",\r
+                "ebe8b394.b57a1",\r
+                "a8e5db24.a73738",\r
+                "bd911df4.417368",\r
+                "5e3595bc.cfed8c",\r
+                "5eb11d31.97f244",\r
+                "557cfb68.ef7394"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc91d00d.836b9",\r
+        "id": "6758cc3d.63107c",\r
         "type": "switchNode",\r
         "name": "switch from-preload",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 531.904712677002,\r
-        "y": 2612.1672048568726,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 505.90471267700195,\r
+        "y": 2626.142904281616,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "dade25b1.c84ca",\r
-                "947e2614.ca4708"\r
+                "cb04a746.6669f",\r
+                "824ab2b0.df6428"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dade25b1.c84ca",\r
+        "id": "cb04a746.6669f",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 703.8094444274902,\r
-        "y": 2589.548225402832,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 677.8094444274902,\r
+        "y": 2603.5239248275757,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a599121f.29119"\r
+                "15aec9d4.c06a16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "947e2614.ca4708",\r
+        "id": "824ab2b0.df6428",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 705.4760971069336,\r
-        "y": 2634.5480642318726,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 679.4760971069336,\r
+        "y": 2648.523763656616,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "f0b8dd3.f8d9fa"\r
+                "1b5ec8ed.f0fa5f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a599121f.29119",\r
+        "id": "15aec9d4.c06a16",\r
         "type": "set",\r
         "name": "set automated-assignment to true",\r
         "xml": "<set>\n<parameter name='automated-assignment' value='true' />\n",\r
         "comments": "",\r
-        "x": 918.8094291687012,\r
-        "y": 2587.88139629364,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 892.8094291687012,\r
+        "y": 2601.857095718384,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f0b8dd3.f8d9fa",\r
+        "id": "1b5ec8ed.f0fa5f",\r
         "type": "set",\r
         "name": "set automated-assignment to false",\r
         "xml": "<set>\n<parameter name='automated-assignment' value='false' />\n",\r
         "comments": "",\r
-        "x": 917.142749786377,\r
-        "y": 2632.8813161849976,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 891.142749786377,\r
+        "y": 2646.857015609741,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5aa22816.429f48",\r
+        "id": "ec86e082.0ebd08",\r
         "type": "for",\r
         "name": "for each vnfc",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1693.4288368225098,\r
-        "y": 6561.572165966034,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1667.4288368225098,\r
+        "y": 6575.547865390778,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "5e28153d.aad85c"\r
+                "63b023e.b6b035c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "375c5c4e.30f4cc",\r
+        "id": "7edee497.097a8c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 158.00014877319336,\r
-        "y": 7041.359684050083,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 132.00014877319336,\r
+        "y": 7055.335383474827,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e5e2fde7.2191d",\r
+        "id": "4f9ff09e.f47468",\r
         "type": "for",\r
         "name": "for each vm-type",\r
         "xml": "<for silentFailure='true' index='vm-type-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 510.66680908203125,\r
-        "y": 3972.358087539673,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 484.66680908203125,\r
+        "y": 3986.3337869644165,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "d363401e.7355c"\r
+                "617011f9.ea2ab"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d363401e.7355c",\r
+        "id": "617011f9.ea2ab",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 701.166877746582,\r
-        "y": 3973.19132232666,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 675.166877746582,\r
+        "y": 3987.167021751404,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "e3fa98f1.b438d"\r
+                "83d39866.f1404"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3fa98f1.b438d",\r
+        "id": "83d39866.f1404",\r
         "type": "for",\r
         "name": "for each vm-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 902.6668090820312,\r
-        "y": 3972.358087539673,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 876.6668090820312,\r
+        "y": 3986.3337869644165,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "40b3e744.61964"\r
+                "1bc0649f.f8534b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40b3e744.61964",\r
+        "id": "1bc0649f.f8534b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1092.500129699707,\r
-        "y": 3971.857526779175,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1066.500129699707,\r
+        "y": 3985.8332262039185,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "e55f887a.2c28b8"\r
+                "d88aed65.46a24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e55f887a.2c28b8",\r
+        "id": "d88aed65.46a24",\r
         "type": "get-resource",\r
         "name": "get-resource VFC_RELATED_NETWORK_ROLE",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1382.0001029968262,\r
-        "y": 3970.358169555664,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1356.0001029968262,\r
+        "y": 3984.3338689804077,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "38728e09.f4cc2a",\r
-                "61cfce62.115458"\r
+                "2f7749ca.aec726",\r
+                "e8b4eef1.ffee3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38728e09.f4cc2a",\r
+        "id": "2f7749ca.aec726",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1653.00004196167,\r
-        "y": 3875.024871826172,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1627.00004196167,\r
+        "y": 3889.0005712509155,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "9486bfbc.c85ee"\r
+                "66c6e90.48fb618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9486bfbc.c85ee",\r
+        "id": "66c6e90.48fb618",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1800.190559387207,\r
-        "y": 3873.57288646698,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1774.190559387207,\r
+        "y": 3887.5485858917236,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "ff352d2b.40694",\r
-                "f46bd80d.b62c1"\r
+                "ec91bd86.5aa968",\r
+                "93d1e771.4e016"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61cfce62.115458",\r
+        "id": "e8b4eef1.ffee3",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1641.333293914795,\r
-        "y": 4094.691343307495,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1615.333293914795,\r
+        "y": 4108.667042732239,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a9e83864.3544c8"\r
+                "3cdc82f8.a4faee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aeabd7d7.f9db5",\r
+        "id": "4cc96e52.e6a0c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2059.66654586792,\r
-        "y": 4096.69109916687,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2033.66654586792,\r
+        "y": 4110.666798591614,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "777f849.576bdfc",\r
-                "65c58e18.2c5ff",\r
-                "de7a8e52.6c38f",\r
-                "d8f45dd9.fffaa",\r
-                "d55dcbe4.b448d8",\r
-                "dd07d863.1ec54",\r
-                "66d1505f.39733",\r
-                "9bb872f6.753258"\r
+                "a85f734e.8216f8",\r
+                "d8f7b669.bdae5",\r
+                "f0b1e50.2419f98",\r
+                "c9e00ddc.ec7f9",\r
+                "5f1709b2.75df38",\r
+                "ed23f3c3.06c99",\r
+                "801aa393.e7c828",\r
+                "bc7278c.42fbb88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff352d2b.40694",\r
+        "id": "ec91bd86.5aa968",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1952.3334159851074,\r
-        "y": 3870.358123779297,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1926.3334159851074,\r
+        "y": 3884.3338232040405,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "65c58e18.2c5ff",\r
+        "id": "d8f7b669.bdae5",\r
         "type": "for",\r
         "name": "for each vnf network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2254.6666831970215,\r
-        "y": 3964.0247554779053,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2228.6666831970215,\r
+        "y": 3978.000454902649,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "287be929.0998de"\r
+                "ab33d64f.d9b14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "777f849.576bdfc",\r
+        "id": "a85f734e.8216f8",\r
         "type": "set",\r
         "name": "set found-related-network to false",\r
         "xml": "<set>\n<parameter name='found-related-network' value='false' />\n",\r
         "comments": "",\r
-        "x": 2294.666759490967,\r
-        "y": 3905.6915321350098,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2268.666759490967,\r
+        "y": 3919.6672315597534,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8af8893c.0f1fc8",\r
+        "id": "a7f98828.b1bf6",\r
         "type": "for",\r
         "name": "for each related network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2653.666645050049,\r
-        "y": 3940.6910190582275,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2627.666645050049,\r
+        "y": 3954.666718482971,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "7e43f742.984c4"\r
+                "ee66934b.2211c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "287be929.0998de",\r
+        "id": "ab33d64f.d9b14",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2442.6666831970215,\r
-        "y": 3964.0247554779053,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2416.6666831970215,\r
+        "y": 3978.000454902649,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "8af8893c.0f1fc8",\r
-                "44f2cc37.a78364"\r
+                "a7f98828.b1bf6",\r
+                "c6074e1a.a9bd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e43f742.984c4",\r
+        "id": "ee66934b.2211c",\r
         "type": "switchNode",\r
         "name": "switch network-role matches",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2905.666561126709,\r
-        "y": 3940.691095352173,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2879.666561126709,\r
+        "y": 3954.6667947769165,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "13b580a4.638417"\r
+                "6379e03d.d86428"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a9e83864.3544c8",\r
+        "id": "3cdc82f8.a4faee",\r
         "type": "for",\r
         "name": "for each db related-network",\r
         "xml": "<for index='db-related-network-index' start='0' end='`$db.vnf-related-network-role_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1845.6666679382324,\r
-        "y": 4095.35809135437,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1819.6666679382324,\r
+        "y": 4109.333790779114,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "aeabd7d7.f9db5"\r
+                "4cc96e52.e6a0c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4c894758.36b448",\r
+        "id": "228dd6f5.02d922",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 326.6669120788574,\r
-        "y": 7001.359684050083,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 300.6669120788574,\r
+        "y": 7015.335383474827,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "13b580a4.638417",\r
+        "id": "6379e03d.d86428",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3105.666561126709,\r
-        "y": 3938.691095352173,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3079.666561126709,\r
+        "y": 3952.6667947769165,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "32afed8d.51d1a2"\r
+                "be891755.bf2fc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32afed8d.51d1a2",\r
+        "id": "be891755.bf2fc8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3259.666561126709,\r
-        "y": 3936.691095352173,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3233.666561126709,\r
+        "y": 3950.6667947769165,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "f204e763.59bda8",\r
-                "85e8b1c6.3df998",\r
-                "334d9e50.554812"\r
+                "b8f64431.0e9ce",\r
+                "dfbc238f.56c8f",\r
+                "742ee78e.6f2f6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f204e763.59bda8",\r
+        "id": "b8f64431.0e9ce",\r
         "type": "set",\r
         "name": "set found-related-network to true",\r
         "xml": "<set>\n<parameter name='found-related-network' value='true' />\n",\r
         "comments": "",\r
-        "x": 3491.666721343994,\r
-        "y": 3896.3576793670654,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3465.666721343994,\r
+        "y": 3910.333378791809,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "85e8b1c6.3df998",\r
+        "id": "dfbc238f.56c8f",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 3414.999897003174,\r
-        "y": 3983.024429321289,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3388.999897003174,\r
+        "y": 3997.0001287460327,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "de7a8e52.6c38f",\r
+        "id": "f0b1e50.2419f98",\r
         "type": "switchNode",\r
         "name": "switch found-related-network",\r
         "xml": "<switch test='`$found-related-network`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2277.6666145324707,\r
-        "y": 4039.6912326812744,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2251.6666145324707,\r
+        "y": 4053.666932106018,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "b21eb0fb.04ea08"\r
+                "66365547.f331dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b21eb0fb.04ea08",\r
+        "id": "66365547.f331dc",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2471.6666145324707,\r
-        "y": 4037.6912326812744,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2445.6666145324707,\r
+        "y": 4051.666932106018,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "86e33f55.12f7a"\r
+                "b53b662c.742d2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc2b0b96.f1ccb",\r
+        "id": "40a9653b.0b6d7c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2749.6666145324707,\r
-        "y": 4035.6912326812744,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2723.6666145324707,\r
+        "y": 4049.666932106018,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "86e33f55.12f7a",\r
+        "id": "b53b662c.742d2",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2601.6666145324707,\r
-        "y": 4037.6912326812744,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2575.6666145324707,\r
+        "y": 4051.666932106018,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "bc2b0b96.f1ccb",\r
-                "f46bd80d.b62c1"\r
+                "40a9653b.0b6d7c",\r
+                "93d1e771.4e016"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f46bd80d.b62c1",\r
+        "id": "93d1e771.4e016",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2694.3334159851074,\r
-        "y": 3800.358123779297,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2668.3334159851074,\r
+        "y": 3814.3338232040405,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d8f45dd9.fffaa",\r
+        "id": "c9e00ddc.ec7f9",\r
         "type": "set",\r
         "name": "set is-trunked and segmentation-id in vm-network",\r
         "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",\r
         "comments": "",\r
-        "x": 2339.6666145324707,\r
-        "y": 4087.6912326812744,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2313.6666145324707,\r
+        "y": 4101.666932106018,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dd07d863.1ec54",\r
+        "id": "ed23f3c3.06c99",\r
         "type": "switchNode",\r
         "name": "switch rn-index",\r
         "xml": "<switch test='`$rn-index`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2227.6666145324707,\r
-        "y": 4195.691232681274,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2201.6666145324707,\r
+        "y": 4209.666932106018,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a5dcf4c4.8aa428"\r
+                "d39e156e.f32e6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d55dcbe4.b448d8",\r
+        "id": "5f1709b2.75df38",\r
         "type": "set",\r
         "name": "set rn-index to related network length",\r
         "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",\r
         "comments": "",\r
-        "x": 2299.6666145324707,\r
-        "y": 4139.691232681274,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2273.6666145324707,\r
+        "y": 4153.666932106018,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a5dcf4c4.8aa428",\r
+        "id": "d39e156e.f32e6",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2391.6666145324707,\r
-        "y": 4195.691232681274,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2365.6666145324707,\r
+        "y": 4209.666932106018,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "aaf887bc.8a7d1"\r
+                "fa5ee6e9.4c4208"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aaf887bc.8a7d1",\r
+        "id": "fa5ee6e9.4c4208",\r
         "type": "set",\r
         "name": "set rn-index to 0",\r
         "xml": "<set>\n<parameter name='rn-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 2551.6666145324707,\r
-        "y": 4195.691232681274,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2525.6666145324707,\r
+        "y": 4209.666932106018,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "66d1505f.39733",\r
+        "id": "801aa393.e7c828",\r
         "type": "set",\r
         "name": "set related-network data",\r
         "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",\r
         "comments": "",\r
-        "x": 2251.6666145324707,\r
-        "y": 4247.691232681274,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2225.6666145324707,\r
+        "y": 4261.666932106018,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9bb872f6.753258",\r
+        "id": "bc7278c.42fbb88",\r
         "type": "set",\r
         "name": "set new related network length",\r
         "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",\r
         "comments": "",\r
-        "x": 2269.6666145324707,\r
-        "y": 4299.691232681274,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2243.6666145324707,\r
+        "y": 4313.666932106018,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "44f2cc37.a78364",\r
+        "id": "c6074e1a.a9bd",\r
         "type": "switchNode",\r
         "name": "switch found-related-network",\r
         "xml": "<switch test='`$found-related-network`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2666.6666679382324,\r
-        "y": 3988.357879638672,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2640.6666679382324,\r
+        "y": 4002.3335790634155,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "21303fe3.7cc7a8"\r
+                "8293e055.0b529"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21303fe3.7cc7a8",\r
+        "id": "8293e055.0b529",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2863.3335304260254,\r
-        "y": 3988.3582515716553,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2837.3335304260254,\r
+        "y": 4002.333950996399,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "c3c23e6e.f406e8"\r
+                "acab0841.3643f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3c23e6e.f406e8",\r
+        "id": "acab0841.3643f8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 2993.3334159851074,\r
-        "y": 3986.691375732422,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2967.3334159851074,\r
+        "y": 4000.6670751571655,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "334d9e50.554812",\r
+        "id": "742ee78e.6f2f6",\r
         "type": "set",\r
         "name": "save indexes",\r
         "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",\r
         "comments": "",\r
-        "x": 3433.3336296081543,\r
-        "y": 3938.3582496643066,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3407.3336296081543,\r
+        "y": 3952.3339490890503,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b8c9d127.4eec38",\r
+        "id": "6499d375.d639b4",\r
         "type": "execute",\r
         "name": "generate cp-instance-id",\r
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" >\n<parameter name=\"ctx-destination\" value=\"cp-instance-id\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1722.2381210327148,\r
-        "y": 4967.882302761078,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1696.2381210327148,\r
+        "y": 4981.8580021858215,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "aaf32437.4cef88",\r
+        "id": "3db114ad.dcb564",\r
         "type": "save",\r
         "name": "save cp to A&AI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1703.90474319458,\r
-        "y": 5034.5488085746765,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1677.90474319458,\r
+        "y": 5048.52450799942,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "45f81af2.00ca24",\r
-                "cfdaff5f.4d6de8"\r
+                "9e0f4fdf.dbdf98",\r
+                "1b0cb761.91e779"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45f81af2.00ca24",\r
+        "id": "9e0f4fdf.dbdf98",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1892.9047241210938,\r
-        "y": 5010.215422093868,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1866.9047241210938,\r
+        "y": 5024.191121518612,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "b0518f34.cac6c"\r
+                "c9632036.0de2a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b0518f34.cac6c",\r
+        "id": "c9632036.0de2a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2060.0714721679688,\r
-        "y": 5026.009855687618,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2034.0714721679688,\r
+        "y": 5039.985555112362,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a5df6a1f.787e3",\r
-                "3db10379.cadefc"\r
+                "6abd6309.f3a80c",\r
+                "5306b235.f40434"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cfdaff5f.4d6de8",\r
+        "id": "1b0cb761.91e779",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1897.9047241210938,\r
-        "y": 5059.881681859493,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1871.9047241210938,\r
+        "y": 5073.857381284237,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "b0518f34.cac6c"\r
+                "c9632036.0de2a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5df6a1f.787e3",\r
+        "id": "6abd6309.f3a80c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2225.5714836120605,\r
-        "y": 5037.8820605278015,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2199.5714836120605,\r
+        "y": 5051.857759952545,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bc7e2484.e69228",\r
+        "id": "c0124012.781378",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1498.714443206787,\r
-        "y": 5237.167096614838,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1472.714443206787,\r
+        "y": 5251.142796039581,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "134d490c.25b81f",\r
-                "502f6d13.ee70cc",\r
-                "b8c9d127.4eec38",\r
-                "aaf32437.4cef88",\r
-                "9ac4ad9c.d842",\r
-                "7ff418af.f0a608"\r
+                "d25d14c8.b399b8",\r
+                "5fca11f4.669f4",\r
+                "6499d375.d639b4",\r
+                "3db114ad.dcb564",\r
+                "248610c9.0e15e",\r
+                "b11e623d.b5492"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "134d490c.25b81f",\r
+        "id": "d25d14c8.b399b8",\r
         "type": "set",\r
         "name": "set connection point data",\r
         "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",\r
         "comments": "",\r
-        "x": 1734.2382850646973,\r
-        "y": 5112.406378269196,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1708.2382850646973,\r
+        "y": 5126.382077693939,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "16d827bf.761bd",\r
+        "id": "68b0a887.307e58",\r
         "type": "comment",\r
         "name": "Floating IPs",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1295.0001029968262,\r
-        "y": 6094.691496551037,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1269.0001029968262,\r
+        "y": 6108.6671959757805,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9ac4ad9c.d842",\r
+        "id": "248610c9.0e15e",\r
         "type": "for",\r
         "name": "for each vnf-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1718.3332862854004,\r
-        "y": 5508.691872119904,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1692.3332862854004,\r
+        "y": 5522.667571544647,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "36b35f12.bc0638"\r
+                "62bb1af7.8a69a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a55f1caf.a65878",\r
+        "id": "b1ff62bf.b7b008",\r
         "type": "save",\r
         "name": "save cp relationship to l3-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2356.6667671203613,\r
-        "y": 5508.358379840851,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2330.6667671203613,\r
+        "y": 5522.3340792655945,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "2783a294.d9970e",\r
-                "26e2d614.94cbb2"\r
+                "d91ef2a1.cec1a",\r
+                "4d40fb59.ff273c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fb9b2db7.a119f",\r
+        "id": "767b44d.6e18fbc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2728.4998054504395,\r
-        "y": 5481.6763281822205,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2702.4998054504395,\r
+        "y": 5495.652027606964,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4f31fc68.c1e6b4",\r
-                "31ec22c4.51ea5e"\r
+                "21d7f3dd.742d5c",\r
+                "a4df0ca4.d12fc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fff4f3ff.1947f8",\r
+        "id": "f7d542c9.1503d8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2728.4998817443848,\r
-        "y": 5534.676086902618,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2702.4998817443848,\r
+        "y": 5548.651786327362,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4f31fc68.c1e6b4",\r
-                "15135e2c.b33e5a"\r
+                "21d7f3dd.742d5c",\r
+                "f30ea0fd.c2421"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2783a294.d9970e",\r
+        "id": "d91ef2a1.cec1a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2571.666690826416,\r
-        "y": 5481.691998004913,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2545.666690826416,\r
+        "y": 5495.667697429657,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "fb9b2db7.a119f"\r
+                "767b44d.6e18fbc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26e2d614.94cbb2",\r
+        "id": "4d40fb59.ff273c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2580.238224029541,\r
-        "y": 5534.311142444611,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2554.238224029541,\r
+        "y": 5548.286841869354,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "fff4f3ff.1947f8"\r
+                "f7d542c9.1503d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "31ec22c4.51ea5e",\r
+        "id": "a4df0ca4.d12fc8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2900.6666145324707,\r
-        "y": 5504.3587040901175,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2874.6666145324707,\r
+        "y": 5518.334403514861,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "15135e2c.b33e5a",\r
+        "id": "f30ea0fd.c2421",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2895.833522796631,\r
-        "y": 5556.009911060332,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2869.833522796631,\r
+        "y": 5569.985610485076,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4f31fc68.c1e6b4",\r
+        "id": "21d7f3dd.742d5c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3102.3333778381348,\r
-        "y": 5454.35870218277,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3076.3333778381348,\r
+        "y": 5468.334401607513,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7ff418af.f0a608",\r
+        "id": "b11e623d.b5492",\r
         "type": "for",\r
         "name": "for each vm-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1718.333438873291,\r
-        "y": 5669.35822725296,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1692.333438873291,\r
+        "y": 5683.333926677704,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "77662062.8159c"\r
+                "4dd5a013.e9e42"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fb03ccd9.dcf8d8",\r
+        "id": "81d2246c.8ca24",\r
         "type": "save",\r
         "name": "save cp relationship to l3-network and vlan-tag",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2638.00044631958,\r
-        "y": 5667.358222484589,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2612.00044631958,\r
+        "y": 5681.333921909332,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "3ba6953f.154e12",\r
-                "dd2a018a.ddecf"\r
+                "6f2d5835.8b06e8",\r
+                "6af35271.e80934"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25b1ce59.35b64a",\r
+        "id": "aec56c50.11c2b8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3044.8334922790527,\r
-        "y": 5640.67552137375,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3018.8334922790527,\r
+        "y": 5654.651220798493,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "43ea6b39.724e64",\r
-                "4f31fc68.c1e6b4"\r
+                "e619b229.08af08",\r
+                "21d7f3dd.742d5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "776418cc.650358",\r
+        "id": "772066d4.b53278",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3044.833568572998,\r
-        "y": 5693.675280094148,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3018.833568572998,\r
+        "y": 5707.650979518891,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "177fa68d.607ac9",\r
-                "4f31fc68.c1e6b4"\r
+                "31e4d0b4.6f2ea8",\r
+                "21d7f3dd.742d5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ba6953f.154e12",\r
+        "id": "6f2d5835.8b06e8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2888.0003776550293,\r
-        "y": 5640.691191196443,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2862.0003776550293,\r
+        "y": 5654.666890621186,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "25b1ce59.35b64a"\r
+                "aec56c50.11c2b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd2a018a.ddecf",\r
+        "id": "6af35271.e80934",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2896.5719108581543,\r
-        "y": 5693.31033563614,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2870.5719108581543,\r
+        "y": 5707.2860350608835,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "776418cc.650358"\r
+                "772066d4.b53278"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43ea6b39.724e64",\r
+        "id": "e619b229.08af08",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3217.000301361084,\r
-        "y": 5663.357897281647,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3191.000301361084,\r
+        "y": 5677.33359670639,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "177fa68d.607ac9",\r
+        "id": "31e4d0b4.6f2ea8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3212.167209625244,\r
-        "y": 5715.009104251862,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3186.167209625244,\r
+        "y": 5728.984803676605,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f4be9dce.3fda3",\r
+        "id": "6d38b4de.53c2e4",\r
         "type": "for",\r
         "name": "for each related-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2334.0002784729004,\r
-        "y": 5667.358223438263,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2308.0002784729004,\r
+        "y": 5681.333922863007,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "fb03ccd9.dcf8d8"\r
+                "81d2246c.8ca24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8534c826.13da18",\r
+        "id": "a248e487.7d841",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-generate-heat-parameters",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-generate-heat-parameters' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 592.3335723876953,\r
-        "y": 6910.358483910561,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 566.3335723876953,\r
+        "y": 6924.334183335304,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "75790bd1.e8defc",\r
+        "id": "bf14b0a9.d3e2d",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vfmoduleheat.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 413.6669006347656,\r
-        "y": 6958.358586907387,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 387.6669006347656,\r
+        "y": 6972.33428633213,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c898fd55.fa0688",\r
+        "id": "56373ee9.f19b2",\r
         "type": "switchNode",\r
         "name": "switch input vf-module-name",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-name`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 565.0000038146973,\r
-        "y": 2394.191044807434,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 539.0000038146973,\r
+        "y": 2408.1667442321777,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "ba4d5614.642188",\r
-                "37d64c51.9cd974"\r
+                "ce9ac2f5.cd33d",\r
+                "de25859e.aa53b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba4d5614.642188",\r
+        "id": "ce9ac2f5.cd33d",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 764.9999961853027,\r
-        "y": 2371.690947532654,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 738.9999961853027,\r
+        "y": 2385.6666469573975,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a37b13e8.33b938"\r
+                "751c0b43.04587c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37d64c51.9cd974",\r
+        "id": "de25859e.aa53b8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 765.4285888671875,\r
-        "y": 2421.81005859375,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 739.4285888671875,\r
+        "y": 2435.7857580184937,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "6529b298.61d4a4"\r
+                "c68814e7.3e7978"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6553babe.5f42ac",\r
+        "id": "506d6b1c.ec80dc",\r
         "type": "for",\r
         "name": "for each vnfc-subnet-role",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1322.5001029968262,\r
-        "y": 3189.190721511841,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1296.5001029968262,\r
+        "y": 3203.1664209365845,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "13b1a341.f7194d"\r
+                "2294ba3f.d84456"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13b1a341.f7194d",\r
+        "id": "2294ba3f.d84456",\r
         "type": "for",\r
         "name": "for each vnfc-address-family",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1570.8333625793457,\r
-        "y": 3189.190721511841,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1544.8333625793457,\r
+        "y": 3203.1664209365845,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a495cd13.ac3888"\r
+                "b67cbf0d.afed4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1de476.813b738",\r
+        "id": "61b10d9d.cb5ec4",\r
         "type": "for",\r
         "name": "for each vm-type",\r
         "xml": "<for silentFailure='true' index='vm-type-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 528.3332786560059,\r
-        "y": 2907.52405834198,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 502.33327865600586,\r
+        "y": 2921.4997577667236,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "5d8aed8b.1bdc24"\r
+                "5cb28855.a7cb48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d8aed8b.1bdc24",\r
+        "id": "5cb28855.a7cb48",\r
         "type": "for",\r
         "name": "for each vnfc",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 710.000057220459,\r
-        "y": 2906.191206932068,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 684.000057220459,\r
+        "y": 2920.1669063568115,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "8556a0d3.b51ac"\r
+                "8d269e15.726ee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8556a0d3.b51ac",\r
+        "id": "8d269e15.726ee8",\r
         "type": "for",\r
         "name": "for each vnfc-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 911.1666297912598,\r
-        "y": 2906.023896217346,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 885.1666297912598,\r
+        "y": 2919.99959564209,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "6e901201.85a804"\r
+                "1c614ad3.f890f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e901201.85a804",\r
+        "id": "1c614ad3.f890f5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1123.3333015441895,\r
-        "y": 2905.024256706238,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1097.3333015441895,\r
+        "y": 2918.9999561309814,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "914f0e01.802e08",\r
-                "2226678b.986958",\r
-                "26a1009d.f04208",\r
-                "6553babe.5f42ac"\r
+                "9befab67.ec4df",\r
+                "eba3a652.01819",\r
+                "2e4be547.9f8b3a",\r
+                "506d6b1c.ec80dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "914f0e01.802e08",\r
+        "id": "9befab67.ec4df",\r
         "type": "set",\r
         "name": "set vnf-network-index to -1",\r
         "xml": "<set>\n<parameter name='vnf-network-index' value='-1' />\n",\r
         "comments": "",\r
-        "x": 1335.0000190734863,\r
-        "y": 2858.35747051239,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1309.0000190734863,\r
+        "y": 2872.333169937134,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2226678b.986958",\r
+        "id": "eba3a652.01819",\r
         "type": "for",\r
         "name": "for each vnf-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1316.6668090820312,\r
-        "y": 2905.0242223739624,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1290.6668090820312,\r
+        "y": 2918.999921798706,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "90d45d40.9fed1"\r
+                "6078ccfd.ea944c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90d45d40.9fed1",\r
+        "id": "6078ccfd.ea944c",\r
         "type": "switchNode",\r
         "name": "switch network-roles match?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1558.3332786560059,\r
-        "y": 2903.357717514038,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1532.3332786560059,\r
+        "y": 2917.3334169387817,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "b1008fcb.57c808"\r
+                "d84c654.fa00798"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b1008fcb.57c808",\r
+        "id": "d84c654.fa00798",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1754.99995803833,\r
-        "y": 2903.357636451721,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1728.99995803833,\r
+        "y": 2917.333335876465,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "c0752eeb.157cc"\r
+                "2b9ee331.dce634"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c0752eeb.157cc",\r
+        "id": "2b9ee331.dce634",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1908.333179473877,\r
-        "y": 2903.357508659363,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1882.333179473877,\r
+        "y": 2917.3332080841064,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "aa9d4976.24874",\r
-                "14a1e383.35ce54",\r
-                "d1f1e28b.e998b"\r
+                "f732773f.abd008",\r
+                "432b5764.5f12d",\r
+                "dceb937d.7cbe3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa9d4976.24874",\r
+        "id": "f732773f.abd008",\r
         "type": "set",\r
         "name": "set vnf-network-index",\r
         "xml": "<set>\n<parameter name='vnf-network-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 2115.000011444092,\r
-        "y": 2851.6908864974976,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2089.000011444092,\r
+        "y": 2865.666585922241,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "14a1e383.35ce54",\r
+        "id": "432b5764.5f12d",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 2069.999927520752,\r
-        "y": 2941.6908073425293,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2043.999927520752,\r
+        "y": 2955.666506767273,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "26a1009d.f04208",\r
+        "id": "2e4be547.9f8b3a",\r
         "type": "switchNode",\r
         "name": "switch vnf-network-index",\r
         "xml": "<switch test='`$vnf-network-index`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1328.3333473205566,\r
-        "y": 2965.024224281311,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1302.3333473205566,\r
+        "y": 2978.9999237060547,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "d0a470bb.1e44a8"\r
+                "3d957fc7.96b0d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0a470bb.1e44a8",\r
+        "id": "3d957fc7.96b0d8",\r
         "type": "outcome",\r
         "name": "-1",\r
         "xml": "<outcome value='-1'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1519.9999885559082,\r
-        "y": 2965.024468421936,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1493.9999885559082,\r
+        "y": 2979.0001678466797,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "f884f987.8fb5f"\r
+                "b4602d48.9b452"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f884f987.8fb5f",\r
+        "id": "b4602d48.9b452",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1668.333179473877,\r
-        "y": 2963.357508659363,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1642.333179473877,\r
+        "y": 2977.3332080841064,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "89311515.bf059",\r
-                "d72a7284.bd122"\r
+                "db1b6914.38bb2",\r
+                "cb224311.28b7c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89311515.bf059",\r
+        "id": "db1b6914.38bb2",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3196.6668128967285,\r
-        "y": 2815.024085998535,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3170.6668128967285,\r
+        "y": 2828.999785423279,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d72a7284.bd122",\r
+        "id": "cb224311.28b7c8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1836.6665534973145,\r
-        "y": 2981.690760612488,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1810.6665534973145,\r
+        "y": 2995.6664600372314,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e074c1fb.288db",\r
+        "id": "776dc3af.6ef3ec",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2359.999897003174,\r
-        "y": 3373.3573598861694,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2333.999897003174,\r
+        "y": 3387.333059310913,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "c84bee67.a01c",\r
-                "7e827224.b98a54",\r
-                "158ff27d.f681fe"\r
+                "144772ce.885bed",\r
+                "9a72e7d3.0207b8",\r
+                "5ab022e0.76ab7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c84bee67.a01c",\r
+        "id": "144772ce.885bed",\r
         "type": "for",\r
         "name": "for each subnet-data",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2556.666648864746,\r
-        "y": 3328.3572788238525,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2530.666648864746,\r
+        "y": 3342.332978248596,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "db92134e.c11958"\r
+                "746b4322.9622a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db92134e.c11958",\r
+        "id": "746b4322.9622a4",\r
         "type": "switchNode",\r
         "name": "address-families match?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2783.3332748413086,\r
-        "y": 3328.3572788238525,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2757.3332748413086,\r
+        "y": 3342.332978248596,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "664e2d50.db9864"\r
+                "e6434ad2.bae308"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "664e2d50.db9864",\r
+        "id": "e6434ad2.bae308",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2963.333240509033,\r
-        "y": 3328.3576850891113,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2937.333240509033,\r
+        "y": 3342.333384513855,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "86f838f7.8fb2d8"\r
+                "efbac697.5d7758"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "53f781b3.123d98",\r
+        "id": "4e05f98.a5bdf08",\r
         "type": "set",\r
         "name": "set tmp.address-family",\r
         "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",\r
         "comments": "",\r
-        "x": 2388.3332328796387,\r
-        "y": 3191.690773010254,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2362.3332328796387,\r
+        "y": 3205.6664724349976,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a495cd13.ac3888",\r
+        "id": "b67cbf0d.afed4",\r
         "type": "switchNode",\r
         "name": "switch vnfc-subnet-ip_length",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1833.3335762023926,\r
-        "y": 3188.357808113098,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1807.3335762023926,\r
+        "y": 3202.333507537842,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "39bb02f5.1a9bde",\r
-                "1e32cfbf.18065",\r
-                "c36c4aab.2dd96"\r
+                "6b6ccf2e.67b5b8",\r
+                "3fd9179d.ef197",\r
+                "bf6a8d08.4bbdb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39bb02f5.1a9bde",\r
+        "id": "6b6ccf2e.67b5b8",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2035.000087738037,\r
-        "y": 3088.3573513031006,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2009.000087738037,\r
+        "y": 3102.3330507278442,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "6c7a9e2c.5ffe28"\r
+                "3d6c6945.2371a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e32cfbf.18065",\r
+        "id": "3fd9179d.ef197",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2031.4287185668945,\r
-        "y": 3274.309642791748,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2005.4287185668945,\r
+        "y": 3288.2853422164917,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "cb710085.b13e"\r
+                "655717fb.4876b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c7a9e2c.5ffe28",\r
+        "id": "3d6c6945.2371a6",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2166.6666374206543,\r
-        "y": 3111.0240983963013,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2140.6666374206543,\r
+        "y": 3124.999797821045,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2ea4d244.10a91e",\r
+        "id": "adf045e3.123d",\r
         "type": "set",\r
         "name": "set subnet-id to -1",\r
         "xml": "<set>\n<parameter name='subnet-id' value='-1' />\n",\r
         "comments": "",\r
-        "x": 3056.6671562194824,\r
-        "y": 3490.0247650146484,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3030.6671562194824,\r
+        "y": 3504.000464439392,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cb710085.b13e",\r
+        "id": "655717fb.4876b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2185.0001335144043,\r
-        "y": 3273.3572750091553,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2159.0001335144043,\r
+        "y": 3287.332974433899,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "53f781b3.123d98",\r
-                "e074c1fb.288db"\r
+                "4e05f98.a5bdf08",\r
+                "776dc3af.6ef3ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd601bae.1a1768",\r
+        "id": "87d327c8.e4f89",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4316.666753768921,\r
-        "y": 3661.691241979599,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 4290.666753768921,\r
+        "y": 3675.6669414043427,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "3b599124.ddda26",\r
-                "f1ce1b9b.c5713"\r
+                "cda91ba0.8167c",\r
+                "3842836d.d40cec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1ce1b9b.c5713",\r
+        "id": "3842836d.d40cec",\r
         "type": "execute",\r
         "name": "execute isInSameSubnet",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4531.6667556762695,\r
-        "y": 3711.690915822983,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 4505.6667556762695,\r
+        "y": 3725.6666152477264,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "286c5f74.70fde"\r
+                "625dc384.31bfcc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b599124.ddda26",\r
+        "id": "cda91ba0.8167c",\r
         "type": "switchNode",\r
         "name": "switch tmp.address-family",\r
         "xml": "<switch test='`$tmp.address-family`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4533.333911895752,\r
-        "y": 3618.357902288437,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 4507.333911895752,\r
+        "y": 3632.3336017131805,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "f9adff66.6ab258",\r
-                "23a24dc2.1a7102"\r
+                "5ce62256.5b3ecc",\r
+                "3ec18a61.4053a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9adff66.6ab258",\r
+        "id": "5ce62256.5b3ecc",\r
         "type": "outcome",\r
         "name": "ipv4",\r
         "xml": "<outcome value='ipv4'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4736.667174021402,\r
-        "y": 3591.6911326249437,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 4710.667174021402,\r
+        "y": 3605.6668320496874,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "dc9baf82.fb366"\r
+                "39db5660.d28ed2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23a24dc2.1a7102",\r
+        "id": "3ec18a61.4053a6",\r
         "type": "outcome",\r
         "name": "ipv6",\r
         "xml": "<outcome value='ipv6'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4736.666847229004,\r
-        "y": 3638.3576600551605,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 4710.666847229004,\r
+        "y": 3652.333359479904,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "9777e060.2e3dc"\r
+                "48ff8671.c333f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dc9baf82.fb366",\r
+        "id": "39db5660.d28ed2",\r
         "type": "set",\r
         "name": "set ip-type parameter to IPv4",\r
         "xml": "<set>\n<parameter name='ip-type' value='IPv4' />\n",\r
         "comments": "",\r
-        "x": 4933.333660125732,\r
-        "y": 3590.0246064662933,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 4907.333660125732,\r
+        "y": 3604.000305891037,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9777e060.2e3dc",\r
+        "id": "48ff8671.c333f8",\r
         "type": "set",\r
         "name": "set ip-type parameter to IPv6",\r
         "xml": "<set>\n<parameter name='ip-type' value='IPv6' />\n",\r
         "comments": "",\r
-        "x": 4938.33353805542,\r
-        "y": 3638.357679128647,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 4912.33353805542,\r
+        "y": 3652.3333785533905,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7c5bee11.1ed9d",\r
+        "id": "3df4f091.0048b8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4871.666786193848,\r
-        "y": 3711.357679128647,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 4845.666786193848,\r
+        "y": 3725.3333785533905,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "b5ad4567.eb0b98",\r
-                "3214e32a.ac2af4"\r
+                "3a1246c3.df08aa",\r
+                "3192bd4f.0a0cfa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5ad4567.eb0b98",\r
+        "id": "3a1246c3.df08aa",\r
         "type": "set",\r
         "name": "set subnet-id",\r
         "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",\r
         "comments": "",\r
-        "x": 5050.000106811523,\r
-        "y": 3688.024165868759,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 5024.000106811523,\r
+        "y": 3701.999865293503,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3214e32a.ac2af4",\r
+        "id": "3192bd4f.0a0cfa",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 5035.000110626221,\r
-        "y": 3734.691159963608,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 5009.000110626221,\r
+        "y": 3748.6668593883514,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2cb5307a.bb967",\r
+        "id": "95331b2d.c7076",\r
         "type": "switchNode",\r
         "name": "switch subnet-id",\r
         "xml": "<switch test='`$subnet-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3048.3330307006836,\r
-        "y": 3651.691499710083,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3022.3330307006836,\r
+        "y": 3665.6671991348267,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4eaebda7.88a464"\r
+                "802e0846.88a4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4eaebda7.88a464",\r
+        "id": "802e0846.88a4c",\r
         "type": "outcome",\r
         "name": "-1",\r
         "xml": "<outcome value='-1'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3204.99959564209,\r
-        "y": 3651.6914348602295,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3178.99959564209,\r
+        "y": 3665.667134284973,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "c969c7c1.3acfe8"\r
+                "565a3c94.98b2b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c969c7c1.3acfe8",\r
+        "id": "565a3c94.98b2b4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3353.3327865600586,\r
-        "y": 3650.0244750976562,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3327.3327865600586,\r
+        "y": 3664.0001745224,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "48e52ed2.21ebb",\r
-                "89311515.bf059"\r
+                "f83ab611.b83f78",\r
+                "db1b6914.38bb2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48e52ed2.21ebb",\r
+        "id": "f83ab611.b83f78",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3521.666118621826,\r
-        "y": 3666.6909503936768,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3495.666118621826,\r
+        "y": 3680.6666498184204,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5fd2a555.9c69d4",\r
+        "id": "66e17899.8fb72",\r
         "type": "set",\r
         "name": "set subnet-id in vnfc-ip-assignments (temp variable)",\r
         "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",\r
         "comments": "",\r
-        "x": 3159.9996757507324,\r
-        "y": 3728.3582706451416,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3133.9996757507324,\r
+        "y": 3742.3339700698853,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "709b1630.8dd8b8",\r
+        "id": "758d4da0.c2995c",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vfmodulec.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 513.3332710266113,\r
-        "y": 3323.357508659363,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 487.3332710266113,\r
+        "y": 3337.3332080841064,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "286c5f74.70fde",\r
+        "id": "625dc384.31bfcc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4718.333358764648,\r
-        "y": 3711.691404104233,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 4692.333358764648,\r
+        "y": 3725.6671035289764,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "7c5bee11.1ed9d"\r
+                "3df4f091.0048b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d1f1e28b.e998b",\r
+        "id": "dceb937d.7cbe3",\r
         "type": "set",\r
         "name": "set network-id",\r
         "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",\r
         "comments": "",\r
-        "x": 2091.666515350342,\r
-        "y": 2896.690969467163,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2065.666515350342,\r
+        "y": 2910.6666688919067,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6f6678f2.1bf2e",\r
+        "id": "3812039f.e87b54",\r
         "type": "switchNode",\r
         "name": "switch nfc-naming-code",\r
         "xml": "<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].nfc-naming-code`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1289.9999809265137,\r
-        "y": 4511.690697193146,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1263.9999809265137,\r
+        "y": 4525.666396617889,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "726b02e.fd1c97c",\r
-                "21ecd530.fb8122"\r
+                "1f2b4bc0.e1061c",\r
+                "dc5a09b5.b67728"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "726b02e.fd1c97c",\r
+        "id": "1f2b4bc0.e1061c",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1474.999927520752,\r
-        "y": 4486.690515995026,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1448.999927520752,\r
+        "y": 4500.666215419769,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "46b7d4f1.8d2604"\r
+                "5c26838f.96ae2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21ecd530.fb8122",\r
+        "id": "dc5a09b5.b67728",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1473.095199584961,\r
-        "y": 4533.476343631744,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1447.095199584961,\r
+        "y": 4547.452043056488,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "7ea5f92e.d1edb8"\r
+                "5a6b4010.6dca68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46b7d4f1.8d2604",\r
+        "id": "5c26838f.96ae2c",\r
         "type": "set",\r
         "name": "set tmp.nfc-naming-code to DEFAULT",\r
         "xml": "<set>\n<parameter name='tmp.nfc-naming-code' value='DEFAULT' />\n",\r
         "comments": "",\r
-        "x": 1706.6666984558105,\r
-        "y": 4485.023866176605,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1680.6666984558105,\r
+        "y": 4498.999565601349,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7ea5f92e.d1edb8",\r
+        "id": "5a6b4010.6dca68",\r
         "type": "set",\r
         "name": "set tmp.nfc-naming-code",\r
         "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",\r
         "comments": "",\r
-        "x": 1663.333209991455,\r
-        "y": 4533.357364177704,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1637.333209991455,\r
+        "y": 4547.3330636024475,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c11e7bb7.050ab8",\r
+        "id": "c84f1dbb.f047b",\r
         "type": "switchNode",\r
         "name": "switch nfc-function",\r
         "xml": "<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].nfc-function`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1278.3333129882812,\r
-        "y": 4610.023870944977,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1252.3333129882812,\r
+        "y": 4623.9995703697205,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "2d809cc8.28629c",\r
-                "48b0d022.df9368"\r
+                "77125202.fb825c",\r
+                "7e12ade.88495d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d809cc8.28629c",\r
+        "id": "77125202.fb825c",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1474.9999198913574,\r
-        "y": 4585.023668766022,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1448.9999198913574,\r
+        "y": 4598.999368190765,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "c6205636.69c938"\r
+                "90ebf553.d8bfb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48b0d022.df9368",\r
+        "id": "7e12ade.88495d4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1473.0951919555664,\r
-        "y": 4631.8094964027405,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1447.0951919555664,\r
+        "y": 4645.785195827484,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "6da6c28b.2af50c"\r
+                "f9029760.f04d1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c6205636.69c938",\r
+        "id": "90ebf553.d8bfb",\r
         "type": "set",\r
         "name": "set tmp.nfc-function to DEFAULT",\r
         "xml": "<set>\n<parameter name='tmp.nfc-function' value='DEFAULT' />\n",\r
         "comments": "",\r
-        "x": 1686.6667022705078,\r
-        "y": 4583.3568778038025,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1660.6667022705078,\r
+        "y": 4597.332577228546,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6da6c28b.2af50c",\r
+        "id": "f9029760.f04d1",\r
         "type": "set",\r
         "name": "set tmp.nfc-function",\r
         "xml": "<set>\n<parameter name='tmp.nfc-function' value='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].nfc-function`' />\n",\r
         "comments": "",\r
-        "x": 1644.9998321533203,\r
-        "y": 4631.690538883209,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1618.9998321533203,\r
+        "y": 4645.666238307953,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8bf1dfbc.51b108",\r
+        "id": "d11793aa.985d98",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:vf-module-topology-assign-rollback",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-assign-rollback' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2918.3333015441895,\r
-        "y": 2266.691004753113,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2892.3333015441895,\r
+        "y": 2280.6667041778564,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5f9b54a9.c1cdd4",\r
+        "id": "854c8589.9f57c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2824.9998054504395,\r
-        "y": 2341.691004753113,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2798.9998054504395,\r
+        "y": 2355.6667041778564,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "c88feb78.b7ccd",\r
-                "8bf1dfbc.51b108"\r
+                "4b1cfdbb.d134fc",\r
+                "d11793aa.985d98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6f1c5d8.dc0ab",\r
+        "id": "ce26b35e.dec2c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2029.9998588562012,\r
-        "y": 2401.6908683776855,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2003.9998588562012,\r
+        "y": 2415.666567802429,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "7a69f1ed.4762a8",\r
-                "8bf1dfbc.51b108"\r
+                "fae1cd84.a9bd78",\r
+                "d11793aa.985d98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4331007b.e83998",\r
+        "id": "e2bf8646.281a5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2291.666723251343,\r
-        "y": 2456.691035270691,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2265.666723251343,\r
+        "y": 2470.6667346954346,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "ff44880b.925a9",\r
-                "8bf1dfbc.51b108"\r
+                "19d62bdc.450b0c",\r
+                "d11793aa.985d98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "36b35f12.bc0638",\r
+        "id": "62bb1af7.8a69a4",\r
         "type": "switchNode",\r
         "name": "switch network-roles match?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1951.6666297912598,\r
-        "y": 5508.6908984184265,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1925.6666297912598,\r
+        "y": 5522.66659784317,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "255ff0a6.4c3e5"\r
+                "24a675eb.01ffea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "255ff0a6.4c3e5",\r
+        "id": "24a675eb.01ffea",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2150.000099182129,\r
-        "y": 5508.358053684235,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2124.000099182129,\r
+        "y": 5522.333753108978,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a55f1caf.a65878"\r
+                "b1ff62bf.b7b008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77662062.8159c",\r
+        "id": "4dd5a013.e9e42",\r
         "type": "switchNode",\r
         "name": "switch network-roles match?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1954.9999732971191,\r
-        "y": 5668.357346057892,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1928.9999732971191,\r
+        "y": 5682.3330454826355,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "ec6e0033.18078"\r
+                "3ba6fe94.2f5ab2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec6e0033.18078",\r
+        "id": "3ba6fe94.2f5ab2",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2153.3334426879883,\r
-        "y": 5668.0245013237,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2127.3334426879883,\r
+        "y": 5682.000200748444,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "f4be9dce.3fda3"\r
+                "6d38b4de.53c2e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61dec192.4d7148",\r
+        "id": "f728c8ba.23c06",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1858.3332557678223,\r
-        "y": 6246.6907658576965,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1832.3332557678223,\r
+        "y": 6260.66646528244,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4d116331.dbe40c",\r
-                "31e79dcc.7e90fa"\r
+                "65898e8.b71e1f",\r
+                "c9e14db9.4027a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e28153d.aad85c",\r
+        "id": "63b023e.b6b035c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1860.0000038146973,\r
-        "y": 6561.690777301788,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1834.0000038146973,\r
+        "y": 6575.666476726532,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "6bd05851.cda258",\r
-                "214cc548.9d2312"\r
+                "870acd7f.91e8a",\r
+                "bda1f786.4b7dc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "31e79dcc.7e90fa",\r
+        "id": "c9e14db9.4027a",\r
         "type": "for",\r
         "name": "for each vnfc-network-role",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2075.000202178955,\r
-        "y": 6305.023936748505,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2049.000202178955,\r
+        "y": 6318.999636173248,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "730f1cc9.69fe4c"\r
+                "3529b19e.5788ae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d927385.1d80e4",\r
+        "id": "24d002ee.ba7fb6",\r
         "type": "save",\r
         "name": "save vip-ipv4-address-list relationship to cp",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2750.0001258850098,\r
-        "y": 6305.023775577545,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2724.0001258850098,\r
+        "y": 6318.999475002289,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a12b08ff.872da8",\r
-                "435faa21.8dd73c"\r
+                "fbd88616.0314c8",\r
+                "ad2aeb41.4c3638"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b7ae4ee8.46c8f8",\r
+        "id": "39abf173.99c2f6",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3308.3333473205566,\r
-        "y": 6298.357183933258,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3282.3333473205566,\r
+        "y": 6312.332883358002,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "29ab7ac1.d4eea6",\r
+        "id": "ac48317f.f58318",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3308.500316619873,\r
-        "y": 6348.341357648373,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3282.500316619873,\r
+        "y": 6362.317057073116,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b1889d0.1a3afe",\r
+        "id": "1fca7631.b2fcc2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3141.8332176208496,\r
-        "y": 6278.341557025909,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3115.8332176208496,\r
+        "y": 6292.317256450653,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "b7ae4ee8.46c8f8",\r
-                "2e738df3.a266b2"\r
+                "39abf173.99c2f6",\r
+                "197c2a2b.1fd476"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84cd1c51.7c62c8",\r
+        "id": "34023a4a.89eb56",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3141.833293914795,\r
-        "y": 6331.341315746307,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3115.833293914795,\r
+        "y": 6345.317015171051,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "29ab7ac1.d4eea6",\r
-                "2e738df3.a266b2"\r
+                "ac48317f.f58318",\r
+                "197c2a2b.1fd476"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a12b08ff.872da8",\r
+        "id": "fbd88616.0314c8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2985.000102996826,\r
-        "y": 6278.357226848602,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2959.000102996826,\r
+        "y": 6292.332926273346,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "b1889d0.1a3afe"\r
+                "1fca7631.b2fcc2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "435faa21.8dd73c",\r
+        "id": "ad2aeb41.4c3638",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2993.571636199951,\r
-        "y": 6330.9763712883,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2967.571636199951,\r
+        "y": 6344.952070713043,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "84cd1c51.7c62c8"\r
+                "34023a4a.89eb56"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "214cc548.9d2312",\r
+        "id": "bda1f786.4b7dc8",\r
         "type": "for",\r
         "name": "for each vnfc-network-role",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2076.6665992736816,\r
-        "y": 6628.357346057892,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2050.6665992736816,\r
+        "y": 6642.3330454826355,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "c3545be7.a08a58"\r
+                "4182536a.93a47c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ae6c277.1259b8",\r
+        "id": "b51ba59a.baed7",\r
         "type": "save",\r
         "name": "save vip-ipv6-address-list relationship to cp",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2746.6665534973145,\r
-        "y": 6626.690128803253,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2720.6665534973145,\r
+        "y": 6640.665828227997,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "5f1b56ef.56a3d",\r
-                "4c3ccc6a.9008ac"\r
+                "ac5ffd56.e1041",\r
+                "2f884d53.b07b72"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0696152.132c6",\r
+        "id": "bc8fa4b3.94381",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3304.9997749328613,\r
-        "y": 6620.023537158966,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3278.9997749328613,\r
+        "y": 6633.99923658371,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "89aa2cd0.882d5",\r
+        "id": "d5daac81.1710d",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3305.1667442321777,\r
-        "y": 6670.007710874081,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3279.1667442321777,\r
+        "y": 6683.983410298824,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "feaa3d1f.f068f8",\r
+        "id": "60859e82.35dfa",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3138.4996452331543,\r
-        "y": 6600.007910251617,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3112.4996452331543,\r
+        "y": 6613.983609676361,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "d0696152.132c6"\r
+                "bc8fa4b3.94381"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e2f260c.e83a22",\r
+        "id": "ca90c0a4.de7eb",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3138.4997215270996,\r
-        "y": 6653.007668972015,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3112.4997215270996,\r
+        "y": 6666.983368396759,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "89aa2cd0.882d5"\r
+                "d5daac81.1710d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f1b56ef.56a3d",\r
+        "id": "ac5ffd56.e1041",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2981.666530609131,\r
-        "y": 6600.02358007431,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2955.666530609131,\r
+        "y": 6613.999279499054,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "feaa3d1f.f068f8"\r
+                "60859e82.35dfa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4c3ccc6a.9008ac",\r
+        "id": "2f884d53.b07b72",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2990.238063812256,\r
-        "y": 6652.642724514008,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2964.238063812256,\r
+        "y": 6666.618423938751,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "e2f260c.e83a22"\r
+                "ca90c0a4.de7eb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "730f1cc9.69fe4c",\r
+        "id": "3529b19e.5788ae",\r
         "type": "switchNode",\r
         "name": "switch network-roles match?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2328.3332710266113,\r
-        "y": 6305.023613452911,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2302.3332710266113,\r
+        "y": 6318.999312877655,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "de7543a8.d36ff8"\r
+                "a96bcf8d.d96dc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de7543a8.d36ff8",\r
+        "id": "a96bcf8d.d96dc8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2515.000114440918,\r
-        "y": 6305.024100780487,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2489.000114440918,\r
+        "y": 6318.999800205231,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4d927385.1d80e4"\r
+                "24d002ee.ba7fb6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3545be7.a08a58",\r
+        "id": "4182536a.93a47c",\r
         "type": "switchNode",\r
         "name": "switch network-roles match?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2324.9998512268066,\r
-        "y": 6626.690353870392,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2298.9998512268066,\r
+        "y": 6640.6660532951355,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "ad4ca04.6f61ae"\r
+                "5f4a742e.72fbec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad4ca04.6f61ae",\r
+        "id": "5f4a742e.72fbec",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2511.6666946411133,\r
-        "y": 6626.6908411979675,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2485.6666946411133,\r
+        "y": 6640.666540622711,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "8ae6c277.1259b8"\r
+                "b51ba59a.baed7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59928182.6a1818",\r
+        "id": "eb0aec5b.3eb2e",\r
         "type": "comment",\r
         "name": "SELF-SERVE FORK",\r
         "info": "",\r
         "comments": "",\r
-        "x": 694.7142944335938,\r
-        "y": 915.0476245880127,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 668.7142944335938,\r
+        "y": 929.0233240127563,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4f63954f.60114c",\r
+        "id": "b506e19a.354fc8",\r
         "type": "call",\r
         "name": "call self-serve-vf-module-assign",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-assign' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1227.749439239502,\r
-        "y": 959.964430809021,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1201.749439239502,\r
+        "y": 973.9401302337646,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "c903ef6e.5d9028"\r
+                "872941b.28382c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3692a00.1ad058",\r
+        "id": "f8fb5987.004678",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1611.820816040039,\r
-        "y": 959.9643812179565,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1585.820816040039,\r
+        "y": 973.9400806427002,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c903ef6e.5d9028",\r
+        "id": "872941b.28382c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1448.047019958496,\r
-        "y": 959.4524621963501,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1422.047019958496,\r
+        "y": 973.4281616210938,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "b3692a00.1ad058"\r
+                "f8fb5987.004678"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15551ef3.fbe519",\r
+        "id": "4a3a0c57.2c22ac",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 1174.6186828613281,\r
-        "y": 1109.809350013733,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1148.6186828613281,\r
+        "y": 1123.7850494384766,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f7ab153e.ede618",\r
+        "id": "52696a3e.207fdc",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vnfend.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1166.6662254333496,\r
-        "y": 1064.3008937835693,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1140.6662254333496,\r
+        "y": 1078.276593208313,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "58b9ddbd.c28154",\r
+        "id": "90d38352.8ab8c8",\r
         "type": "set",\r
         "name": "set order-status to PendingCreate",\r
         "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",\r
         "comments": "",\r
-        "x": 1237.3567428588867,\r
-        "y": 1013.2617883682251,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1211.3567428588867,\r
+        "y": 1027.2374877929688,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4c64ed.a697bb14",\r
+        "id": "58e6d3f7.f000a4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 948.4521713256836,\r
-        "y": 959.6425924301147,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 922.4521713256836,\r
+        "y": 973.6182918548584,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4f63954f.60114c",\r
-                "58b9ddbd.c28154",\r
-                "f7ab153e.ede618",\r
-                "15551ef3.fbe519"\r
+                "b506e19a.354fc8",\r
+                "90d38352.8ab8c8",\r
+                "52696a3e.207fdc",\r
+                "4a3a0c57.2c22ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca9d6671.e0234",\r
+        "id": "df50609c.7dd31",\r
         "type": "comment",\r
         "name": "First, count the subnets for this address family",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2690.0004081726074,\r
-        "y": 3237.9997692108154,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2664.0004081726074,\r
+        "y": 3251.975468635559,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "43ee48f3.cff09",\r
+        "id": "478d4118.5ed98",\r
         "type": "for",\r
         "name": "for each subnet-data",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3063.333095550537,\r
-        "y": 3533.0002727508545,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3037.333095550537,\r
+        "y": 3546.975972175598,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "c2367378.e6cd3"\r
+                "36dfc31b.a025a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2367378.e6cd3",\r
+        "id": "36dfc31b.a025a4",\r
         "type": "switchNode",\r
         "name": "address-families match?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3289.9997215270996,\r
-        "y": 3533.0002727508545,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3263.9997215270996,\r
+        "y": 3546.975972175598,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a41d108.beda87"\r
+                "6559a3a7.8910e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a41d108.beda87",\r
+        "id": "6559a3a7.8910e4",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3469.999687194824,\r
-        "y": 3533.0006790161133,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3443.999687194824,\r
+        "y": 3546.976378440857,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "bbd41071.5f5ca"\r
+                "6e77fb20.fa3f44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e827224.b98a54",\r
+        "id": "9a72e7d3.0207b8",\r
         "type": "set",\r
         "name": "set af-count to 0",\r
         "xml": "<set>\n<parameter name='af-count' value='0' />\n",\r
         "comments": "",\r
-        "x": 2544.9999809265137,\r
-        "y": 3279.6665210723877,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2518.9999809265137,\r
+        "y": 3293.6422204971313,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f96f4d35.ea7948",\r
+        "id": "8f820716.44125",\r
         "type": "set",\r
         "name": "increment af-count",\r
         "xml": "<set>\n<parameter name='af-count' value='`$af-count + 1`' />\n",\r
         "comments": "",\r
-        "x": 3293.3333473205566,\r
-        "y": 3346.3332710266113,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3267.3333473205566,\r
+        "y": 3360.308970451355,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "86f838f7.8fb2d8",\r
+        "id": "efbac697.5d7758",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3109.9997215270996,\r
-        "y": 3327.9999561309814,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3083.9997215270996,\r
+        "y": 3341.975655555725,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "f96f4d35.ea7948",\r
-                "2d2924.bfe856dc"\r
+                "8f820716.44125",\r
+                "b888ffd3.c0e17"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d2924.bfe856dc",\r
+        "id": "b888ffd3.c0e17",\r
         "type": "set",\r
         "name": "set subnet-id",\r
         "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",\r
         "comments": "",\r
-        "x": 3274.999767303467,\r
-        "y": 3301.3332691192627,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3248.999767303467,\r
+        "y": 3315.3089685440063,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "158ff27d.f681fe",\r
+        "id": "5ab022e0.76ab7c",\r
         "type": "switchNode",\r
         "name": "switch af-count",\r
         "xml": "<switch test='`$af-count`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2535.0003929138184,\r
-        "y": 3516.3334379196167,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2509.0003929138184,\r
+        "y": 3530.3091373443604,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "a0b1648c.912158",\r
-                "70cf3548.bbf294"\r
+                "908b7a86.e0ec18",\r
+                "56ed48ea.e8c8b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a0b1648c.912158",\r
+        "id": "908b7a86.e0ec18",\r
         "type": "outcome",\r
         "name": "1",\r
         "xml": "<outcome value='1'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2694.999912261963,\r
-        "y": 3414.666606903076,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2668.999912261963,\r
+        "y": 3428.64230632782,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "ca4eb36c.b27be8"\r
+                "a5a8ac5f.13f948"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca4eb36c.b27be8",\r
+        "id": "a5a8ac5f.13f948",\r
         "type": "set",\r
         "name": "set subnet-id in vnfc-ip-assignments (temp variable)",\r
         "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",\r
         "comments": "",\r
-        "x": 2968.3332176208496,\r
-        "y": 3412.9999561309814,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2942.3332176208496,\r
+        "y": 3426.975655555725,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "70cf3548.bbf294",\r
+        "id": "56ed48ea.e8c8b",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2694.999828338623,\r
-        "y": 3616.333526611328,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2668.999828338623,\r
+        "y": 3630.309226036072,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4f40f504.bc667c"\r
+                "c2900727.bee1c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f40f504.bc667c",\r
+        "id": "c2900727.bee1c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2851.6664695739746,\r
-        "y": 3616.3332080841064,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2825.6664695739746,\r
+        "y": 3630.30890750885,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "2ea4d244.10a91e",\r
-                "43ee48f3.cff09",\r
-                "2cb5307a.bb967",\r
-                "5fd2a555.9c69d4"\r
+                "adf045e3.123d",\r
+                "478d4118.5ed98",\r
+                "95331b2d.c7076",\r
+                "66e17899.8fb72"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bbd41071.5f5ca",\r
+        "id": "6e77fb20.fa3f44",\r
         "type": "switchNode",\r
         "name": "switch network-start-address",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3664.9998664855957,\r
-        "y": 3531.333522796631,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3638.9998664855957,\r
+        "y": 3545.3092222213745,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "eb9161e6.999df8",\r
-                "e5973f29.60a6a8"\r
+                "36c23985.79899e",\r
+                "37a9f831.2d1a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb9161e6.999df8",\r
+        "id": "36c23985.79899e",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3861.6667137145996,\r
-        "y": 3466.333133459091,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3835.6667137145996,\r
+        "y": 3480.308832883835,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "9175dbd1.90db18"\r
+                "848c0b2c.e797c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5973f29.60a6a8",\r
+        "id": "37a9f831.2d1a",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3854.7621116638184,\r
-        "y": 3600.61904501915,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3828.7621116638184,\r
+        "y": 3614.5947444438934,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "f7225223.9cd0a"\r
+                "c0b64fb2.d819f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7225223.9cd0a",\r
+        "id": "c0b64fb2.d819f",\r
         "type": "switchNode",\r
         "name": "switch cidr-mask",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4009.9999046325684,\r
-        "y": 3599.666251897812,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3983.9999046325684,\r
+        "y": 3613.6419513225555,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "6dbe50b0.25663",\r
-                "86c99244.02a7"\r
+                "f156fcb4.2140f",\r
+                "f5392a04.2681a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6dbe50b0.25663",\r
+        "id": "f156fcb4.2140f",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4164.999980926514,\r
-        "y": 3529.6665513515472,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 4138.999980926514,\r
+        "y": 3543.642250776291,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4ede313d.185d4"\r
+                "f9c5419d.ddf64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "86c99244.02a7",\r
+        "id": "f5392a04.2681a8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4168.095777511597,\r
-        "y": 3662.2856385707855,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 4142.095777511597,\r
+        "y": 3676.261337995529,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "fd601bae.1a1768"\r
+                "87d327c8.e4f89"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c36c4aab.2dd96",\r
+        "id": "bf6a8d08.4bbdb8",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2036.666591644287,\r
-        "y": 3136.3332080841064,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2010.666591644287,\r
+        "y": 3150.30890750885,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "6c7a9e2c.5ffe28"\r
+                "3d6c6945.2371a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a5ed4ff.cd6413",\r
+        "id": "c5a1b191.b9a848",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4170.000217437744,\r
-        "y": 3481.332970380783,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 4144.000217437744,\r
+        "y": 3495.3086698055267,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9175dbd1.90db18",\r
+        "id": "848c0b2c.e797c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4006.6666412353516,\r
-        "y": 3466.332900762558,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 3980.6666412353516,\r
+        "y": 3480.3086001873016,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "1a5ed4ff.cd6413",\r
-                "89311515.bf059"\r
+                "c5a1b191.b9a848",\r
+                "db1b6914.38bb2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f75c2653.dd05c",\r
+        "id": "6849b69.ce201c8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4475.000072479248,\r
-        "y": 3542.9998376369476,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 4449.000072479248,\r
+        "y": 3556.9755370616913,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4ede313d.185d4",\r
+        "id": "f9c5419d.ddf64",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4311.6664962768555,\r
-        "y": 3527.9997680187225,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 4285.6664962768555,\r
+        "y": 3541.975467443466,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "f75c2653.dd05c",\r
-                "89311515.bf059"\r
+                "6849b69.ce201c8",\r
+                "db1b6914.38bb2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c5c11fb.d4aaf",\r
+        "id": "5eefb8ff.6d6f5",\r
         "type": "comment",\r
         "name": "Ignore address families with no addresses",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2310.9999656677246,\r
-        "y": 3066.6667041778564,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 2284.9999656677246,\r
+        "y": 3080.6424036026,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dc86b143.7bc0f",\r
+        "id": "1a6fc532.9edecb",\r
         "type": "switchNode",\r
         "name": "switch invariant-uuid",\r
         "xml": "<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].invariant-uuid`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1281.666805267334,\r
-        "y": 4696.333082199097,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1255.666805267334,\r
+        "y": 4710.30878162384,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4ff032c9.ac47cc",\r
-                "4f1d070c.cbefd8"\r
+                "48f89263.45560c",\r
+                "45a4171.c74a8e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ff032c9.ac47cc",\r
+        "id": "48f89263.45560c",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1463.3332176208496,\r
-        "y": 4672.999711990356,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1437.3332176208496,\r
+        "y": 4686.9754114151,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "9c0ccfc9.82e09"\r
+                "7e20832d.b83624"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f1d070c.cbefd8",\r
+        "id": "45a4171.c74a8e8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1461.4284896850586,\r
-        "y": 4719.785539627075,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1435.4284896850586,\r
+        "y": 4733.761239051819,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "bf5629c7.b8c548"\r
+                "d289e33f.82de9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c0ccfc9.82e09",\r
+        "id": "7e20832d.b83624",\r
         "type": "save",\r
         "name": "save vnfc to A&AI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1624.999843597412,\r
-        "y": 4674.666704177856,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 1598.999843597412,\r
+        "y": 4688.6424036026,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "57f9125a.f4f11c",\r
-                "c29ebd4.1b8af4"\r
+                "bf47efb9.ef7f",\r
+                "569de2d6.f82d54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cfe429db.9ee878",\r
+        "id": "bd911df4.417368",\r
         "type": "switchNode",\r
         "name": "switch input cloud-owner",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 560.7141952514648,\r
-        "y": 304.9047336578369,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 534.7141952514648,\r
+        "y": 318.88043308258057,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "f0f44cd.5ed593",\r
-                "311a0c57.6a3054"\r
+                "a704dae0.46866",\r
+                "a2326081.5ee988"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0f44cd.5ed593",\r
+        "id": "a704dae0.46866",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 744.0475692749023,\r
-        "y": 274.9047222137451,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 718.0475692749023,\r
+        "y": 288.88042163848877,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "baeca66d.f8d568"\r
+                "4b4d3d88.c7ca9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "311a0c57.6a3054",\r
+        "id": "a2326081.5ee988",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 743.8094749450684,\r
-        "y": 315.85721588134766,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 717.8094749450684,\r
+        "y": 329.8329153060913,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "ecc33023.4b1938"\r
+                "e4643fbe.9b324"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "baeca66d.f8d568",\r
+        "id": "4b4d3d88.c7ca9c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 879.0475234985352,\r
-        "y": 273.2380619049072,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 853.0475234985352,\r
+        "y": 287.2137613296509,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ecc33023.4b1938",\r
+        "id": "e4643fbe.9b324",\r
         "type": "set",\r
         "name": "set prop.cloud-region.cloud-owner",\r
         "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`' />\n",\r
         "comments": "",\r
-        "x": 960.7141799926758,\r
-        "y": 314.9047431945801,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 934.7141799926758,\r
+        "y": 328.88044261932373,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     },\r
     {\r
-        "id": "59c722cd.d5e3ac",\r
+        "id": "5e3595bc.cfed8c",\r
         "type": "call",\r
         "name": "call self-serve-vf-module-forking-logic",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vf-module-forking-logic' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 592.3015670776367,\r
-        "y": 856.2980642318726,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 566.3015670776367,\r
+        "y": 870.2737636566162,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9ed32d4f.dbd058",\r
+        "id": "5eb11d31.97f244",\r
         "type": "switchNode",\r
         "name": "switch ss.self-serve-flag",\r
         "xml": "<switch test=\"`$ss.self-serve-flag`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 550.4443054199219,\r
-        "y": 1083.2981328964233,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 524.4443054199219,\r
+        "y": 1097.273832321167,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "21546dae.57be42",\r
-                "174b6de2.72fdb2"\r
+                "e392bb12.8c4bc",\r
+                "1c65532b.b915dd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21546dae.57be42",\r
+        "id": "e392bb12.8c4bc",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 771.158504486084,\r
-        "y": 1200.869031906128,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 745.158504486084,\r
+        "y": 1214.8447313308716,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "43e1e208.1c9204"\r
+                "cdb40a91.68e35"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "174b6de2.72fdb2",\r
+        "id": "1c65532b.b915dd",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 771.7299575805664,\r
-        "y": 959.7266693115234,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 745.7299575805664,\r
+        "y": 973.7023687362671,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             [\r
-                "4c64ed.a697bb14"\r
+                "58e6d3f7.f000a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f90d0a3.4f5888",\r
+        "id": "ee77fdb8.d87748",\r
         "type": "call",\r
         "name": "call check for VNF-API-preload and copy",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='gw-vfmodule-update' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 501,\r
-        "y": 7285,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 475,\r
+        "y": 7298.975699424744,\r
+        "z": "f3a72141.88f688",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "484ad130.562eb8",\r
+        "id": "5e5e8a4e.e5fc5c",\r
         "type": "comment",\r
         "name": "'Old' version of DG, called for flows where SO does not expect async response (so-sdnc-adapter)",\r
         "info": "",\r
         "comments": "",\r
-        "x": 433,\r
-        "y": 88,\r
-        "z": "9167bcd1.0dd69",\r
+        "x": 407,\r
+        "y": 101.97569942474365,\r
+        "z": "f3a72141.88f688",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "557cfb68.ef7394",\r
+        "type": "switchNode",\r
+        "name": "cloud-owner passed in input?",\r
+        "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner != ''`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 622,\r
+        "y": 225,\r
+        "z": "f3a72141.88f688",\r
+        "wires": [\r
+            [\r
+                "1bc02874.c16ff8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1bc02874.c16ff8",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 942,\r
+        "y": 227,\r
+        "z": "f3a72141.88f688",\r
+        "wires": [\r
+            [\r
+                "4a0c8b5d.038a3c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4a0c8b5d.038a3c",\r
+        "type": "set",\r
+        "name": "set prop.cloud-region.cloud-owner to input cloud-owner",\r
+        "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`' />\n",\r
+        "comments": "",\r
+        "x": 1313,\r
+        "y": 223,\r
+        "z": "f3a72141.88f688",\r
         "wires": []\r
     }\r
-]\r
+]
\ No newline at end of file
index fa28f0d..9149bac 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "1c63830b.6dad15",\r
+        "id": "4661c184.ec1f28",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 158,\r
-        "y": 122.74699592590332,\r
-        "z": "652cf04d.917e78",\r
+        "x": 123,\r
+        "y": 136,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "d0207df4.e744a8"\r
+                "1a1c365c.1bc24a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0207df4.e744a8",\r
+        "id": "1a1c365c.1bc24a",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 273.28570556640625,\r
-        "y": 164.65177536010742,\r
-        "z": "652cf04d.917e78",\r
+        "x": 238.28570556640625,\r
+        "y": 177.9047794342041,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "3222238a.bde594"\r
+                "16e76479.f473f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3222238a.bde594",\r
+        "id": "16e76479.f473f4",\r
         "type": "method",\r
         "name": "method vnf-topology-operation-assign-async",\r
         "xml": "<method rpc='vnf-topology-operation-assign-async' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 246.09530639648438,\r
-        "y": 207.41365909576416,\r
-        "z": "652cf04d.917e78",\r
+        "x": 211.09530639648438,\r
+        "y": 220.66666316986084,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "525bcd69.d52c4c"\r
+                "bf83b00.ffd5dd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4bbdf4dc.9acd64",\r
+        "id": "aecec26e.e0692",\r
         "type": "comment",\r
         "name": "vnf-topology-operation-assign-async",\r
         "info": "",\r
         "comments": "",\r
-        "x": 522.0115356445312,\r
-        "y": 45,\r
-        "z": "652cf04d.917e78",\r
+        "x": 487.01153564453125,\r
+        "y": 58.25300407409668,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "65b55bf0.e17c94",\r
+        "id": "d8bf5428.1ff1",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 554.3809661865234,\r
-        "y": 518.3898124694824,\r
-        "z": "652cf04d.917e78",\r
+        "x": 519.3809661865234,\r
+        "y": 531.6428165435791,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "676025ce.ceaed4",\r
-                "fac05067.e39a6"\r
+                "431069fb.8761",\r
+                "5dbaa5aa.6ad9b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "676025ce.ceaed4",\r
+        "id": "431069fb.8761",\r
         "type": "outcome",\r
         "name": "CreateVnfInstance",\r
         "xml": "<outcome value='CreateVnfInstance'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 808.0952606201172,\r
-        "y": 495.53269386291504,\r
-        "z": "652cf04d.917e78",\r
+        "x": 773.0952606201172,\r
+        "y": 508.7856979370117,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "a9df7def.2e87a"\r
+                "19923e90.84dc49"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fac05067.e39a6",\r
+        "id": "5dbaa5aa.6ad9b4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 770.0952262878418,\r
-        "y": 541.2470216751099,\r
-        "z": "652cf04d.917e78",\r
+        "x": 735.0952262878418,\r
+        "y": 554.5000257492065,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "2d48d63d.1a5b82"\r
+                "188d06d.21abdf9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a9df7def.2e87a",\r
+        "id": "19923e90.84dc49",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 992.9523887634277,\r
-        "y": 495.53272342681885,\r
-        "z": "652cf04d.917e78",\r
+        "x": 957.9523887634277,\r
+        "y": 508.7857275009155,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "73e62b5e.2d2d24",\r
+        "id": "14788654.ce330a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 215.73814392089844,\r
-        "y": 3404.7708625793457,\r
-        "z": "652cf04d.917e78",\r
-        "wires": [\r
-            [\r
-                "4ea0676c.f3c5",\r
-                "d807e3bf.6821",\r
-                "7dbd70b1.1d952",\r
-                "c802fc95.1aed4",\r
-                "ba6b2f3.81ff65",\r
-                "84242802.438068",\r
-                "40b03c35.066374",\r
-                "978c06f5.c51b38",\r
-                "a2246d8d.309948",\r
-                "d1226d82.dd4ba",\r
-                "42aca120.8663b",\r
-                "27992a30.77ac86",\r
-                "ba745244.bd0468",\r
-                "32a417de.843a",\r
-                "60220dbd.cbb274",\r
-                "aeeecb5d.b95ac8",\r
-                "bd2f9d29.6f4cd",\r
-                "d4235437.829c38",\r
-                "d7771a1c.3c6348",\r
-                "6a3932df.a191e4",\r
-                "ba43d064.2bf358",\r
-                "54b8c442.c1469c",\r
-                "f4822626.6784a",\r
-                "c0f7e6fd.82944",\r
-                "b69c7bea.5b8f98",\r
-                "779ef85a.752e58",\r
-                "b8b61871.289a38",\r
-                "f7b6f1fc.97c858",\r
-                "d350e16f.3e261",\r
-                "93239a74.eab46",\r
-                "a88c2f3d.bf4fa8",\r
-                "3e36f71.f2f0b88",\r
-                "b3a3b6d8.b3b1a",\r
-                "aac69396.6ddb18",\r
-                "634a4090.ff27d",\r
-                "9ec4fd36.2e31c8",\r
-                "1fec3768.f512f1",\r
-                "4ba8fd3f.c818fc",\r
-                "d2d8ec6e.e92468",\r
-                "2957e806.869ab"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "c29453e1.d0b3d8",\r
+        "x": 180.73814392089844,\r
+        "y": 3418.0238666534424,\r
+        "z": "f54d3783.41afe",\r
+        "wires": [\r
+            [\r
+                "c04129d2.227c68",\r
+                "9b868b8e.0ba8a8",\r
+                "8731f91d.91242",\r
+                "1022e029.863328",\r
+                "ba2df5c1.747cf8",\r
+                "52345019.2351b8",\r
+                "192e1482.449c03",\r
+                "2c1ef18a.330b3e",\r
+                "e3faec1c.a59a",\r
+                "fcb95713.a4e8a8",\r
+                "5bbd9dd1.6c7d5c",\r
+                "143efc8a.25e1cb",\r
+                "409c22ae.a3bf9c",\r
+                "23583b8f.949ba4",\r
+                "c6168431.a00f5",\r
+                "790e4f79.58723",\r
+                "b9894f42.70a4f8",\r
+                "854ae13c.f926a",\r
+                "e553a1ad.69aae8",\r
+                "3c1e9c3a.58c014",\r
+                "59441881.83eba8",\r
+                "b2968f47.d2ae78",\r
+                "84464174.3953f",\r
+                "355ef255.69a646",\r
+                "f9d2efbe.08a05",\r
+                "f2183011.286a98",\r
+                "d9a36927.f2271",\r
+                "ec714a9b.c38d8",\r
+                "d780c8df.23f2d",\r
+                "e4a614d.2b0f1e8",\r
+                "ce494650.e8a068",\r
+                "42a167cf.392ce",\r
+                "f94face8.c5b278",\r
+                "a5911152.d7aeb",\r
+                "a2884948.862f8",\r
+                "5d5f2dd1.10210c",\r
+                "f5df60ce.d84ac8",\r
+                "3367c076.389b7",\r
+                "d71dd728.42aa",\r
+                "dac2571d.72305"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c4069bd9.1face",\r
         "type": "get-resource",\r
         "name": "get-resource VF_MODEL",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 566.7142715454102,\r
-        "y": 609.5326824188232,\r
-        "z": "652cf04d.917e78",\r
+        "x": 531.7142715454102,\r
+        "y": 622.7856864929199,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "1eae0e0a.4b77c2",\r
-                "72cc49c6.447b08"\r
+                "1869c2be.7fa70d",\r
+                "79d22567.c1617c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1eae0e0a.4b77c2",\r
+        "id": "1869c2be.7fa70d",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 767.4999694824219,\r
-        "y": 589.913519859314,\r
-        "z": "652cf04d.917e78",\r
+        "x": 732.4999694824219,\r
+        "y": 603.1665239334106,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "17544ab9.984c5d"\r
+                "513e881c.9b735"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72cc49c6.447b08",\r
+        "id": "79d22567.c1617c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 776.0713996887207,\r
-        "y": 634.1992330551147,\r
-        "z": "652cf04d.917e78",\r
+        "x": 741.0713996887207,\r
+        "y": 647.4522371292114,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "9a95814.c6dd98"\r
+                "77a122cf.38f42c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ea0676c.f3c5",\r
+        "id": "c04129d2.227c68",\r
         "type": "switchNode",\r
         "name": "switch service-data.vnfs.vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 590.3809204101562,\r
-        "y": 1197.9851322174072,\r
-        "z": "652cf04d.917e78",\r
+        "x": 555.3809204101562,\r
+        "y": 1211.238136291504,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "7fa001b2.5a02a",\r
-                "2784fe24.f3ffba"\r
+                "1423036f.c07405",\r
+                "efcdd596.dadaa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7fa001b2.5a02a",\r
+        "id": "1423036f.c07405",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 816.0952491760254,\r
-        "y": 1165.1279201507568,\r
-        "z": "652cf04d.917e78",\r
+        "x": 781.0952491760254,\r
+        "y": 1178.3809242248535,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "7f419c89.2e0014"\r
+                "4e9c3502.517244"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7f419c89.2e0014",\r
+        "id": "4e9c3502.517244",\r
         "type": "set",\r
         "name": "set vnf-index=0",\r
         "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 980.3809700012207,\r
-        "y": 1164.1279983520508,\r
-        "z": "652cf04d.917e78",\r
+        "x": 945.3809700012207,\r
+        "y": 1177.3810024261475,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2784fe24.f3ffba",\r
+        "id": "efcdd596.dadaa8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 817.523811340332,\r
-        "y": 1229.4137382507324,\r
-        "z": "652cf04d.917e78",\r
+        "x": 782.523811340332,\r
+        "y": 1242.666742324829,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "6b01bbf.e34dbc4"\r
+                "a8b5b199.d340a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "741efbb8.5b8a44",\r
+        "id": "4084f52d.1d8c5c",\r
         "type": "set",\r
         "name": "set vnf-index = vnf_length",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",\r
         "comments": "",\r
-        "x": 1235.3809661865234,\r
-        "y": 1207.699426651001,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1200.3809661865234,\r
+        "y": 1220.9524307250977,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5f2528be.bf7e48",\r
+        "id": "869d4b3f.d6d0e8",\r
         "type": "for",\r
         "name": "for each existing VNF",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1220.8094787597656,\r
-        "y": 1253.6993656158447,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1185.8094787597656,\r
+        "y": 1266.9523696899414,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "4af50057.0f1aa8"\r
+                "4250c05c.e09ef8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b01bbf.e34dbc4",\r
+        "id": "a8b5b199.d340a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 991.2380714416504,\r
-        "y": 1229.413703918457,\r
-        "z": "652cf04d.917e78",\r
+        "x": 956.2380714416504,\r
+        "y": 1242.6667079925537,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "741efbb8.5b8a44",\r
-                "5f2528be.bf7e48"\r
+                "4084f52d.1d8c5c",\r
+                "869d4b3f.d6d0e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4af50057.0f1aa8",\r
+        "id": "4250c05c.e09ef8",\r
         "type": "switchNode",\r
         "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1575.0952453613281,\r
-        "y": 1253.270845413208,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1540.0952453613281,\r
+        "y": 1266.5238494873047,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "25f009f8.2d893e"\r
+                "67224b8a.b94c34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25f009f8.2d893e",\r
+        "id": "67224b8a.b94c34",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1869.3810005187988,\r
-        "y": 1252.8423299789429,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1834.3810005187988,\r
+        "y": 1266.0953340530396,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "dcfb1529.fec6a8"\r
+                "fb90666f.a03358"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8724aa2.889b6d8",\r
+        "id": "46cfab20.22887c",\r
         "type": "comment",\r
         "name": "make sure this VNF doesn't exist already",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1562.2379760742188,\r
-        "y": 1210.8422756195068,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1527.2379760742188,\r
+        "y": 1224.0952796936035,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d807e3bf.6821",\r
+        "id": "9b868b8e.0ba8a8",\r
         "type": "set",\r
         "name": "set vnf-topology data",\r
         "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",\r
         "comments": "",\r
-        "x": 556.0952033996582,\r
-        "y": 1729.6518993377686,\r
-        "z": "652cf04d.917e78",\r
+        "x": 521.0952033996582,\r
+        "y": 1742.9049034118652,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7dbd70b1.1d952",\r
+        "id": "8731f91d.91242",\r
         "type": "switchNode",\r
         "name": "switch input vnf-name",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-name`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 568.5952224731445,\r
-        "y": 2091.770956993103,\r
-        "z": "652cf04d.917e78",\r
+        "x": 533.5952224731445,\r
+        "y": 2105.0239610671997,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "241fabfe.69fa2c",\r
-                "f80604c.1fec1f8"\r
+                "52dafc17.f6736c",\r
+                "7d58c1cc.73ce7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c802fc95.1aed4",\r
+        "id": "1022e029.863328",\r
         "type": "get-resource",\r
         "name": "get-resource cloud region",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 600.738166809082,\r
-        "y": 2987.7706928253174,\r
-        "z": "652cf04d.917e78",\r
+        "x": 565.738166809082,\r
+        "y": 3001.023696899414,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "50e5753c.35a0ec",\r
-                "60c43013.41eb78"\r
+                "ffadf4a4.50abb8",\r
+                "daf194d0.8551a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60c43013.41eb78",\r
+        "id": "daf194d0.8551a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 808.8414840698242,\r
-        "y": 3006.921399116516,\r
-        "z": "652cf04d.917e78",\r
+        "x": 773.8414840698242,\r
+        "y": 3020.174403190613,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "f968cb62.56775"\r
+                "67a22798.d81588"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50e5753c.35a0ec",\r
+        "id": "ffadf4a4.50abb8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 817.7700805664062,\r
-        "y": 2964.2071323394775,\r
-        "z": "652cf04d.917e78",\r
+        "x": 782.7700805664062,\r
+        "y": 2977.460136413574,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "2be0da40.0d7806"\r
+                "5d5eddf8.f77b84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba6b2f3.81ff65",\r
+        "id": "ba2df5c1.747cf8",\r
         "type": "get-resource",\r
         "name": "get-resource VF_TO_NETWORK_ROLE_MAPPING",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 665.9762496948242,\r
-        "y": 3298.8182125091553,\r
-        "z": "652cf04d.917e78",\r
+        "x": 630.9762496948242,\r
+        "y": 3312.071216583252,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "1edaf2dd.6abca5",\r
-                "8c805d73.d5428"\r
+                "f02723c3.a381b8",\r
+                "54125380.e0951c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1edaf2dd.6abca5",\r
+        "id": "f02723c3.a381b8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 961.7619209289551,\r
-        "y": 3277.532377243042,\r
-        "z": "652cf04d.917e78",\r
+        "x": 926.7619209289551,\r
+        "y": 3290.7853813171387,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "7ef20c7d.b3d83c"\r
+                "48f3f890.8517f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c805d73.d5428",\r
+        "id": "54125380.e0951c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 970.3333511352539,\r
-        "y": 3321.818090438843,\r
-        "z": "652cf04d.917e78",\r
+        "x": 935.3333511352539,\r
+        "y": 3335.0710945129395,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c3672ff4.a17f"\r
+                "6a48e0c.284292"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "febef76b.d8c79",\r
+        "id": "c302bb2b.5f6d08",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1066.9049491882324,\r
-        "y": 4415.460702896118,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1031.9049491882324,\r
+        "y": 4428.713706970215,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "69a52c45.9d3a2c",\r
-                "1b8f8e9a.44ecf9",\r
-                "b81c1659.1acf38",\r
-                "c7e3943d.2b1af",\r
-                "e1eddf21.903d78",\r
-                "886b4211.4bd9a",\r
-                "5621d64.66c8228",\r
-                "680457ce.355c7",\r
-                "f1e14dbb.a2c47"\r
+                "a360a46d.3c70b",\r
+                "796e072e.7461a",\r
+                "2ec19c6c.a13ee4",\r
+                "f7ab2775.d01c4",\r
+                "e518bda4.6b6118",\r
+                "e56d0bf4.28331",\r
+                "441a09f7.0fe6e8",\r
+                "125c5567.a44893",\r
+                "f38e05b8.78f318"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b81c1659.1acf38",\r
+        "id": "2ec19c6c.a13ee4",\r
         "type": "get-resource",\r
         "name": "get-resource l3-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1316.6191482543945,\r
-        "y": 3505.8417415618896,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1281.6191482543945,\r
+        "y": 3519.0947456359863,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "69f68ea2.5d7068",\r
-                "8f733aa1.cdcf6"\r
+                "1b964abe.a8bf65",\r
+                "73b445f9.d1da54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f733aa1.cdcf6",\r
+        "id": "73b445f9.d1da54",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1522.0954627990723,\r
-        "y": 3535.1273441314697,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1487.0954627990723,\r
+        "y": 3548.3803482055664,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "11a704cb.ec6e1b"\r
+                "76d0200d.fc0188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69f68ea2.5d7068",\r
+        "id": "1b964abe.a8bf65",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1529.595458984375,\r
-        "y": 3486.2703142166138,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1494.595458984375,\r
+        "y": 3499.5233182907104,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ddfbfd5a.f170a"\r
+                "c82ac0d8.cc5e38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69a52c45.9d3a2c",\r
+        "id": "a360a46d.3c70b",\r
         "type": "set",\r
         "name": "set vnf-network data",\r
         "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",\r
         "comments": "",\r
-        "x": 1312.9526138305664,\r
-        "y": 4311.413550376892,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1277.9526138305664,\r
+        "y": 4324.666554450989,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a2246d8d.309948",\r
+        "id": "e3faec1c.a59a",\r
         "type": "for",\r
         "name": "for each cloud-region availability zone",\r
         "xml": "<for index='idx' start='0' end='`$aai.cloud-region.availability-zones.availability-zone_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 533.3336524963379,\r
-        "y": 5558.532527923584,\r
-        "z": "652cf04d.917e78",\r
+        "x": 498.3336524963379,\r
+        "y": 5571.785531997681,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "87ffb6ef.f80298"\r
+                "adba82bf.e3f3a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc615b55.663bf",\r
+        "id": "12d3265f.5dba1a",\r
         "type": "set",\r
         "name": "set availability-zone",\r
         "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",\r
         "comments": "",\r
-        "x": 995.0003356933594,\r
-        "y": 5527.865942001343,\r
-        "z": "652cf04d.917e78",\r
+        "x": 960.0003356933594,\r
+        "y": 5541.118946075439,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d1226d82.dd4ba",\r
+        "id": "fcb95713.a4e8a8",\r
         "type": "set",\r
         "name": "set vnf-parameters-data",\r
         "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",\r
         "comments": "",\r
-        "x": 492.952579498291,\r
-        "y": 5408.484888076782,\r
-        "z": "652cf04d.917e78",\r
+        "x": 457.952579498291,\r
+        "y": 5421.737892150879,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c91f5f57.248b18",\r
+        "id": "b65e5ff3.d14f98",\r
         "type": "save",\r
         "name": "save generic-vnf l3-network relationships",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 959.524112701416,\r
-        "y": 5702.29474067688,\r
-        "z": "652cf04d.917e78",\r
+        "x": 924.524112701416,\r
+        "y": 5715.547744750977,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "70b9d92d.cfcaf",\r
-                "8019290f.d9e57"\r
+                "ee487aee.96931",\r
+                "a9a85016.7d2db8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba745244.bd0468",\r
+        "id": "409c22ae.a3bf9c",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 446.29785919189453,\r
-        "y": 6598.056180000305,\r
-        "z": "652cf04d.917e78",\r
+        "x": 411.29785919189453,\r
+        "y": 6611.309184074402,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "27992a30.77ac86",\r
+        "id": "143efc8a.25e1cb",\r
         "type": "set",\r
         "name": "set vnf-level-oper-status to PendingCreate",\r
         "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",\r
         "comments": "",\r
-        "x": 548.8255958557129,\r
-        "y": 6071.500453948975,\r
-        "z": "652cf04d.917e78",\r
+        "x": 513.8255958557129,\r
+        "y": 6084.753458023071,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40b03c35.066374",\r
+        "id": "192e1482.449c03",\r
         "type": "for",\r
         "name": "for each network-role",\r
         "xml": "<for silentFailure='true' index='role-index' start='0' end='`$db.vf-network-role-mapping_length`'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 526.9048843383789,\r
-        "y": 4388.794371604919,\r
-        "z": "652cf04d.917e78",\r
+        "x": 491.9048843383789,\r
+        "y": 4402.047375679016,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "f73eb405.e256b8"\r
+                "83a5f952.36e31"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84242802.438068",\r
+        "id": "52345019.2351b8",\r
         "type": "set",\r
         "name": "set network-index = 0",\r
         "xml": "<set>\n<parameter name='network-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 568.4047470092773,\r
-        "y": 3352.8660068511963,\r
-        "z": "652cf04d.917e78",\r
+        "x": 533.4047470092773,\r
+        "y": 3366.119010925293,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1b8f8e9a.44ecf9",\r
+        "id": "796e072e.7461a",\r
         "type": "set",\r
         "name": "increment network-index",\r
         "xml": "<set>\n<parameter name='network-index' value='`$network-index + 1`' />\n",\r
         "comments": "",\r
-        "x": 1294.9526023864746,\r
-        "y": 5359.175491333008,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1259.9526023864746,\r
+        "y": 5372.4284954071045,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "978c06f5.c51b38",\r
+        "id": "2c1ef18a.330b3e",\r
         "type": "set",\r
         "name": "set vnf-network_length",\r
         "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",\r
         "comments": "",\r
-        "x": 491.80966567993164,\r
-        "y": 5358.484931945801,\r
-        "z": "652cf04d.917e78",\r
+        "x": 456.80966567993164,\r
+        "y": 5371.7379360198975,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "42aca120.8663b",\r
+        "id": "5bbd9dd1.6c7d5c",\r
         "type": "set",\r
         "name": "copy input data",\r
         "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",\r
         "comments": "",\r
-        "x": 458.095401763916,\r
-        "y": 6017.913442611694,\r
-        "z": "652cf04d.917e78",\r
+        "x": 423.095401763916,\r
+        "y": 6031.166446685791,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "32a417de.843a",\r
+        "id": "23583b8f.949ba4",\r
         "type": "for",\r
         "name": "for each vnf-network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 482.52402114868164,\r
-        "y": 5701.29465675354,\r
-        "z": "652cf04d.917e78",\r
+        "x": 447.52402114868164,\r
+        "y": 5714.547660827637,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "80153f67.955468"\r
+                "d0f022e5.c88068"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80153f67.955468",\r
+        "id": "d0f022e5.c88068",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 686.1906623840332,\r
-        "y": 5701.294617652893,\r
-        "z": "652cf04d.917e78",\r
+        "x": 651.1906623840332,\r
+        "y": 5714.54762172699,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c91f5f57.248b18"\r
+                "b65e5ff3.d14f98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60220dbd.cbb274",\r
+        "id": "c6168431.a00f5",\r
         "type": "set",\r
         "name": "set new vnf_length",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",\r
         "comments": "",\r
-        "x": 539.0238418579102,\r
-        "y": 1250.0090227127075,\r
-        "z": "652cf04d.917e78",\r
+        "x": 504.02384185791016,\r
+        "y": 1263.2620267868042,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aeeecb5d.b95ac8",\r
+        "id": "790e4f79.58723",\r
         "type": "for",\r
         "name": "for each cloud-region relationship",\r
         "xml": "<for index='idx' start='0' end='`$aai.cloud-region.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 613.5952911376953,\r
-        "y": 3075.008864402771,\r
-        "z": "652cf04d.917e78",\r
+        "x": 578.5952911376953,\r
+        "y": 3088.2618684768677,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "af9376a1.5b3178"\r
+                "8d6ad368.291ba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af9376a1.5b3178",\r
+        "id": "8d6ad368.291ba",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$aai.cloud-region.relationship-list.relationship[$idx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 861.2738342285156,\r
-        "y": 3074.7587938308716,\r
-        "z": "652cf04d.917e78",\r
+        "x": 826.2738342285156,\r
+        "y": 3088.0117979049683,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "b05c52b5.57078"\r
+                "e3747594.cd166"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b05c52b5.57078",\r
+        "id": "e3747594.cd166",\r
         "type": "outcome",\r
         "name": "complex",\r
         "xml": "<outcome value='complex'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1030.7381553649902,\r
-        "y": 3074.1516160964966,\r
-        "z": "652cf04d.917e78",\r
+        "x": 995.7381553649902,\r
+        "y": 3087.4046201705933,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "8b3ae97b.251a1"\r
+                "824c58c6.f6519"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d417f4d3.21848",\r
+        "id": "62adf90d.0208a",\r
         "type": "set",\r
         "name": "set aic-clli",\r
         "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",\r
         "comments": "",\r
-        "x": 1408.3095397949219,\r
-        "y": 3072.389811515808,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1373.3095397949219,\r
+        "y": 3085.642815589905,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bd2f9d29.6f4cd",\r
+        "id": "b9894f42.70a4f8",\r
         "type": "switchNode",\r
         "name": "switch aic-clli",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-clli`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 546.6429176330566,\r
-        "y": 3188.1039962768555,\r
-        "z": "652cf04d.917e78",\r
+        "x": 511.64291763305664,\r
+        "y": 3201.357000350952,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "7ec6f0ba.5529d8"\r
+                "e46a7171.697a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ec6f0ba.5529d8",\r
+        "id": "e46a7171.697a2",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 694.7857513427734,\r
-        "y": 3188.103979110718,\r
-        "z": "652cf04d.917e78",\r
+        "x": 659.7857513427734,\r
+        "y": 3201.3569831848145,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "5c62b00e.a7cd48"\r
+                "8a243db.c5662c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30224228.963f36",\r
+        "id": "cbfc20ba.1ec18",\r
         "type": "set",\r
         "name": "set from DB",\r
         "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",\r
         "comments": "",\r
-        "x": 973.0954627990723,\r
-        "y": 2546.9612531661987,\r
-        "z": "652cf04d.917e78",\r
+        "x": 938.0954627990723,\r
+        "y": 2560.2142572402954,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5318147.69e14",\r
+        "id": "9fefd3f8.db8f98",\r
         "type": "for",\r
         "name": "for each l3-network",\r
         "xml": "<for index='db-network-index' start='0' end='`$aai.l3-network.l3-network_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1433.2145919799805,\r
-        "y": 4135.984929084778,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1398.2145919799805,\r
+        "y": 4149.2379331588745,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "852f0b12.336648"\r
+                "614c8409.56f694"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b772b2db.6bf188",\r
+        "id": "387ea551.d97d92",\r
         "type": "switchNode",\r
         "name": "switch orchestration-status",\r
         "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].orchestration-status`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1851.7857627868652,\r
-        "y": 4070.556393623352,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1816.7857627868652,\r
+        "y": 4083.8093976974487,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "2013144f.4b7fd4",\r
-                "bd45a651.d4fc18",\r
-                "6b197918.4b35",\r
-                "d8961e04.47a09",\r
-                "d20d55e5.845528"\r
+                "9d95d4f1.af8f28",\r
+                "6e67295b.083bd8",\r
+                "c841f358.cc44e",\r
+                "9931da25.1af06",\r
+                "a2d8e726.f731e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2013144f.4b7fd4",\r
+        "id": "9d95d4f1.af8f28",\r
         "type": "outcome",\r
         "name": "Pending Delete",\r
         "xml": "<outcome value='Pending Delete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2092.4526329040527,\r
-        "y": 4112.222897529602,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2057.4526329040527,\r
+        "y": 4125.475901603699,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "65cc69a1.7d4018"\r
+                "111ca475.bfcb9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd45a651.d4fc18",\r
+        "id": "6e67295b.083bd8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2065.309772491455,\r
-        "y": 4163.222878456116,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2030.309772491455,\r
+        "y": 4176.475882530212,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "9c0a541e.0b30c8"\r
+                "f1a29c9.7d328e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81eba499.0af278",\r
+        "id": "48ea8c97.939764",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship[$db-rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2601.0240745544434,\r
-        "y": 4108.460795402527,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2566.0240745544434,\r
+        "y": 4121.7137994766235,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "65278a7b.2864d4",\r
-                "29d3dc98.16bcd4"\r
+                "eb1468.3f791b98",\r
+                "9d09f6f3.62b358"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c0a541e.0b30c8",\r
+        "id": "f1a29c9.7d328e",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='db-rel-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2235.309684753418,\r
-        "y": 4162.794255256653,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2200.309684753418,\r
+        "y": 4176.0472593307495,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "e8b88764.0e454"\r
+                "ebfe35e9.d51238"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "65278a7b.2864d4",\r
+        "id": "eb1468.3f791b98",\r
         "type": "outcome",\r
         "name": "cloud-region",\r
         "xml": "<outcome value='cloud-region'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2775.309860229492,\r
-        "y": 4131.365619659424,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2740.309860229492,\r
+        "y": 4144.6186237335205,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "bfe4f75a.234cc8"\r
+                "e8ab049.a8a56f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bfe4f75a.234cc8",\r
+        "id": "e8ab049.a8a56f8",\r
         "type": "for",\r
         "name": "for each relationship data",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2972.4525604248047,\r
-        "y": 4131.794087409973,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2937.4525604248047,\r
+        "y": 4145.04709148407,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "9def1818.13c9f8"\r
+                "c1b3c066.a9955"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9def1818.13c9f8",\r
+        "id": "c1b3c066.a9955",\r
         "type": "switchNode",\r
         "name": "switch relationship-key",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3203.881160736084,\r
-        "y": 4131.365462303162,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3168.881160736084,\r
+        "y": 4144.618466377258,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "29799bf8.7888e4"\r
+                "e9bc1c2.e51706"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29799bf8.7888e4",\r
+        "id": "e9bc1c2.e51706",\r
         "type": "outcome",\r
         "name": "cloud-region.cloud-region-id",\r
         "xml": "<outcome value='cloud-region.cloud-region-id'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3445.309726715088,\r
-        "y": 4131.365558624268,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3410.309726715088,\r
+        "y": 4144.618562698364,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "a1567e58.8a3128"\r
+                "fbd49a32.93afa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1567e58.8a3128",\r
+        "id": "fbd49a32.93afa8",\r
         "type": "switchNode",\r
         "name": "switch relationship-value == cloud-region-id",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3749.595645904541,\r
-        "y": 4131.22261428833,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3714.595645904541,\r
+        "y": 4144.475618362427,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "7b8c98d4.2676d8"\r
+                "ddf73f3.4f64ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b8c98d4.2676d8",\r
+        "id": "ddf73f3.4f64ac",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3454.5957832336426,\r
-        "y": 4248.865568161011,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3419.5957832336426,\r
+        "y": 4262.118572235107,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "393f0cf4.4aabc4"\r
+                "a878b424.24494"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7e3943d.2b1af",\r
+        "id": "f7ab2775.d01c4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1269.4287643432617,\r
-        "y": 4067.270573616028,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1234.4287643432617,\r
+        "y": 4080.5235776901245,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "f5318147.69e14",\r
-                "16ed0d4.c25bbf3"\r
+                "9fefd3f8.db8f98",\r
+                "60ffa0a.88fbae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1eddf21.903d78",\r
+        "id": "e518bda4.6b6118",\r
         "type": "set",\r
         "name": "set l3-network-id = -1",\r
         "xml": "<set>\n<parameter name='l3-network-id' value='-1' />\n",\r
         "comments": "",\r
-        "x": 1313.7621231079102,\r
-        "y": 3939.175227165222,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1278.7621231079102,\r
+        "y": 3952.428231239319,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "393f0cf4.4aabc4",\r
+        "id": "a878b424.24494",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3600.4287605285645,\r
-        "y": 4248.341676712036,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3565.4287605285645,\r
+        "y": 4261.594680786133,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "4729b379.1be23c",\r
-                "54222992.1960d8",\r
-                "5189f56d.e57b74"\r
+                "9cd55b24.1c69b8",\r
+                "6ea80d98.19177c",\r
+                "f903bb12.78282"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4729b379.1be23c",\r
+        "id": "9cd55b24.1c69b8",\r
         "type": "set",\r
         "name": "set l3-network-id = this l3-network",\r
         "xml": "<set>\n<parameter name='l3-network-id' value='`$aai.l3-network.l3-network[$db-network-index].network-id`' />\n",\r
         "comments": "",\r
-        "x": 3835.666763305664,\r
-        "y": 4210.484645843506,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3800.666763305664,\r
+        "y": 4223.7376499176025,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "886b4211.4bd9a",\r
+        "id": "e56d0bf4.28331",\r
         "type": "switchNode",\r
         "name": "switch l3-network-id",\r
         "xml": "<switch test='`$l3-network-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1310.7620468139648,\r
-        "y": 4262.842268943787,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1275.7620468139648,\r
+        "y": 4276.095273017883,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "74e3a542.ce5c34"\r
+                "b5902ad4.0ee7f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74e3a542.ce5c34",\r
+        "id": "b5902ad4.0ee7f",\r
         "type": "outcome",\r
         "name": "-1",\r
         "xml": "<outcome value='-1'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1480.7619972229004,\r
-        "y": 4262.842024803162,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1445.7619972229004,\r
+        "y": 4276.095028877258,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c374836e.37fed8"\r
+                "d3e41f3b.440478"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4235437.829c38",\r
+        "id": "854ae13c.f926a",\r
         "type": "switchNode",\r
         "name": "switch input model-invariant-uuid",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 616.9525375366211,\r
-        "y": 2569.7856969833374,\r
-        "z": "652cf04d.917e78",\r
+        "x": 581.9525375366211,\r
+        "y": 2583.038701057434,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ff6622a4.df1be",\r
-                "cb85aa4.8fd2d58"\r
+                "78e93e80.eb3758",\r
+                "92899c0f.845368"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff6622a4.df1be",\r
+        "id": "78e93e80.eb3758",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 822.6192092895508,\r
-        "y": 2546.9286603927612,\r
-        "z": "652cf04d.917e78",\r
+        "x": 787.6192092895508,\r
+        "y": 2560.181664466858,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "30224228.963f36"\r
+                "cbfc20ba.1ec18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb85aa4.8fd2d58",\r
+        "id": "92899c0f.845368",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 824.0478057861328,\r
-        "y": 2591.2142515182495,\r
-        "z": "652cf04d.917e78",\r
+        "x": 789.0478057861328,\r
+        "y": 2604.467255592346,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "5a4f9595.634e9c"\r
+                "d83d8af0.833c68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a4f9595.634e9c",\r
+        "id": "d83d8af0.833c68",\r
         "type": "set",\r
         "name": "set from input",\r
         "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",\r
         "comments": "",\r
-        "x": 978.3335418701172,\r
-        "y": 2590.6428236961365,\r
-        "z": "652cf04d.917e78",\r
+        "x": 943.3335418701172,\r
+        "y": 2603.895827770233,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1a70dac.17cd8a5",\r
+        "id": "551d3619.97d4a",\r
         "type": "set",\r
         "name": "set from DB",\r
         "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",\r
         "comments": "",\r
-        "x": 974.0477333068848,\r
-        "y": 2635.4999294281006,\r
-        "z": "652cf04d.917e78",\r
+        "x": 939.0477333068848,\r
+        "y": 2648.7529335021973,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d7771a1c.3c6348",\r
+        "id": "e553a1ad.69aae8",\r
         "type": "switchNode",\r
         "name": "switch input model-uuid",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 589.5715560913086,\r
-        "y": 2658.3244342803955,\r
-        "z": "652cf04d.917e78",\r
+        "x": 554.5715560913086,\r
+        "y": 2671.577438354492,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c16c7be1.296e98",\r
-                "37c94a54.90c536"\r
+                "8caf4514.78bf88",\r
+                "be07810c.32c568"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c16c7be1.296e98",\r
+        "id": "8caf4514.78bf88",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 823.5715293884277,\r
-        "y": 2635.467366218567,\r
-        "z": "652cf04d.917e78",\r
+        "x": 788.5715293884277,\r
+        "y": 2648.7203702926636,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "1a70dac.17cd8a5"\r
+                "551d3619.97d4a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37c94a54.90c536",\r
+        "id": "be07810c.32c568",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 825.0001258850098,\r
-        "y": 2679.752957344055,\r
-        "z": "652cf04d.917e78",\r
+        "x": 790.0001258850098,\r
+        "y": 2693.005961418152,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "857b4df6.43f238"\r
+                "17d2700c.c69678"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "857b4df6.43f238",\r
+        "id": "17d2700c.c69678",\r
         "type": "set",\r
         "name": "set from input",\r
         "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",\r
         "comments": "",\r
-        "x": 979.2858619689941,\r
-        "y": 2679.181529521942,\r
-        "z": "652cf04d.917e78",\r
+        "x": 944.2858619689941,\r
+        "y": 2692.434533596039,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2709bb13.2feecc",\r
+        "id": "84eb2be6.d05dd8",\r
         "type": "set",\r
         "name": "set from DB",\r
         "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",\r
         "comments": "",\r
-        "x": 971.1906661987305,\r
-        "y": 2724.3571367263794,\r
-        "z": "652cf04d.917e78",\r
+        "x": 936.1906661987305,\r
+        "y": 2737.610140800476,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6a3932df.a191e4",\r
+        "id": "3c1e9c3a.58c014",\r
         "type": "switchNode",\r
         "name": "switch input model-version",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 597.714427947998,\r
-        "y": 2747.1815814971924,\r
-        "z": "652cf04d.917e78",\r
+        "x": 562.714427947998,\r
+        "y": 2760.434585571289,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "cc5bd4f7.75a8d",\r
-                "d224df1c.f2e0d8"\r
+                "c7cffc9c.c74c18",\r
+                "749f7daf.7828bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc5bd4f7.75a8d",\r
+        "id": "c7cffc9c.c74c18",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 820.714412689209,\r
-        "y": 2724.324543952942,\r
-        "z": "652cf04d.917e78",\r
+        "x": 785.714412689209,\r
+        "y": 2737.5775480270386,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "2709bb13.2feecc"\r
+                "84eb2be6.d05dd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d224df1c.f2e0d8",\r
+        "id": "749f7daf.7828bc",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 822.143009185791,\r
-        "y": 2768.61013507843,\r
-        "z": "652cf04d.917e78",\r
+        "x": 787.143009185791,\r
+        "y": 2781.863139152527,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "8204943d.4c85a"\r
+                "7f3261c9.80b3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8204943d.4c85a",\r
+        "id": "7f3261c9.80b3c",\r
         "type": "set",\r
         "name": "set from input",\r
         "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",\r
         "comments": "",\r
-        "x": 976.4287452697754,\r
-        "y": 2768.038707256317,\r
-        "z": "652cf04d.917e78",\r
+        "x": 941.4287452697754,\r
+        "y": 2781.291711330414,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1f9db65f.71417a",\r
+        "id": "35947427.d97814",\r
         "type": "set",\r
         "name": "set from DB",\r
         "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",\r
         "comments": "",\r
-        "x": 971.1906661987305,\r
-        "y": 2811.4999589920044,\r
-        "z": "652cf04d.917e78",\r
+        "x": 936.1906661987305,\r
+        "y": 2824.752963066101,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ba43d064.2bf358",\r
+        "id": "59441881.83eba8",\r
         "type": "switchNode",\r
         "name": "switch input model-name",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 592.714427947998,\r
-        "y": 2834.3244037628174,\r
-        "z": "652cf04d.917e78",\r
+        "x": 557.714427947998,\r
+        "y": 2847.577407836914,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "e920eacf.c85db",\r
-                "62906e0a.a907e"\r
+                "3209e79f.964218",\r
+                "186b2860.bca8f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e920eacf.c85db",\r
+        "id": "3209e79f.964218",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 820.714412689209,\r
-        "y": 2811.467366218567,\r
-        "z": "652cf04d.917e78",\r
+        "x": 785.714412689209,\r
+        "y": 2824.7203702926636,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "1f9db65f.71417a"\r
+                "35947427.d97814"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62906e0a.a907e",\r
+        "id": "186b2860.bca8f",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 822.143009185791,\r
-        "y": 2855.752957344055,\r
-        "z": "652cf04d.917e78",\r
+        "x": 787.143009185791,\r
+        "y": 2869.005961418152,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ced1f56b.7c6248"\r
+                "179f336a.4f2225"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ced1f56b.7c6248",\r
+        "id": "179f336a.4f2225",\r
         "type": "set",\r
         "name": "set from input",\r
         "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",\r
         "comments": "",\r
-        "x": 976.4287452697754,\r
-        "y": 2855.181529521942,\r
-        "z": "652cf04d.917e78",\r
+        "x": 941.4287452697754,\r
+        "y": 2868.434533596039,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "65cc69a1.7d4018",\r
+        "id": "111ca475.bfcb9c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2245.6667251586914,\r
-        "y": 4112.999774932861,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2210.6667251586914,\r
+        "y": 4126.252779006958,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d20d55e5.845528",\r
+        "id": "a2d8e726.f731e",\r
         "type": "outcome",\r
         "name": "PendingDelete",\r
         "xml": "<outcome value='PendingDelete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2090.333366394043,\r
-        "y": 4067.999689102173,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2055.333366394043,\r
+        "y": 4081.2526931762695,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "b98d1a52.3774"\r
+                "4fa7e935.46f178"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b98d1a52.3774",\r
+        "id": "4fa7e935.46f178",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2245.5474586486816,\r
-        "y": 4068.776566505432,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2210.5474586486816,\r
+        "y": 4082.029570579529,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d8961e04.47a09",\r
+        "id": "9931da25.1af06",\r
         "type": "outcome",\r
         "name": "Pending Create",\r
         "xml": "<outcome value='Pending Create'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2092.333366394043,\r
-        "y": 4024.666193008423,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2057.333366394043,\r
+        "y": 4037.9191970825195,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "4552f1d0.132aa"\r
+                "ac4a5448.bd0b28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4552f1d0.132aa",\r
+        "id": "ac4a5448.bd0b28",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2245.5474586486816,\r
-        "y": 4025.443070411682,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2210.5474586486816,\r
+        "y": 4038.696074485779,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6b197918.4b35",\r
+        "id": "c841f358.cc44e",\r
         "type": "outcome",\r
         "name": "PendingCreate",\r
         "xml": "<outcome value='PendingCreate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2092.333366394043,\r
-        "y": 3981.332941055298,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2057.333366394043,\r
+        "y": 3994.5859451293945,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "1c2107f2.1dd77"\r
+                "88f5dd03.1382b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1c2107f2.1dd77",\r
+        "id": "88f5dd03.1382b8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2245.5474586486816,\r
-        "y": 3982.109818458557,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2210.5474586486816,\r
+        "y": 3995.362822532654,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5bf4954f.7a431c",\r
+        "id": "13a2f07f.5d3d1",\r
         "type": "for",\r
         "name": "for each A&AI subnet",\r
         "xml": "<for index='subnet-index' start='0' end='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1778.7143936157227,\r
-        "y": 4402.047110080719,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1743.7143936157227,\r
+        "y": 4415.300114154816,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "cefc1963.652428"\r
+                "9e9b89f7.9bdbf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48890473.4cc4e4",\r
+        "id": "af0595f.ee72a68",\r
         "type": "set",\r
         "name": "set subnet_length",\r
         "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",\r
         "comments": "",\r
-        "x": 1767.380958557129,\r
-        "y": 4447.04719209671,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1732.380958557129,\r
+        "y": 4460.300196170807,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "54b8c442.c1469c",\r
+        "id": "b2968f47.d2ae78",\r
         "type": "set",\r
         "name": "set availability-zones.max-count and length",\r
         "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",\r
         "comments": "",\r
-        "x": 553.0001564025879,\r
-        "y": 5646.547995567322,\r
-        "z": "652cf04d.917e78",\r
+        "x": 518.0001564025879,\r
+        "y": 5659.8009996414185,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f4822626.6784a",\r
+        "id": "84464174.3953f",\r
         "type": "set",\r
         "name": "set vnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 553.8333511352539,\r
-        "y": 2503.8334608078003,\r
-        "z": "652cf04d.917e78",\r
+        "x": 518.8333511352539,\r
+        "y": 2517.086464881897,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c0f7e6fd.82944",\r
+        "id": "355ef255.69a646",\r
         "type": "save",\r
         "name": "update generic-vnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 473.33342361450195,\r
-        "y": 5856.213758468628,\r
-        "z": "652cf04d.917e78",\r
+        "x": 438.33342361450195,\r
+        "y": 5869.466762542725,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "7a955a19.a2beec",\r
-                "8245dddc.98b7b8"\r
+                "3613a912.ba7d8e",\r
+                "988ba27a.13d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b69c7bea.5b8f98",\r
+        "id": "f9d2efbe.08a05",\r
         "type": "set",\r
         "name": "set vnf-object-path",\r
         "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",\r
         "comments": "",\r
-        "x": 473.3334617614746,\r
-        "y": 5786.214241027832,\r
-        "z": "652cf04d.917e78",\r
+        "x": 438.3334617614746,\r
+        "y": 5799.467245101929,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "779ef85a.752e58",\r
+        "id": "f2183011.286a98",\r
         "type": "set",\r
         "name": "set vnf-id",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id'\n   value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n",\r
         "comments": "",\r
-        "x": 542.1666946411133,\r
-        "y": 2455.5000038146973,\r
-        "z": "652cf04d.917e78",\r
+        "x": 507.1666946411133,\r
+        "y": 2468.753007888794,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b8b61871.289a38",\r
+        "id": "d9a36927.f2271",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vnf.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 447.8454360961914,\r
-        "y": 6422.226758003235,\r
-        "z": "652cf04d.917e78",\r
+        "x": 412.8454360961914,\r
+        "y": 6435.4797620773315,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "70b9d92d.cfcaf",\r
+        "id": "ee487aee.96931",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1209.3574676513672,\r
-        "y": 5679.833315849304,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1174.3574676513672,\r
+        "y": 5693.086319923401,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "e0daa6a.dcf31d8"\r
+                "b28581b0.5712a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8019290f.d9e57",\r
+        "id": "a9a85016.7d2db8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1217.928897857666,\r
-        "y": 5724.119029045105,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1182.928897857666,\r
+        "y": 5737.372033119202,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ca1e10f7.f5af08"\r
+                "1b732815.14e07"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a955a19.a2beec",\r
+        "id": "3613a912.ba7d8e",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 647.6907539367676,\r
-        "y": 5834.833353996277,\r
-        "z": "652cf04d.917e78",\r
+        "x": 612.6907539367676,\r
+        "y": 5848.0863580703735,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "2e13fdd8.c6ad92"\r
+                "8d790e64.fbc6b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8245dddc.98b7b8",\r
+        "id": "988ba27a.13d4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 656.2621841430664,\r
-        "y": 5879.119067192078,\r
-        "z": "652cf04d.917e78",\r
+        "x": 621.2621841430664,\r
+        "y": 5892.372071266174,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "eba4fe8c.3ea98"\r
+                "86656044.af7ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7b6f1fc.97c858",\r
+        "id": "ec714a9b.c38d8",\r
         "type": "set",\r
         "name": "set model-customization-uuid",\r
         "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",\r
         "comments": "",\r
-        "x": 605.5000152587891,\r
-        "y": 2907.1666078567505,\r
-        "z": "652cf04d.917e78",\r
+        "x": 570.5000152587891,\r
+        "y": 2920.419611930847,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8379176c.854518",\r
+        "id": "412ad16a.97e598",\r
         "type": "execute",\r
         "name": "split related-link",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1427.6903991699219,\r
-        "y": 3027.1517295837402,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1392.6903991699219,\r
+        "y": 3040.404733657837,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8b3ae97b.251a1",\r
+        "id": "824c58c6.f6519",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1213.3571014404297,\r
-        "y": 3073.8185176849365,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1178.3571014404297,\r
+        "y": 3087.071521759033,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "8379176c.854518",\r
-                "d417f4d3.21848",\r
-                "7176fd8c.2fbd64"\r
+                "412ad16a.97e598",\r
+                "62adf90d.0208a",\r
+                "8b5daaff.9a7c6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7176fd8c.2fbd64",\r
+        "id": "8b5daaff.9a7c6",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 1397.357063293457,\r
-        "y": 3117.1518144607544,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1362.357063293457,\r
+        "y": 3130.404818534851,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "87ffb6ef.f80298",\r
+        "id": "adba82bf.e3f3a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 785.0000953674316,\r
-        "y": 5557.628111839294,\r
-        "z": "652cf04d.917e78",\r
+        "x": 750.0000953674316,\r
+        "y": 5570.881115913391,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "bc615b55.663bf",\r
-                "54f75326.6021ac"\r
+                "12d3265f.5dba1a",\r
+                "9f1eceb5.e698c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54f75326.6021ac",\r
+        "id": "9f1eceb5.e698c",\r
         "type": "save",\r
         "name": "save generic-vnf availability-zone relationship",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1078.3334846496582,\r
-        "y": 5580.9615659713745,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1043.3334846496582,\r
+        "y": 5594.214570045471,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "43faed04.0b6094",\r
-                "82cc2525.32135"\r
+                "53715461.bc7134",\r
+                "6c10af82.f8022"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43faed04.0b6094",\r
+        "id": "53715461.bc7134",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1343.1667366027832,\r
-        "y": 5561.833388328552,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1308.1667366027832,\r
+        "y": 5575.086392402649,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "662f403a.490a78"\r
+                "6293928d.4f10b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "82cc2525.32135",\r
+        "id": "6c10af82.f8022",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1351.738166809082,\r
-        "y": 5606.119101524353,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1316.738166809082,\r
+        "y": 5619.37210559845,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "bf452558.9a9008"\r
+                "6db07962.51fbc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3672ff4.a17f",\r
+        "id": "6a48e0c.284292",\r
         "type": "set",\r
         "name": "set mapping rows to 0",\r
         "xml": "<set>\n<parameter name='db.vf-network-role-mapping_length' value='0' />\n",\r
         "comments": "",\r
-        "x": 1164.3094863891602,\r
-        "y": 3321.437578201294,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1129.3094863891602,\r
+        "y": 3334.6905822753906,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d350e16f.3e261",\r
+        "id": "d780c8df.23f2d",\r
         "type": "switchNode",\r
         "name": "switch AAI availability-zone_length",\r
         "xml": "<switch test='`$aai.cloud-region.availability-zones.availability-zone_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 525.7143821716309,\r
-        "y": 5461.437698364258,\r
-        "z": "652cf04d.917e78",\r
+        "x": 490.71438217163086,\r
+        "y": 5474.6907024383545,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c37c195.a21eb68"\r
+                "d8729b98.95027"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c37c195.a21eb68",\r
+        "id": "d8729b98.95027",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 744.2858009338379,\r
-        "y": 5461.009107589722,\r
-        "z": "652cf04d.917e78",\r
+        "x": 709.2858009338379,\r
+        "y": 5474.262111663818,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "8b2d772a.c6035"\r
+                "2f2de77d.f8076"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "609ae975.3eddb8",\r
+        "id": "31d3db7d.e44bd4",\r
         "type": "set",\r
         "name": "set availability-zone_length to 0",\r
         "xml": "<set>\n<parameter name='aai.cloud-region.availability-zones.availability-zone_length' value='0' />\n",\r
         "comments": "",\r
-        "x": 1345.714443206787,\r
-        "y": 5479.580345153809,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1310.714443206787,\r
+        "y": 5492.833349227905,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8b2d772a.c6035",\r
+        "id": "2f2de77d.f8076",\r
         "type": "switchNode",\r
         "name": "switch AZ max count > 0",\r
         "xml": "<switch test='`$db.vf-model.avail-zone-max-count &gt; 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 932.8572731018066,\r
-        "y": 5461.43741941452,\r
-        "z": "652cf04d.917e78",\r
+        "x": 897.8572731018066,\r
+        "y": 5474.690423488617,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "e3d0a053.f7b56",\r
-                "cc1abe7a.9fa1e8"\r
+                "bc335e49.ca576",\r
+                "4dbb85e4.b65d54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3d0a053.f7b56",\r
+        "id": "bc335e49.ca576",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1135.7143802642822,\r
-        "y": 5435.723169326782,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1100.7143802642822,\r
+        "y": 5448.976173400879,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "cf09642d.dcd6b"\r
+                "9c4ebd50.5f47c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc1abe7a.9fa1e8",\r
+        "id": "4dbb85e4.b65d54",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1137.1430015563965,\r
-        "y": 5480.008916854858,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1102.1430015563965,\r
+        "y": 5493.261920928955,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "609ae975.3eddb8"\r
+                "31d3db7d.e44bd4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b0ee28b4.7573a8",\r
+        "id": "b05338be.f1a848",\r
         "type": "execute",\r
         "name": "execute PropertiesNode",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 563.5357437133789,\r
-        "y": 240.4255886077881,\r
-        "z": "652cf04d.917e78",\r
+        "x": 528.5357437133789,\r
+        "y": 253.67859268188477,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "241fabfe.69fa2c",\r
+        "id": "52dafc17.f6736c",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 770.6190414428711,\r
-        "y": 1905.2470073699951,\r
-        "z": "652cf04d.917e78",\r
+        "x": 735.6190414428711,\r
+        "y": 1918.5000114440918,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "f0c5497d.1fa168"\r
+                "24abbaae.a59486"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15d4f6ac.d5e021",\r
+        "id": "80c67434.3bcca",\r
         "type": "switchNode",\r
         "name": "switch ecomp-naming",\r
         "xml": "<switch test='`$db.vf-model.ecomp-generated-naming`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1148.2384300231934,\r
-        "y": 1805.961443901062,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1113.2384300231934,\r
+        "y": 1819.2144479751587,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "711480e9.dbef28",\r
-                "2199667e.3808aa",\r
-                "eaee02d.8418f"\r
+                "befd2849.9672a8",\r
+                "3d767b69.f885a4",\r
+                "4c7fffc9.d01d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0c5497d.1fa168",\r
+        "id": "24abbaae.a59486",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 916.3335418701172,\r
-        "y": 1905.247124671936,\r
-        "z": "652cf04d.917e78",\r
+        "x": 881.3335418701172,\r
+        "y": 1918.5001287460327,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "15d4f6ac.d5e021",\r
-                "319f96a9.08ead2"\r
+                "80c67434.3bcca",\r
+                "20fbaa2f.336f4e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2199667e.3808aa",\r
+        "id": "3d767b69.f885a4",\r
         "type": "outcome",\r
         "name": "N",\r
         "xml": "<outcome value='N'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1334.6668167114258,\r
-        "y": 1806.4375705718994,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1299.6668167114258,\r
+        "y": 1819.690574645996,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ad1b7833.2d89a"\r
+                "75700df9.afdc2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "711480e9.dbef28",\r
+        "id": "befd2849.9672a8",\r
         "type": "outcome",\r
         "name": "Y",\r
         "xml": "<outcome value='Y'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1334.6668090820312,\r
-        "y": 1765.0090246200562,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1299.6668090820312,\r
+        "y": 1778.2620286941528,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "72fee52.6ade19c"\r
+                "73807db9.b39cd4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eaee02d.8418f",\r
+        "id": "4c7fffc9.d01d6",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1334.6667556762695,\r
-        "y": 1849.2947025299072,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1299.6667556762695,\r
+        "y": 1862.547706604004,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ad1b7833.2d89a"\r
+                "75700df9.afdc2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72fee52.6ade19c",\r
+        "id": "73807db9.b39cd4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1471.809726715088,\r
-        "y": 1765.151891708374,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1436.809726715088,\r
+        "y": 1778.4048957824707,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f80604c.1fec1f8",\r
+        "id": "7d58c1cc.73ce7",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 755.8097686767578,\r
-        "y": 2259.866183280945,\r
-        "z": "652cf04d.917e78",\r
+        "x": 720.8097686767578,\r
+        "y": 2273.1191873550415,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "1d97b077.4371"\r
+                "2c3bfc73.59862c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d97b077.4371",\r
+        "id": "2c3bfc73.59862c",\r
         "type": "set",\r
         "name": "set tmp.vnf-name",\r
         "xml": "<set>\n<parameter name='tmp.vnf-name' value=\"`$vnf-topology-operation-input.vnf-information.vnf-name`\" />\n",\r
         "comments": "",\r
-        "x": 921.5717315673828,\r
-        "y": 2258.7234535217285,\r
-        "z": "652cf04d.917e78",\r
+        "x": 886.5717315673828,\r
+        "y": 2271.976457595825,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2b8a3d28.12eada",\r
+        "id": "66cbf6f1.b54768",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:generate-unique-name",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1806.643009185791,\r
-        "y": 1955.0089440345764,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1771.643009185791,\r
+        "y": 1968.261948108673,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "59b40ce2.443a14",\r
-                "b8f390d9.9644b"\r
+                "f151915e.0725c8",\r
+                "1228e373.2d33f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59b40ce2.443a14",\r
+        "id": "f151915e.0725c8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2083.7858123779297,\r
-        "y": 1928.5804772377014,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2048.7858123779297,\r
+        "y": 1941.833481311798,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "841445e5.523fe"\r
+                "8993a315.cb4e88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b8f390d9.9644b",\r
+        "id": "1228e373.2d33f5",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2088.5475578308105,\r
-        "y": 1973.9613881111145,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2053.5475578308105,\r
+        "y": 1987.2143921852112,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c9312147.c268c8"\r
+                "e8d7ccba.64afc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cdd8e1f0.243448",\r
+        "id": "92724c8a.47d3",\r
         "type": "set",\r
         "name": "set variables for generating unique name",\r
         "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",\r
         "comments": "",\r
-        "x": 1761.6432609558105,\r
-        "y": 1906.1042637825012,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1726.6432609558105,\r
+        "y": 1919.357267856598,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9312147.c268c8",\r
+        "id": "e8d7ccba.64afc8",\r
         "type": "set",\r
         "name": "set tmp.vnf-name to generated name",\r
         "xml": "<set>\n<parameter name='tmp.vnf-name' value='`$generate-unique-name-output.generated-name`' />\n",\r
         "comments": "",\r
-        "x": 2311.4519538879395,\r
-        "y": 1973.4374632835388,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2276.4519538879395,\r
+        "y": 1986.6904673576355,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "319f96a9.08ead2",\r
+        "id": "20fbaa2f.336f4e",\r
         "type": "switchNode",\r
         "name": "switch naming-policy",\r
         "xml": "<switch test='`$db.vf-model.naming-policy`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1146.024013519287,\r
-        "y": 2014.2470607757568,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1111.024013519287,\r
+        "y": 2027.5000648498535,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "8a5a017e.752c18",\r
-                "a132177.4ea1768"\r
+                "9d83806b.62f038",\r
+                "8fa1b1d0.fbecf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8a5a017e.752c18",\r
+        "id": "9d83806b.62f038",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1336.0239448547363,\r
-        "y": 1935.675615310669,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1301.0239448547363,\r
+        "y": 1948.9286193847656,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "bffcbc52.3223c"\r
+                "3d12e035.00bfc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a132177.4ea1768",\r
+        "id": "8fa1b1d0.fbecf8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1336.2621841430664,\r
-        "y": 2063.056559562683,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1301.2621841430664,\r
+        "y": 2076.30956363678,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "a0656517.5bca38"\r
+                "e2becadc.fd296"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bffcbc52.3223c",\r
+        "id": "3d12e035.00bfc8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1488.8812141418457,\r
-        "y": 1934.2470817565918,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1453.8812141418457,\r
+        "y": 1947.5000858306885,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "cdd8e1f0.243448",\r
-                "2b8a3d28.12eada"\r
+                "92724c8a.47d3",\r
+                "66cbf6f1.b54768"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7998869c.3c0bd",\r
+        "id": "47c613e1.e72334",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:naming-policy-generate-name",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1827.9291381835938,\r
-        "y": 2078.770941257477,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1792.9291381835938,\r
+        "y": 2092.0239453315735,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "57af4cbf.e1b474",\r
-                "d28171a6.a4093"\r
+                "1b457d52.c65d7b",\r
+                "eb015d86.9668b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a0656517.5bca38",\r
+        "id": "e2becadc.fd296",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1490.786033630371,\r
-        "y": 2063.056559562683,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1455.786033630371,\r
+        "y": 2076.30956363678,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "db8c85e7.7b71c8",\r
-                "7998869c.3c0bd"\r
+                "aa15df09.7a7e5",\r
+                "47c613e1.e72334"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db8c85e7.7b71c8",\r
+        "id": "aa15df09.7a7e5",\r
         "type": "set",\r
         "name": "set variables for generating name",\r
         "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`' />",\r
         "comments": "",\r
-        "x": 1737.929054260254,\r
-        "y": 2033.05659532547,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1702.929054260254,\r
+        "y": 2046.3095993995667,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b52c81d4.1a1f08",\r
+        "id": "388c672c.281b68",\r
         "type": "set",\r
         "name": "set tmp.vnf-name to generated name",\r
         "xml": "<set>\n<parameter name='tmp.vnf-name' value='`$naming-policy-generate-name-output.vnf-name`' />\n",\r
         "comments": "",\r
-        "x": 2387.7861099243164,\r
-        "y": 2098.770751953125,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2352.7861099243164,\r
+        "y": 2112.0237560272217,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e74586be.b8e6f8",\r
+        "id": "fe30a9c6.049198",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1954.0475997924805,\r
-        "y": 6545.819259643555,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1919.0475997924805,\r
+        "y": 6559.072263717651,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "fcbc941a.75b4b8",\r
-                "5e0caa6d.e903f4",\r
-                "fef2b74e.207f2",\r
-                "ae834aa6.55d6c"\r
+                "7af5e0af.8b4d6",\r
+                "fcd8b4d3.ba6f18",\r
+                "574c5265.459624",\r
+                "6358f1ef.44078"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "57af4cbf.e1b474",\r
+        "id": "1b457d52.c65d7b",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2126.095184326172,\r
-        "y": 2053.6994485855103,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2091.095184326172,\r
+        "y": 2066.952452659607,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "95c2eab0.a4313"\r
+                "f2317901.0924b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d28171a6.a4093",\r
+        "id": "eb015d86.9668b8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2130.8569297790527,\r
-        "y": 2099.0803594589233,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2095.8569297790527,\r
+        "y": 2112.33336353302,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "b52c81d4.1a1f08"\r
+                "388c672c.281b68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1677d157.c65a77",\r
+        "id": "45352996.bfa54",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 781.3332824707031,\r
-        "y": 1408.666666984558,\r
-        "z": "652cf04d.917e78",\r
+        "x": 746.3332824707031,\r
+        "y": 1421.9196710586548,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "e4f063d3.c2f668",\r
-                "d72cd4af.95669"\r
+                "de5d4aa6.20d26",\r
+                "c53dd783.637e6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93239a74.eab46",\r
+        "id": "e4a614d.2b0f1e8",\r
         "type": "for",\r
         "name": "for each instance group id",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 564.6666297912598,\r
-        "y": 1409.333312034607,\r
-        "z": "652cf04d.917e78",\r
+        "x": 529.6666297912598,\r
+        "y": 1422.5863161087036,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "1677d157.c65a77"\r
+                "45352996.bfa54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e4f063d3.c2f668",\r
+        "id": "de5d4aa6.20d26",\r
         "type": "get-resource",\r
         "name": "get-resource instance-group",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1009.3333206176758,\r
-        "y": 1340.3334255218506,\r
-        "z": "652cf04d.917e78",\r
+        "x": 974.3333206176758,\r
+        "y": 1353.5864295959473,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "2d4e4bf5.37f93c",\r
-                "27b813e1.4ee81c"\r
+                "b24bd114.d8ff3",\r
+                "a6647c71.e5f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27b813e1.4ee81c",\r
+        "id": "a6647c71.e5f9",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1226.912612915039,\r
-        "y": 1371.8174781799316,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1191.912612915039,\r
+        "y": 1385.0704822540283,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "4e3d9218.a643dc"\r
+                "46fc6653.09995"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d4e4bf5.37f93c",\r
+        "id": "b24bd114.d8ff3",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1235.8414459228516,\r
-        "y": 1308.4366302490234,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1200.8414459228516,\r
+        "y": 1321.6896343231201,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "961d4497.b1f5b"\r
+                "7b566e9a.02ffe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d72cd4af.95669",\r
+        "id": "c53dd783.637e6",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for index='rel-index' start='0' end='`$aai.instance-group.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 986.3332977294922,\r
-        "y": 1480.3333644866943,\r
-        "z": "652cf04d.917e78",\r
+        "x": 951.3332977294922,\r
+        "y": 1493.586368560791,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "b3fe8ef5.7f7b08"\r
+                "992c473e.dcde48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3fe8ef5.7f7b08",\r
+        "id": "992c473e.dcde48",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$aai.instance-group.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1199.6667404174805,\r
-        "y": 1480.333303451538,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1164.6667404174805,\r
+        "y": 1493.5863075256348,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "6c3837b.20f1348"\r
+                "9474d3b2.f2f408"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c3837b.20f1348",\r
+        "id": "9474d3b2.f2f408",\r
         "type": "outcome",\r
         "name": "collection",\r
         "xml": "<outcome value='collection'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1371.3333778381348,\r
-        "y": 1480.3333854675293,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1336.3333778381348,\r
+        "y": 1493.586389541626,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "d9f8f3cd.64b7b8"\r
+                "9ec9a27e.af20a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d9f8f3cd.64b7b8",\r
+        "id": "9ec9a27e.af20a8",\r
         "type": "get-resource",\r
         "name": "get-resource collection",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1591.3332824707031,\r
-        "y": 1478.6666469573975,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1556.3332824707031,\r
+        "y": 1491.9196510314941,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "f170a79a.1b1ac",\r
-                "9189a100.b52d78",\r
-                "e1621aae.8a7778"\r
+                "6afa0da9.883b94",\r
+                "c7b84394.fef178",\r
+                "97a3f465.07e9e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9189a100.b52d78",\r
+        "id": "c7b84394.fef178",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1805.579475402832,\r
-        "y": 1430.1508359909058,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1770.579475402832,\r
+        "y": 1443.4038400650024,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "966a3052.be8b78"\r
+                "61ef806e.0df108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f170a79a.1b1ac",\r
+        "id": "6afa0da9.883b94",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1814.508071899414,\r
-        "y": 1388.4365692138672,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1779.508071899414,\r
+        "y": 1401.6895732879639,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "e5dc44b5.d3f17"\r
+                "716a6bd7.84c124"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1621aae.8a7778",\r
+        "id": "97a3f465.07e9e8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1824.666790008545,\r
-        "y": 1591.9999542236328,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1789.666790008545,\r
+        "y": 1605.2529582977295,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "23c6675b.1dfc4"\r
+                "47a63afa.594c84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23c6675b.1dfc4",\r
+        "id": "47a63afa.594c84",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1977.9999313354492,\r
-        "y": 1591.3332500457764,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1942.9999313354492,\r
+        "y": 1604.586254119873,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "9e02f3b5.206e98",\r
-                "8992318d.0d7de",\r
-                "748a871e.ccc29",\r
-                "22797e19.563542",\r
-                "1a7acef5.2220b1"\r
+                "fc8d9768.f53038",\r
+                "3e08b9aa.83f4fe",\r
+                "a229c3f8.cee178",\r
+                "5c88403d.8f70c",\r
+                "b9100950.4719b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e02f3b5.206e98",\r
+        "id": "fc8d9768.f53038",\r
         "type": "for",\r
         "name": "for each network-instance-group",\r
         "xml": "<for silentFailure='true' index='nig-index' start='0' end='`$service-data.network-instance-groups.network-instance-group_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2290.619071960449,\r
-        "y": 1540.5715045928955,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2255.619071960449,\r
+        "y": 1553.8245086669922,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ff455704.dd71a8"\r
+                "f598f42.cc12d88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8992318d.0d7de",\r
+        "id": "3e08b9aa.83f4fe",\r
         "type": "set",\r
         "name": "set found-network-instance-group to false",\r
         "xml": "<set>\n<parameter name='found-network-instance-group' value='false' />\n",\r
         "comments": "",\r
-        "x": 2320.6190338134766,\r
-        "y": 1493.9048767089844,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2285.6190338134766,\r
+        "y": 1507.157880783081,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ff455704.dd71a8",\r
+        "id": "f598f42.cc12d88",\r
         "type": "switchNode",\r
         "name": "network-instance-group-id matches?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2607.2855834960938,\r
-        "y": 1540.5715036392212,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2572.2855834960938,\r
+        "y": 1553.8245077133179,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "add4fb90.7b64c"\r
+                "1e6ccb0d.3ab915"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "add4fb90.7b64c",\r
+        "id": "1e6ccb0d.3ab915",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2828.952362060547,\r
-        "y": 1540.5714683532715,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2793.952362060547,\r
+        "y": 1553.8244724273682,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c85d2956.aba338"\r
+                "af6921dc.843bf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c85d2956.aba338",\r
+        "id": "af6921dc.843bf8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2958.952392578125,\r
-        "y": 1540.5715446472168,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2923.952392578125,\r
+        "y": 1553.8245487213135,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "40850f47.7a7e78",\r
-                "52b6fff4.bf5a48"\r
+                "99fc5b9.3b391a8",\r
+                "8ddc955c.4fd378"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40850f47.7a7e78",\r
+        "id": "99fc5b9.3b391a8",\r
         "type": "set",\r
         "name": "set found-network-instance-group to true",\r
         "xml": "<set>\n<parameter name='found-network-instance-group' value='true' />\n",\r
         "comments": "",\r
-        "x": 3232.285758972168,\r
-        "y": 1515.5715236663818,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3197.285758972168,\r
+        "y": 1528.8245277404785,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "52b6fff4.bf5a48",\r
+        "id": "8ddc955c.4fd378",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 3125.619373321533,\r
-        "y": 1563.904893875122,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3090.619373321533,\r
+        "y": 1577.1578979492188,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "748a871e.ccc29",\r
+        "id": "a229c3f8.cee178",\r
         "type": "switchNode",\r
         "name": "switch found-network-instance-group",\r
         "xml": "<switch test='`$found-network-instance-group`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2302.285690307617,\r
-        "y": 1590.5714855194092,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2267.285690307617,\r
+        "y": 1603.8244895935059,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "88c71dfb.666f4"\r
+                "69302a2b.72ec7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88c71dfb.666f4",\r
+        "id": "69302a2b.72ec7c",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2523.952537536621,\r
-        "y": 1590.5715079307556,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2488.952537536621,\r
+        "y": 1603.8245120048523,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "19fba1ff.3d7996"\r
+                "8e578fe.a90fc7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a88c2f3d.bf4fa8",\r
+        "id": "ce494650.e8a068",\r
         "type": "set",\r
         "name": "set tmp.vnf-network-collection_length to 0",\r
         "xml": "<set>\n<parameter name='tmp.vnf-network-collection_length' value='0' />\n",\r
         "comments": "",\r
-        "x": 612.9999694824219,\r
-        "y": 1360.3334436416626,\r
-        "z": "652cf04d.917e78",\r
+        "x": 577.9999694824219,\r
+        "y": 1373.5864477157593,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "22797e19.563542",\r
+        "id": "5c88403d.8f70c",\r
         "type": "set",\r
         "name": "set vnf-network-collection data",\r
         "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",\r
         "comments": "",\r
-        "x": 2282.2860145568848,\r
-        "y": 1638.904821395874,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2247.2860145568848,\r
+        "y": 1652.1578254699707,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1a7acef5.2220b1",\r
+        "id": "b9100950.4719b",\r
         "type": "set",\r
         "name": "increment tmp.vnf-network-collection_length",\r
         "xml": "<set>\n<parameter name='tmp.vnf-network-collection_length' value='`$tmp.vnf-network-collection_length + 1`' />\n",\r
         "comments": "",\r
-        "x": 2323.95272064209,\r
-        "y": 1685.5714893341064,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2288.95272064209,\r
+        "y": 1698.8244934082031,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3e36f71.f2f0b88",\r
+        "id": "42a167cf.392ce",\r
         "type": "set",\r
         "name": "set vnf-network-collection_length",\r
         "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",\r
         "comments": "",\r
-        "x": 592.1666641235352,\r
-        "y": 1617.8333930969238,\r
-        "z": "652cf04d.917e78",\r
+        "x": 557.1666641235352,\r
+        "y": 1631.0863971710205,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e06d5a1.039e24",\r
+        "id": "e2a99281.564c38",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 710.0000457763672,\r
-        "y": 5950.80961894989,\r
-        "z": "652cf04d.917e78",\r
+        "x": 675.0000457763672,\r
+        "y": 5964.062623023987,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "15f88503.d536cb"\r
+                "d6f181ce.7c619"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3a3b6d8.b3b1a",\r
+        "id": "f94face8.c5b278",\r
         "type": "for",\r
         "name": "for each instance group id",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 493.3333930969238,\r
-        "y": 5951.476263999939,\r
-        "z": "652cf04d.917e78",\r
+        "x": 458.3333930969238,\r
+        "y": 5964.729268074036,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "6e06d5a1.039e24"\r
+                "e2a99281.564c38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15f88503.d536cb",\r
+        "id": "d6f181ce.7c619",\r
         "type": "save",\r
         "name": "save generic-vnf relationship to instance-group",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 993.3333740234375,\r
-        "y": 5950.333299636841,\r
-        "z": "652cf04d.917e78",\r
+        "x": 958.3333740234375,\r
+        "y": 5963.5863037109375,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ab9ecf4.f4a9ab",\r
-                "7760b70d.6ce06"\r
+                "4be229a4.6bace8",\r
+                "6d8aaab7.01cacc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab9ecf4.f4a9ab",\r
+        "id": "4be229a4.6bace8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1252.6905975341797,\r
-        "y": 5927.285715103149,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1217.6905975341797,\r
+        "y": 5940.538719177246,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "1ce1d0e3.b09f8f"\r
+                "df50542d.c5f3b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7760b70d.6ce06",\r
+        "id": "6d8aaab7.01cacc",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1261.2620277404785,\r
-        "y": 5971.57142829895,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1226.2620277404785,\r
+        "y": 5984.824432373047,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "85592822.f54ce"\r
+                "1108a556.80c593"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5621d64.66c8228",\r
+        "id": "441a09f7.0fe6e8",\r
         "type": "switchNode",\r
         "name": "switch subnet_length",\r
         "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1314.9047927856445,\r
-        "y": 4383.428667068481,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1279.9047927856445,\r
+        "y": 4396.681671142578,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "590fbfa.56ffd4",\r
-                "55fd7e77.380188",\r
-                "5c002b3b.bf14dc"\r
+                "74592fe8.651",\r
+                "2e10a2f1.6aa266",\r
+                "be4baf78.88dfd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "590fbfa.56ffd4",\r
+        "id": "74592fe8.651",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1487.7619552612305,\r
-        "y": 4346.285726547241,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1452.7619552612305,\r
+        "y": 4359.538730621338,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c908a6ad.557b18"\r
+                "100a9f4a.252ff9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55fd7e77.380188",\r
+        "id": "2e10a2f1.6aa266",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1489.1905250549316,\r
-        "y": 4384.856889724731,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1454.1905250549316,\r
+        "y": 4398.109893798828,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c908a6ad.557b18"\r
+                "100a9f4a.252ff9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c002b3b.bf14dc",\r
+        "id": "be4baf78.88dfd",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1487.7619895935059,\r
-        "y": 4423.428281784058,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1452.7619895935059,\r
+        "y": 4436.681285858154,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "42d5e987.8ca46"\r
+                "189f5e1c.6f1062"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42d5e987.8ca46",\r
+        "id": "189f5e1c.6f1062",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1609.190544128418,\r
-        "y": 4423.428548812866,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1574.190544128418,\r
+        "y": 4436.681552886963,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "5bf4954f.7a431c",\r
-                "48890473.4cc4e4"\r
+                "13a2f07f.5d3d1",\r
+                "af0595f.ee72a68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c908a6ad.557b18",\r
+        "id": "100a9f4a.252ff9",\r
         "type": "set",\r
         "name": "set subnet_length to 0",\r
         "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",\r
         "comments": "",\r
-        "x": 1680.6191482543945,\r
-        "y": 4354.856889724731,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1645.6191482543945,\r
+        "y": 4368.109893798828,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "525bcd69.d52c4c",\r
+        "id": "bf83b00.ffd5dd",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 298.0793991088867,\r
-        "y": 420.11908626556396,\r
-        "z": "652cf04d.917e78",\r
+        "x": 263.0793991088867,\r
+        "y": 433.37209033966064,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "b0ee28b4.7573a8",\r
-                "65b55bf0.e17c94",\r
-                "c29453e1.d0b3d8",\r
-                "3f69e8e3.cf5be8",\r
-                "819ca24a.f2412",\r
-                "4ce50465.9ccc0c",\r
-                "5369940c.e48364"\r
+                "b05338be.f1a848",\r
+                "d8bf5428.1ff1",\r
+                "c4069bd9.1face",\r
+                "77593791.068cb",\r
+                "cfb0be93.de4aa8",\r
+                "5f72fb15.e2e8f4",\r
+                "7e13039d.149664",\r
+                "caa8d84a.f0775"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cefc1963.652428",\r
+        "id": "9e9b89f7.9bdbf",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1950.3810005187988,\r
-        "y": 4402.032744407654,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1915.3810005187988,\r
+        "y": 4415.2857484817505,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "bfb8729.d25369",\r
-                "1546bd44.dac763",\r
-                "c11ff570.face3",\r
-                "b2dc37a2.39945"\r
+                "27478f81.0dd9e",\r
+                "8b199eff.6505a8",\r
+                "221ad9cb.af5a46",\r
+                "436d4bc.d154434"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "680457ce.355c7",\r
+        "id": "125c5567.a44893",\r
         "type": "set",\r
         "name": "clear aai.l3-network",\r
         "xml": "<set>\n<parameter name='aai.l3-network.' value='' />\n",\r
         "comments": "",\r
-        "x": 1301.8095703125,\r
-        "y": 3456.3182973861694,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1266.8095703125,\r
+        "y": 3469.571301460266,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "54222992.1960d8",\r
+        "id": "6ea80d98.19177c",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 3750.6663818359375,\r
-        "y": 4302.032426834106,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3715.6663818359375,\r
+        "y": 4315.285430908203,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "16ed0d4.c25bbf3",\r
+        "id": "60ffa0a.88fbae",\r
         "type": "set",\r
         "name": "set found-network to false",\r
         "xml": "<set>\n<parameter name='found-network' value='false' />\n",\r
         "comments": "",\r
-        "x": 1450.380973815918,\r
-        "y": 4007.7468309402466,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1415.380973815918,\r
+        "y": 4020.9998350143433,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e8b88764.0e454",\r
+        "id": "ebfe35e9.d51238",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2422.0952796936035,\r
-        "y": 4162.032627105713,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2387.0952796936035,\r
+        "y": 4175.28563117981,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "81eba499.0af278",\r
-                "8cc5b790.718ca"\r
+                "48ea8c97.939764",\r
+                "e9ad3c1f.8ebed"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8cc5b790.718ca",\r
+        "id": "e9ad3c1f.8ebed",\r
         "type": "switchNode",\r
         "name": "switch found-network",\r
         "xml": "<switch test='`$found-network`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2613.523826599121,\r
-        "y": 4192.032681465149,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2578.523826599121,\r
+        "y": 4205.285685539246,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "8e56c1e2.9c47b"\r
+                "2df9a3e.c617b5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5189f56d.e57b74",\r
+        "id": "f903bb12.78282",\r
         "type": "set",\r
         "name": "set found-network to true",\r
         "xml": "<set>\n<parameter name='found-network' value='true' />\n",\r
         "comments": "",\r
-        "x": 3806.381259918213,\r
-        "y": 4256.3181076049805,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3771.381259918213,\r
+        "y": 4269.571111679077,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8e56c1e2.9c47b",\r
+        "id": "2df9a3e.c617b5c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2782.095317840576,\r
-        "y": 4192.0326108932495,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2747.095317840576,\r
+        "y": 4205.285614967346,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "56545bb.806fe24"\r
+                "7ff93171.83a9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56545bb.806fe24",\r
+        "id": "7ff93171.83a9c",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 2912.095386505127,\r
-        "y": 4190.604004859924,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2877.095386505127,\r
+        "y": 4203.857008934021,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "852f0b12.336648",\r
+        "id": "614c8409.56f694",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1622.3809967041016,\r
-        "y": 4135.746905326843,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1587.3809967041016,\r
+        "y": 4148.99990940094,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "b772b2db.6bf188",\r
-                "aaa6bab8.ec80f"\r
+                "387ea551.d97d92",\r
+                "abe39a5e.75319"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aaa6bab8.ec80f",\r
+        "id": "abe39a5e.75319",\r
         "type": "switchNode",\r
         "name": "switch found-network",\r
         "xml": "<switch test='`$found-network`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1832.3809509277344,\r
-        "y": 4207.746788978577,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1797.3809509277344,\r
+        "y": 4220.999793052673,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ae15eed2.e4fa88"\r
+                "4c383345.aa66a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae15eed2.e4fa88",\r
+        "id": "4c383345.aa66a4",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2000.9524421691895,\r
-        "y": 4207.746718406677,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1965.9524421691895,\r
+        "y": 4220.999722480774,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "290a5acd.b811fe"\r
+                "ce5f59f.7f086a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "290a5acd.b811fe",\r
+        "id": "ce5f59f.7f086a8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 2130.9525108337402,\r
-        "y": 4206.318112373352,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2095.9525108337402,\r
+        "y": 4219.571116447449,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c11ff570.face3",\r
+        "id": "221ad9cb.af5a46",\r
         "type": "set",\r
         "name": "set subnet data",\r
         "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",\r
         "comments": "",\r
-        "x": 2104.6667671203613,\r
-        "y": 4432.714490890503,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2069.6667671203613,\r
+        "y": 4445.9674949646,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b2dc37a2.39945",\r
+        "id": "436d4bc.d154434",\r
         "type": "switchNode",\r
         "name": "switch dhcp-enabled",\r
         "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].dhcp-enabled`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2119.1905479431152,\r
-        "y": 4485.557444572449,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2084.1905479431152,\r
+        "y": 4498.810448646545,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "cd2523f4.0b1db8",\r
-                "2a325c94.48677c"\r
+                "d5f84fa.0e1b6b",\r
+                "a9a99866.3c80c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd2523f4.0b1db8",\r
+        "id": "d5f84fa.0e1b6b",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2282.047712598528,\r
-        "y": 4464.1288022994995,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2247.047712598528,\r
+        "y": 4477.381806373596,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "5385445e.1587b4"\r
+                "e9f0968.3130768"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a325c94.48677c",\r
+        "id": "a9a99866.3c80c8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2280.6190452575684,\r
-        "y": 4509.843228340149,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2245.6190452575684,\r
+        "y": 4523.096232414246,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "83b7359e.e55738"\r
+                "97ff2f93.5af418"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5385445e.1587b4",\r
+        "id": "e9f0968.3130768",\r
         "type": "set",\r
         "name": "set dhcp-enabled to Y",\r
         "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",\r
         "comments": "",\r
-        "x": 2454.9049110412598,\r
-        "y": 4462.700198173523,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2419.9049110412598,\r
+        "y": 4475.95320224762,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "83b7359e.e55738",\r
+        "id": "97ff2f93.5af418",\r
         "type": "set",\r
         "name": "set dhcp-enabled to N",\r
         "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",\r
         "comments": "",\r
-        "x": 2452.047679901123,\r
-        "y": 4509.843228340149,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2417.047679901123,\r
+        "y": 4523.096232414246,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bfb8729.d25369",\r
+        "id": "27478f81.0dd9e",\r
         "type": "switchNode",\r
         "name": "switch subnet-role",\r
         "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2119.666717529297,\r
-        "y": 4314.605116844177,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2084.666717529297,\r
+        "y": 4327.858120918274,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "b3461715.a1c54"\r
+                "bb5883df.25b6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3461715.a1c54",\r
+        "id": "bb5883df.25b6c",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2286.333320617676,\r
-        "y": 4314.604768753052,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2251.333320617676,\r
+        "y": 4327.857772827148,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "3b809c11.157b54"\r
+                "54f77f42.c0543"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b809c11.157b54",\r
+        "id": "54f77f42.c0543",\r
         "type": "set",\r
         "name": "set subnet-role to NONE",\r
         "xml": "<set>\n<parameter name='aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].subnet-role' value='NONE' />\n",\r
         "comments": "",\r
-        "x": 2468.0001068115234,\r
-        "y": 4313.93842124939,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2433.0001068115234,\r
+        "y": 4327.191425323486,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1546bd44.dac763",\r
+        "id": "8b199eff.6505a8",\r
         "type": "switchNode",\r
         "name": "switch ip-version",\r
         "xml": "<switch test='`$aai.l3-network.l3-network[$db-network-index].subnets.subnet[$subnet-index].ip-version`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2114.9050521850586,\r
-        "y": 4379.096222877502,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2079.9050521850586,\r
+        "y": 4392.349226951599,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "d33d7dba.02ad08",\r
-                "9e9034a9.798778"\r
+                "eacc43b8.98473",\r
+                "dddbd62a.34648"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d33d7dba.02ad08",\r
+        "id": "eacc43b8.98473",\r
         "type": "outcome",\r
         "name": "4",\r
         "xml": "<outcome value='4'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2280.6191940307617,\r
-        "y": 4360.524620056152,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2245.6191940307617,\r
+        "y": 4373.777624130249,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "b8e9d995.95c2a8"\r
+                "9599a2f4.865eb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e9034a9.798778",\r
+        "id": "dddbd62a.34648",\r
         "type": "outcome",\r
         "name": "6",\r
         "xml": "<outcome value='6'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2280.619155883789,\r
-        "y": 4401.953363418579,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2245.619155883789,\r
+        "y": 4415.206367492676,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "6716e11d.548a3"\r
+                "a3d9012f.d50af"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b8e9d995.95c2a8",\r
+        "id": "9599a2f4.865eb8",\r
         "type": "set",\r
         "name": "set tmp.ip-version to ipv4",\r
         "xml": "<set>\n<parameter name='tmp.ip-version' value='ipv4' />\n",\r
         "comments": "",\r
-        "x": 2467.7619590759277,\r
-        "y": 4359.667547225952,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2432.7619590759277,\r
+        "y": 4372.920551300049,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6716e11d.548a3",\r
+        "id": "a3d9012f.d50af",\r
         "type": "set",\r
         "name": "set tmp.ip-version to ipv6",\r
         "xml": "<set>\n<parameter name='tmp.ip-version' value='ipv6' />\n",\r
         "comments": "",\r
-        "x": 2466.333511352539,\r
-        "y": 4401.953365325928,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2431.333511352539,\r
+        "y": 4415.206369400024,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f73eb405.e256b8",\r
+        "id": "83a5f952.36e31",\r
         "type": "switchNode",\r
         "name": "switch network-role",\r
         "xml": "<switch test='`$db.vf-network-role-mapping[$role-index].network-role`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 747.3332443237305,\r
-        "y": 4387.333273887634,\r
-        "z": "652cf04d.917e78",\r
+        "x": 712.3332443237305,\r
+        "y": 4400.586277961731,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "a1e4bd7f.d5ea9",\r
-                "a8f001ac.33558",\r
-                "7a9134fc.396d14",\r
-                "39a7a020.ba1f58"\r
+                "785a1f35.a43408",\r
+                "3d7e83e8.a71994",\r
+                "67ddcd30.ef6e14",\r
+                "47ca43a8.5c2a5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1e4bd7f.d5ea9",\r
+        "id": "785a1f35.a43408",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 915.4285087585449,\r
-        "y": 4285.66668510437,\r
-        "z": "652cf04d.917e78",\r
+        "x": 880.4285087585449,\r
+        "y": 4298.919689178467,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c630c62f.2e4b88"\r
+                "1a917aea.74fb6d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8f001ac.33558",\r
+        "id": "3d7e83e8.a71994",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 913.999885559082,\r
-        "y": 4413.999873161316,\r
-        "z": "652cf04d.917e78",\r
+        "x": 878.999885559082,\r
+        "y": 4427.252877235413,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "febef76b.d8c79"\r
+                "c302bb2b.5f6d08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c630c62f.2e4b88",\r
+        "id": "1a917aea.74fb6d",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1052.8095169067383,\r
-        "y": 4325.42826461792,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1017.8095169067383,\r
+        "y": 4338.681268692017,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f1e14dbb.a2c47",\r
+        "id": "f38e05b8.78f318",\r
         "type": "get-resource",\r
         "name": "get-resource VNF_RELATED_NETWORK_ROLE",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1409.333339691162,\r
-        "y": 4717.079788208008,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1374.333339691162,\r
+        "y": 4730.3327922821045,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "3772719.a8f170e",\r
-                "3270a935.e0fa9e"\r
+                "3f948b0e.690e64",\r
+                "e998b851.1c7048"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3772719.a8f170e",\r
+        "id": "3f948b0e.690e64",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1678.0000038146973,\r
-        "y": 4547.746629714966,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1643.0000038146973,\r
+        "y": 4560.9996337890625,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "aac9396.609d348"\r
+                "62e01756.b02ec8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3270a935.e0fa9e",\r
+        "id": "e998b851.1c7048",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1681.0000343322754,\r
-        "y": 4910.41314125061,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1646.0000343322754,\r
+        "y": 4923.666145324707,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "bec6dac4.be5be"\r
+                "413c86fa.9792c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bec6dac4.be5be",\r
+        "id": "413c86fa.9792c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1847.333339691162,\r
-        "y": 4908.412796020508,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1812.333339691162,\r
+        "y": 4921.6658000946045,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "70df31da.fe5458",\r
-                "10dd5c97.f83c3b",\r
-                "93b3be63.c398e",\r
-                "8d286d93.2f6ff",\r
-                "ad5b3ac9.e19098",\r
-                "8ca661f6.f5d5f8",\r
-                "d71dcbd8.8dc7f",\r
-                "32376f69.700f08",\r
-                "96681242.82e6c"\r
+                "f6a89539.411ba8",\r
+                "197488cf.5f2577",\r
+                "30161879.c0da28",\r
+                "95e1983d.defa7",\r
+                "885fafcd.073ea",\r
+                "d639c6e8.5989d",\r
+                "aa946eba.37b0e",\r
+                "d24fdba9.53c6",\r
+                "e48d6b1e.9814e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29d3dc98.16bcd4",\r
+        "id": "9d09f6f3.62b358",\r
         "type": "outcome",\r
         "name": "service-instance",\r
         "xml": "<outcome value='service-instance'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2785.618808746338,\r
-        "y": 4080.651467323303,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2750.618808746338,\r
+        "y": 4093.9044713974,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "4ccf1527.e6d86c"\r
+                "deec3bbc.f5b66"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ccf1527.e6d86c",\r
+        "id": "deec3bbc.f5b66",\r
         "type": "for",\r
         "name": "for each relationship data",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3011.0946464538574,\r
-        "y": 4081.0800971984863,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2976.0946464538574,\r
+        "y": 4094.333101272583,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "7aafe2ec.322514"\r
+                "c800e855.3f04b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7aafe2ec.322514",\r
+        "id": "c800e855.3f04b",\r
         "type": "switchNode",\r
         "name": "switch relationship-key",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3246.3332176208496,\r
-        "y": 4079.413528442383,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3211.3332176208496,\r
+        "y": 4092.6665325164795,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "9d6550c4.3622f8"\r
+                "995bbfc.ce0f9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d6550c4.3622f8",\r
+        "id": "995bbfc.ce0f9c",\r
         "type": "outcome",\r
         "name": "service-instance.service-instance-id",\r
         "xml": "<outcome value='service-instance.service-instance-id'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3512.761577606201,\r
-        "y": 4079.413592338562,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3477.761577606201,\r
+        "y": 4092.6665964126587,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "7003f69f.877238"\r
+                "26694f48.9bd148"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7003f69f.877238",\r
+        "id": "26694f48.9bd148",\r
         "type": "set",\r
         "name": "set network-service-instance-id",\r
         "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",\r
         "comments": "",\r
-        "x": 3806.3333625793457,\r
-        "y": 4077.747007369995,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3771.3333625793457,\r
+        "y": 4091.000011444092,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "70df31da.fe5458",\r
+        "id": "f6a89539.411ba8",\r
         "type": "execute",\r
         "name": "generate network-topology-identifier-structure url",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2166.6665077209473,\r
-        "y": 4604.080429077148,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2131.6665077209473,\r
+        "y": 4617.333433151245,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "93b3be63.c398e",\r
+        "id": "30161879.c0da28",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode - get network-topology-identifier-structure",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2223.666301727295,\r
-        "y": 4707.509169578552,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2188.666301727295,\r
+        "y": 4720.762173652649,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ad3ea158.a938e8"\r
+                "f550e672.9125f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "10dd5c97.f83c3b",\r
+        "id": "197488cf.5f2577",\r
         "type": "execute",\r
         "name": "generate network-topology-identifier-structure url (part 2)",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2188.333095550537,\r
-        "y": 4647.413772583008,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2153.333095550537,\r
+        "y": 4660.6667766571045,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "aac69396.6ddb18",\r
+        "id": "a5911152.d7aeb",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bgb-vnfa.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 493.6667137145996,\r
-        "y": 4554.079788208008,\r
-        "z": "652cf04d.917e78",\r
+        "x": 458.6667137145996,\r
+        "y": 4567.3327922821045,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ad3ea158.a938e8",\r
+        "id": "f550e672.9125f8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2552.775489807129,\r
-        "y": 4707.259647369385,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2517.775489807129,\r
+        "y": 4720.512651443481,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "3ecadd51.2a79da"\r
+                "5682a799.32827"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d286d93.2f6ff",\r
+        "id": "95e1983d.defa7",\r
         "type": "set",\r
         "name": "set is-trunked and segmentation-id in vnf-network",\r
         "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    ",\r
         "comments": "",\r
-        "x": 2166.333324432373,\r
-        "y": 4767.746793746948,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2131.333324432373,\r
+        "y": 4780.999797821045,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8ca661f6.f5d5f8",\r
+        "id": "d639c6e8.5989d",\r
         "type": "save",\r
         "name": "custom query: get owning entity",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2107.3332176208496,\r
-        "y": 4843.080276489258,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2072.3332176208496,\r
+        "y": 4856.3332805633545,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "cb08c447.df52e8",\r
-                "3df62a76.46167e"\r
+                "e2718d88.f97c7",\r
+                "8daa1e44.ac1f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb08c447.df52e8",\r
+        "id": "e2718d88.f97c7",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2317.5712661743164,\r
-        "y": 4821.74663066864,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2282.5712661743164,\r
+        "y": 4834.999634742737,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "bd008d18.af7e28"\r
+                "3cb8f8f8.397e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3df62a76.46167e",\r
+        "id": "8daa1e44.ac1f",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2324.7141609191895,\r
-        "y": 4867.460855484009,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2289.7141609191895,\r
+        "y": 4880.7138595581055,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "e973673a.4d16f8"\r
+                "9441abd.ea4d958"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "57855376.396fb4",\r
+        "id": "e0ebd076.a4ab3",\r
         "type": "save",\r
         "name": "custom query: get tenant network",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2557.0000343322754,\r
-        "y": 5016.080413818359,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2522.0000343322754,\r
+        "y": 5029.333417892456,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "43d389bc.8dd5c",\r
-                "ba0b7d99.7e8938"\r
+                "759dfef0.b441c8",\r
+                "46842451.33c984"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43d389bc.8dd5c",\r
+        "id": "759dfef0.b441c8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2770.238082885742,\r
-        "y": 4994.746912956238,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2735.238082885742,\r
+        "y": 5007.9999170303345,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "1b6474fa.c07123"\r
+                "b524c65d.e8c7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba0b7d99.7e8938",\r
+        "id": "46842451.33c984",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2777.3809776306152,\r
-        "y": 5040.461137771606,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2742.3809776306152,\r
+        "y": 5053.714141845703,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "10aba7ed.de916"\r
+                "c4b783d3.51c55"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17456206.9d075e",\r
+        "id": "4732a97e.71d8e8",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for index='rel-index' start='0' end='`$tmp.AnAI-data.get-networks.results[0].l3-network.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2524.0000343322754,\r
-        "y": 5142.0805587768555,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2489.0000343322754,\r
+        "y": 5155.333562850952,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ce79340.35758d"\r
+                "a9774c08.3a0168"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce79340.35758d",\r
+        "id": "a9774c08.3a0168",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.AnAI-data.get-networks.results[0].l3-network.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2722.0000343322754,\r
-        "y": 5142.0805587768555,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2687.0000343322754,\r
+        "y": 5155.333562850952,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "fa4ca619.db292"\r
+                "2124036b.f6de24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa4ca619.db292",\r
+        "id": "2124036b.f6de24",\r
         "type": "outcome",\r
         "name": "vlan-tag",\r
         "xml": "<outcome value='vlan-tag'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2892.0000343322754,\r
-        "y": 5142.0805587768555,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2857.0000343322754,\r
+        "y": 5155.333562850952,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "4c7222a4.15e9ac"\r
+                "735e3d41.846f44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4c7222a4.15e9ac",\r
+        "id": "735e3d41.846f44",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3060.0000343322754,\r
-        "y": 5140.0805587768555,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3025.0000343322754,\r
+        "y": 5153.333562850952,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "43474b1d.d7ef7c",\r
-                "2b8c993e.dd7eb6",\r
-                "81bc4129.bb1c1"\r
+                "f6994075.bfe0e8",\r
+                "e29b5013.2064d8",\r
+                "2c31386.b0914c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43474b1d.d7ef7c",\r
+        "id": "f6994075.bfe0e8",\r
         "type": "set",\r
         "name": "set vlan-tag-id",\r
         "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",\r
         "comments": "",\r
-        "x": 3236.0000343322754,\r
-        "y": 5100.0805587768555,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3201.0000343322754,\r
+        "y": 5113.333562850952,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2b8c993e.dd7eb6",\r
+        "id": "e29b5013.2064d8",\r
         "type": "get-resource",\r
         "name": "get-resource vlan-tag",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3258.0000343322754,\r
-        "y": 5158.0805587768555,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3223.0000343322754,\r
+        "y": 5171.333562850952,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "799d4f7d.0c1778",\r
-                "6628ce12.4c6d38"\r
+                "a74c83c0.264378",\r
+                "29531950.5c7366"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "799d4f7d.0c1778",\r
+        "id": "a74c83c0.264378",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3438.0476417541504,\r
-        "y": 5140.2236251831055,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3403.0476417541504,\r
+        "y": 5153.476629257202,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "6c186302.6806a4"\r
+                "b7613405.a57bf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad5b3ac9.e19098",\r
+        "id": "885fafcd.073ea",\r
         "type": "for",\r
         "name": "for each related network role",\r
         "xml": "<for index='rel-network-role-index' start='0' end='`$db.vnf-related-network-role_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2094.9999656677246,\r
-        "y": 5072.414123535156,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2059.9999656677246,\r
+        "y": 5085.667127609253,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "742a4410.9dd994"\r
+                "bf4945d0.47b928"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "742a4410.9dd994",\r
+        "id": "bf4945d0.47b928",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2299.9999656677246,\r
-        "y": 5073.747268676758,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2264.9999656677246,\r
+        "y": 5087.0002727508545,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "57855376.396fb4",\r
-                "17456206.9d075e",\r
-                "7f19e15e.2c2ee8"\r
+                "e0ebd076.a4ab3",\r
+                "4732a97e.71d8e8",\r
+                "54bbb42c.475e6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32376f69.700f08",\r
+        "id": "d24fdba9.53c6",\r
         "type": "switchNode",\r
         "name": "switch rn-index",\r
         "xml": "<switch test='`$rn-index`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2055.9999656677246,\r
-        "y": 4962.080276489258,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2020.9999656677246,\r
+        "y": 4975.3332805633545,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "681bd084.d720e8"\r
+                "aaedd012.f0d238"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d71dcbd8.8dc7f",\r
+        "id": "aa946eba.37b0e",\r
         "type": "set",\r
         "name": "set rn-index to related network length",\r
         "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",\r
         "comments": "",\r
-        "x": 2124.6665534973145,\r
-        "y": 4913.080129623413,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2089.6665534973145,\r
+        "y": 4926.33313369751,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "681bd084.d720e8",\r
+        "id": "aaedd012.f0d238",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2219.9999656677246,\r
-        "y": 4962.080276489258,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2184.9999656677246,\r
+        "y": 4975.3332805633545,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "a757207e.80691"\r
+                "5a38498e.8f3fd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a757207e.80691",\r
+        "id": "5a38498e.8f3fd8",\r
         "type": "set",\r
         "name": "set rn-index to 0",\r
         "xml": "<set>\n<parameter name='rn-index' value='0' />\n",\r
         "comments": "",\r
-        "x": 2379.9999656677246,\r
-        "y": 4962.080276489258,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2344.9999656677246,\r
+        "y": 4975.3332805633545,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7f19e15e.2c2ee8",\r
+        "id": "54bbb42c.475e6c",\r
         "type": "set",\r
         "name": "set related-network data",\r
         "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",\r
         "comments": "",\r
-        "x": 2527.6666221618652,\r
-        "y": 5072.747100830078,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2492.6666221618652,\r
+        "y": 5086.000104904175,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "96681242.82e6c",\r
+        "id": "e48d6b1e.9814e",\r
         "type": "set",\r
         "name": "set new related network length",\r
         "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",\r
         "comments": "",\r
-        "x": 2090.0000343322754,\r
-        "y": 5216.080413818359,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2055.0000343322754,\r
+        "y": 5229.333417892456,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6628ce12.4c6d38",\r
+        "id": "29531950.5c7366",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3440.0000343322754,\r
-        "y": 5188.080413818359,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3405.0000343322754,\r
+        "y": 5201.333417892456,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ee974e83.057d3"\r
+                "d512370d.fd34e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee974e83.057d3",\r
+        "id": "d512370d.fd34e",\r
         "type": "set",\r
         "name": "set related-network data",\r
         "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",\r
         "comments": "",\r
-        "x": 3632.0000343322754,\r
-        "y": 5188.080413818359,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3597.0000343322754,\r
+        "y": 5201.333417892456,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "81bc4129.bb1c1",\r
+        "id": "2c31386.b0914c8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 3210.0000343322754,\r
-        "y": 5226.080413818359,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3175.0000343322754,\r
+        "y": 5239.333417892456,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "50d3999e.8bb34",\r
+        "id": "a62d7699.385658",\r
         "type": "comment",\r
         "name": "temporary data issue: also ignore string \"null\" and \"NULL\"",\r
         "info": "",\r
         "comments": "",\r
-        "x": 886.3333473205566,\r
-        "y": 4245.842397689819,\r
-        "z": "652cf04d.917e78",\r
+        "x": 851.3333473205566,\r
+        "y": 4259.095401763916,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a9134fc.396d14",\r
+        "id": "67ddcd30.ef6e14",\r
         "type": "outcome",\r
         "name": "null",\r
         "xml": "<outcome value='null'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 913.4761695861816,\r
-        "y": 4328.69953918457,\r
-        "z": "652cf04d.917e78",\r
+        "x": 878.4761695861816,\r
+        "y": 4341.952543258667,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c630c62f.2e4b88"\r
+                "1a917aea.74fb6d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39a7a020.ba1f58",\r
+        "id": "47ca43a8.5c2a5c",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value='NULL'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 913.4761791229248,\r
-        "y": 4371.556611061096,\r
-        "z": "652cf04d.917e78",\r
+        "x": 878.4761791229248,\r
+        "y": 4384.809615135193,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c630c62f.2e4b88"\r
+                "1a917aea.74fb6d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f69e8e3.cf5be8",\r
+        "id": "77593791.068cb",\r
         "type": "switchNode",\r
         "name": "switch input cloud-owner",\r
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.cloud-owner`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 563.0000381469727,\r
-        "y": 419.4136428833008,\r
-        "z": "652cf04d.917e78",\r
+        "x": 528.0000381469727,\r
+        "y": 432.66664695739746,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "f596a79e.8e433",\r
-                "4667755e.d66424"\r
+                "48881f21.46201",\r
+                "5851d57b.cc764c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f596a79e.8e433",\r
+        "id": "48881f21.46201",\r
         "type": "other",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 746.3334121704102,\r
-        "y": 389.413631439209,\r
-        "z": "652cf04d.917e78",\r
+        "x": 711.3334121704102,\r
+        "y": 402.66663551330566,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "a299c564.3dfdb8"\r
+                "bc40050b.2016e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4667755e.d66424",\r
+        "id": "5851d57b.cc764c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 746.0953178405762,\r
-        "y": 430.3661251068115,\r
-        "z": "652cf04d.917e78",\r
+        "x": 711.0953178405762,\r
+        "y": 443.6191291809082,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ee8be88f.ffc97"\r
+                "243b5b47.2a1984"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a299c564.3dfdb8",\r
+        "id": "bc40050b.2016e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 881.333366394043,\r
-        "y": 387.7469711303711,\r
-        "z": "652cf04d.917e78",\r
+        "x": 846.333366394043,\r
+        "y": 400.9999752044678,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ee8be88f.ffc97",\r
+        "id": "243b5b47.2a1984",\r
         "type": "set",\r
         "name": "set prop.cloud-region.cloud-owner",\r
         "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$vnf-topology-operation-input.vnf-request-input.cloud-owner`' />\n",\r
         "comments": "",\r
-        "x": 963.0000228881836,\r
-        "y": 429.41365242004395,\r
-        "z": "652cf04d.917e78",\r
+        "x": 928.0000228881836,\r
+        "y": 442.6666564941406,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "819ca24a.f2412",\r
+        "id": "cfb0be93.de4aa8",\r
         "type": "call",\r
         "name": "call self-serve-vnf-forking-logic",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-forking-logic' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 580.8571624755859,\r
-        "y": 740.2142810821533,\r
-        "z": "652cf04d.917e78",\r
+        "x": 545.8571624755859,\r
+        "y": 753.46728515625,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4ce50465.9ccc0c",\r
+        "id": "5f72fb15.e2e8f4",\r
         "type": "switchNode",\r
         "name": "switch ss.self-serve-flag",\r
         "xml": "<switch test=\"`$ss.self-serve-flag`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 560.9998779296875,\r
-        "y": 905.7857685089111,\r
-        "z": "652cf04d.917e78",\r
+        "x": 525.9998779296875,\r
+        "y": 919.0387725830078,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "b05ed7a0.f4e1f8",\r
-                "8e5a3910.2353a"\r
+                "ca7ff4c7.06bb68",\r
+                "d536a3b3.031e68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b05ed7a0.f4e1f8",\r
+        "id": "ca7ff4c7.06bb68",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 772.7140350341797,\r
-        "y": 979.0710525512695,\r
-        "z": "652cf04d.917e78",\r
+        "x": 737.7140350341797,\r
+        "y": 992.3240566253662,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "73e62b5e.2d2d24"\r
+                "14788654.ce330a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e5a3910.2353a",\r
+        "id": "d536a3b3.031e68",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 772.2855529785156,\r
-        "y": 842.6428861618042,\r
-        "z": "652cf04d.917e78",\r
+        "x": 737.2855529785156,\r
+        "y": 855.8958902359009,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "7c56b4f9.aca0c4"\r
+                "9f86838a.03451"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d48d63d.1a5b82",\r
+        "id": "188d06d.21abdf9",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 952.4444923400879,\r
-        "y": 541.3888673782349,\r
-        "z": "652cf04d.917e78",\r
+        "x": 917.4444923400879,\r
+        "y": 554.6418714523315,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "d6025c47.4904b",\r
-                "73468fad.c71778"\r
+                "18b80053.220bd8",\r
+                "7a46cfea.c20b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17544ab9.984c5d",\r
+        "id": "513e881c.9b735",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 952.4444923400879,\r
-        "y": 589.9603090286255,\r
-        "z": "652cf04d.917e78",\r
+        "x": 917.4444923400879,\r
+        "y": 603.2133131027222,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c6456146.0f2668",\r
-                "73468fad.c71778"\r
+                "29ad4bd6.7a918c",\r
+                "7a46cfea.c20b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a95814.c6dd98",\r
+        "id": "77a122cf.38f42c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 955.3016090393066,\r
-        "y": 634.2460145950317,\r
-        "z": "652cf04d.917e78",\r
+        "x": 920.3016090393066,\r
+        "y": 647.4990186691284,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "557c512a.eddd3",\r
-                "73468fad.c71778"\r
+                "b70b1c9b.b0005",\r
+                "7a46cfea.c20b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6025c47.4904b",\r
+        "id": "18b80053.220bd8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"If svc-action is 'assign' then request-action must be 'CreateVnfInstance'\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1188.8730735778809,\r
-        "y": 541.3888578414917,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1153.8730735778809,\r
+        "y": 554.6418619155884,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c6456146.0f2668",\r
+        "id": "29ad4bd6.7a918c",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error reading VF_MODEL table\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1187.4444847106934,\r
-        "y": 590.1031522750854,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1152.4444847106934,\r
+        "y": 603.3561563491821,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "557c512a.eddd3",\r
+        "id": "b70b1c9b.b0005",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1187.4444847106934,\r
-        "y": 634.2460050582886,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1152.4444847106934,\r
+        "y": 647.4990091323853,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "75930576.a93ef4",\r
+        "id": "a23e97a1.879b88",\r
         "type": "call",\r
         "name": "call self-serve-vnf-assign",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-assign' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1223.3211402893066,\r
-        "y": 740.1072311401367,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1188.3211402893066,\r
+        "y": 753.3602352142334,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "8d844173.607528"\r
+                "464f1d64.e9ee74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4a1df9a.51e5b8",\r
+        "id": "5ab38ea3.87a95",\r
         "type": "comment",\r
         "name": "SELF-SERVE FORK",\r
         "info": "",\r
         "comments": "",\r
-        "x": 942.7618942260742,\r
-        "y": 793.5119113922119,\r
-        "z": "652cf04d.917e78",\r
+        "x": 907.7618942260742,\r
+        "y": 806.7649154663086,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8d844173.607528",\r
+        "id": "464f1d64.e9ee74",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1428.6187210083008,\r
-        "y": 739.5952625274658,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1393.6187210083008,\r
+        "y": 752.8482666015625,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "a0be875f.ade8a"\r
+                "16426f3a.7a3f71"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9f565fa.4dc342",\r
+        "id": "1c4a1d53.f78c8b",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 1198.5635070800781,\r
-        "y": 988.789656996727,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1163.5635070800781,\r
+        "y": 1002.0426610708237,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "be242702.8a5c",\r
+        "id": "a9871a52.4c62c8",\r
         "type": "set",\r
         "name": "set vnf-level-oper-status to PendingCreate",\r
         "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",\r
         "comments": "",\r
-        "x": 1286.432487487793,\r
-        "y": 791.599271774292,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1251.432487487793,\r
+        "y": 804.8522758483887,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b92958a4.6d80e",\r
+        "id": "2e89c9f5.0a4c26",\r
         "type": "execute",\r
         "name": "printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vnfend.log' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1185.6348037719727,\r
-        "y": 842.0390481948853,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1150.6348037719727,\r
+        "y": 855.2920522689819,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7c56b4f9.aca0c4",\r
+        "id": "9f86838a.03451",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 962.8727645874023,\r
-        "y": 842.4999408721924,\r
-        "z": "652cf04d.917e78",\r
+        "x": 927.8727645874023,\r
+        "y": 855.7529449462891,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "75930576.a93ef4",\r
-                "be242702.8a5c",\r
-                "b92958a4.6d80e",\r
-                "9f565fa.4dc342",\r
-                "d8dc3738.9ff7d",\r
-                "61c39fe5.7ecd2"\r
+                "a23e97a1.879b88",\r
+                "a9871a52.4c62c8",\r
+                "2e89c9f5.0a4c26",\r
+                "1c4a1d53.f78c8b",\r
+                "8d27e9d2.f1e978",\r
+                "97334262.a10fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73468fad.c71778",\r
+        "id": "7a46cfea.c20b2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1804.3176345825195,\r
-        "y": 819.2462577819824,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1769.3176345825195,\r
+        "y": 832.4992618560791,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "6ffa4d06.cd8f6c",\r
-                "ce39ee80.3e9ff"\r
+                "c1ed3b4.b543348",\r
+                "282b78b6.aebb7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a0be875f.ade8a",\r
+        "id": "16426f3a.7a3f71",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1604.635009765625,\r
-        "y": 739.785698890686,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1569.635009765625,\r
+        "y": 753.0387029647827,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "62341ef1.f30f5",\r
-                "73468fad.c71778"\r
+                "70af52d1.53ad84",\r
+                "7a46cfea.c20b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62341ef1.f30f5",\r
+        "id": "70af52d1.53ad84",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1816.162956237793,\r
-        "y": 681.690544128418,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1781.162956237793,\r
+        "y": 694.9435482025146,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4efb64bb.616d74",\r
+        "id": "ded883f9.922bb",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists'`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2246.999954223633,\r
-        "y": 1253.666597366333,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2211.999954223633,\r
+        "y": 1266.9196014404297,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "53faa32e.0504dc",\r
+        "id": "472848ae.4b4ee",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1624.0950775146484,\r
-        "y": 1308.476245880127,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1589.0950775146484,\r
+        "y": 1321.7292499542236,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "411cfc3a.01153c",\r
+        "id": "6baa8775.ce8748",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error retrieving instance-group from AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1624.0950393676758,\r
-        "y": 1371.619031906128,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1589.0950393676758,\r
+        "y": 1384.8720359802246,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "53de08e6.af6ff8",\r
+        "id": "7b340405.85b91c",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2218.6665420532227,\r
-        "y": 1387.9523315429688,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2183.6665420532227,\r
+        "y": 1401.2053356170654,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2dfa859a.9ef8aa",\r
+        "id": "4b527620.59446",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Failed to get network service instance '\n      + $network-service-instance + ' from MD-SAL'`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2220.1427841186523,\r
-        "y": 1429.666732788086,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2185.1427841186523,\r
+        "y": 1442.9197368621826,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4baafedf.40884",\r
+        "id": "d4c1cf70.ed432",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2904.666893005371,\r
-        "y": 1588.1904573440552,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2869.666893005371,\r
+        "y": 1601.4434614181519,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d9837d5e.fb9228",\r
+        "id": "17df96cb.754441",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2930.6786499023438,\r
-        "y": 1892.3692474365234,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2895.6786499023438,\r
+        "y": 1905.6222515106201,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "85f543a5.3e0c48",\r
-                "5d5d1ee3.ba096"\r
+                "e733881a.ac1f4",\r
+                "3dd98612.ab55e2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dcfb1529.fec6a8",\r
+        "id": "fb90666f.a03358",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2041.9998321533203,\r
-        "y": 1251.9998836517334,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2006.9998321533203,\r
+        "y": 1265.25288772583,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "4efb64bb.616d74",\r
-                "d9837d5e.fb9228"\r
+                "ded883f9.922bb",\r
+                "17df96cb.754441"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "961d4497.b1f5b",\r
+        "id": "7b566e9a.02ffe",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1412.3333206176758,\r
-        "y": 1308.6664772033691,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1377.3333206176758,\r
+        "y": 1321.9194812774658,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "53faa32e.0504dc",\r
-                "d9837d5e.fb9228"\r
+                "472848ae.4b4ee",\r
+                "17df96cb.754441"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e3d9218.a643dc",\r
+        "id": "46fc6653.09995",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1412.9996948242188,\r
-        "y": 1371.3331823349,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1377.9996948242188,\r
+        "y": 1384.5861864089966,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "411cfc3a.01153c",\r
-                "d9837d5e.fb9228"\r
+                "6baa8775.ce8748",\r
+                "17df96cb.754441"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5dc44b5.d3f17",\r
+        "id": "716a6bd7.84c124",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2001.3332138061523,\r
-        "y": 1388.3333625793457,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1966.3332138061523,\r
+        "y": 1401.5863666534424,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "53de08e6.af6ff8",\r
-                "d9837d5e.fb9228"\r
+                "7b340405.85b91c",\r
+                "17df96cb.754441"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "966a3052.be8b78",\r
+        "id": "61ef806e.0df108",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1999.6665878295898,\r
-        "y": 1430.333251953125,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1964.6665878295898,\r
+        "y": 1443.5862560272217,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "2dfa859a.9ef8aa",\r
-                "d9837d5e.fb9228"\r
+                "4b527620.59446",\r
+                "17df96cb.754441"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "19fba1ff.3d7996",\r
+        "id": "8e578fe.a90fc7",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2693.9524307250977,\r
-        "y": 1588.9047193527222,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2658.9524307250977,\r
+        "y": 1602.1577234268188,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "4baafedf.40884",\r
-                "d9837d5e.fb9228"\r
+                "d4c1cf70.ed432",\r
+                "17df96cb.754441"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad1b7833.2d89a",\r
+        "id": "75700df9.afdc2c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1500.3808898925781,\r
-        "y": 1823.9046249389648,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1465.3808898925781,\r
+        "y": 1837.1576290130615,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "939de763.66009",\r
-                "1a90432.93512bd"\r
+                "e9702d46.26adb8",\r
+                "15cf10ee.e25e07"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "939de763.66009",\r
+        "id": "e9702d46.26adb8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"No vnf-name was received but ecomp-generated-naming is not Y\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1730.2381210327148,\r
-        "y": 1824.3329601287842,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1695.2381210327148,\r
+        "y": 1837.5859642028809,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "841445e5.523fe",\r
+        "id": "8993a315.cb4e88",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2253.2380142211914,\r
-        "y": 1927.7618045806885,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2218.2380142211914,\r
+        "y": 1941.0148086547852,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "262e48b9.36be4",\r
-                "1a90432.93512bd"\r
+                "fdb7a51d.af4ee8",\r
+                "15cf10ee.e25e07"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "262e48b9.36be4",\r
+        "id": "fdb7a51d.af4ee8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`$generate-unique-name-output.error-message`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2461.380889892578,\r
-        "y": 1927.3331956863403,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2426.380889892578,\r
+        "y": 1940.586199760437,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "95c2eab0.a4313",\r
+        "id": "f2317901.0924b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2301.809440612793,\r
-        "y": 2053.9045372009277,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2266.809440612793,\r
+        "y": 2067.1575412750244,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "cd9d840e.6d9e2",\r
-                "1a90432.93512bd"\r
+                "856de475.45ba98",\r
+                "15cf10ee.e25e07"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd9d840e.6d9e2",\r
+        "id": "856de475.45ba98",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Unable to generate VNF name\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2524.6664962768555,\r
-        "y": 2054.3332080841064,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2489.6664962768555,\r
+        "y": 2067.586212158203,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1a90432.93512bd",\r
+        "id": "15cf10ee.e25e07",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2576.5480422973633,\r
-        "y": 2309.333641052246,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2541.5480422973633,\r
+        "y": 2322.586645126343,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "82edd673.f84e28",\r
-                "d16813f7.4f256"\r
+                "f22d0ab9.1bb94",\r
+                "bebfeeed.4ae468"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2be0da40.0d7806",\r
+        "id": "5d5eddf8.f77b84",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 994.1904449462891,\r
-        "y": 2964.2857341766357,\r
-        "z": "652cf04d.917e78",\r
+        "x": 959.1904449462891,\r
+        "y": 2977.5387382507324,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c3e06ca1.959fc",\r
-                "b2ea455b.480508"\r
+                "c08f5c29.3f9638",\r
+                "3000afa5.73af78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3e06ca1.959fc",\r
+        "id": "c08f5c29.3f9638",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Cloud region not found in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1192.7617874145508,\r
-        "y": 2930.0000200271606,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1157.7617874145508,\r
+        "y": 2943.2530241012573,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f968cb62.56775",\r
+        "id": "67a22798.d81588",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 997.523796081543,\r
-        "y": 3007.619020462036,\r
-        "z": "652cf04d.917e78",\r
+        "x": 962.523796081543,\r
+        "y": 3020.872024536133,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "705aa9d.1a68858",\r
-                "b2ea455b.480508"\r
+                "c412f231.3450f",\r
+                "3000afa5.73af78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "705aa9d.1a68858",\r
+        "id": "c412f231.3450f",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error retrieving cloud region from AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1196.0951385498047,\r
-        "y": 2973.333306312561,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1161.0951385498047,\r
+        "y": 2986.5863103866577,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5c62b00e.a7cd48",\r
+        "id": "8a243db.c5662c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 855.8572311401367,\r
-        "y": 3186.619167327881,\r
-        "z": "652cf04d.917e78",\r
+        "x": 820.8572311401367,\r
+        "y": 3199.8721714019775,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "7368045.ed8167c",\r
-                "b2ea455b.480508"\r
+                "1b929659.994202",\r
+                "3000afa5.73af78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7368045.ed8167c",\r
+        "id": "1b929659.994202",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1065.8572235107422,\r
-        "y": 3165.190655708313,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1030.8572235107422,\r
+        "y": 3178.4436597824097,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b2ea455b.480508",\r
+        "id": "3000afa5.73af78",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1952.4405975341797,\r
-        "y": 3741.820848464966,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1917.4405975341797,\r
+        "y": 3755.0738525390625,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "2eff60b0.82a368",\r
-                "2209a27.51db7de",\r
-                "8cff46f6.b77",\r
-                "e06e50cf.f6e82"\r
+                "378b03ce.20c66c",\r
+                "7f7bd6c0.4dce5",\r
+                "dd87ea49.833d68",\r
+                "7840dd27.291b7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ef20c7d.b3d83c",\r
+        "id": "48f3f890.8517f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1141.3333282470703,\r
-        "y": 3276.714331626892,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1106.3333282470703,\r
+        "y": 3289.9673357009888,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "1e4bb717.8c8f11",\r
-                "b2ea455b.480508"\r
+                "cb477d35.d878f8",\r
+                "3000afa5.73af78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e4bb717.8c8f11",\r
+        "id": "cb477d35.d878f8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error reading VF_TO_NETWORK_ROLE_MAPPING table\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1344.1904373168945,\r
-        "y": 3243.8572273254395,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1309.1904373168945,\r
+        "y": 3257.110231399536,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ddfbfd5a.f170a",\r
+        "id": "c82ac0d8.cc5e38",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1711.3332824707031,\r
-        "y": 3486.285619735718,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1676.3332824707031,\r
+        "y": 3499.5386238098145,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ed599d84.5459d",\r
-                "b2ea455b.480508"\r
+                "72b2b538.d558dc",\r
+                "3000afa5.73af78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ed599d84.5459d",\r
+        "id": "72b2b538.d558dc",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1922.7618865966797,\r
-        "y": 3454.8569107055664,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1887.7618865966797,\r
+        "y": 3468.109914779663,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3ecadd51.2a79da",\r
+        "id": "5682a799.32827",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2731.8094635009766,\r
-        "y": 4707.667684555054,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2696.8094635009766,\r
+        "y": 4720.92068862915,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "1132c0eb.47f19f",\r
-                "1eafb6c3.64af09"\r
+                "7661361b.939148",\r
+                "26c72533.15b0ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1132c0eb.47f19f",\r
+        "id": "7661361b.939148",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2943.237968444824,\r
-        "y": 4676.238899230957,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2908.237968444824,\r
+        "y": 4689.491903305054,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "aac9396.609d348",\r
+        "id": "62e01756.b02ec8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1844.4761962890625,\r
-        "y": 4548.048126220703,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1809.4761962890625,\r
+        "y": 4561.3011302948,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "6ef91a22.9e6f5c",\r
-                "1eafb6c3.64af09"\r
+                "f751a4f8.1ed6c",\r
+                "26c72533.15b0ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ef91a22.9e6f5c",\r
+        "id": "f751a4f8.1ed6c",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error reading VNF_RELATED_NETWORK_ROLE table\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2058.4761962890625,\r
-        "y": 4529.190979003906,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2023.4761962890625,\r
+        "y": 4542.443983078003,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bd008d18.af7e28",\r
+        "id": "3cb8f8f8.397e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2488.952423095703,\r
-        "y": 4823.667268753052,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2453.952423095703,\r
+        "y": 4836.920272827148,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "3b9e157a.a6eb1a",\r
-                "1eafb6c3.64af09"\r
+                "c14a1816.2bece8",\r
+                "26c72533.15b0ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b9e157a.a6eb1a",\r
+        "id": "c14a1816.2bece8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error getting owning entity from service instance\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2696.095443725586,\r
-        "y": 4799.381650924683,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2661.095443725586,\r
+        "y": 4812.634654998779,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e973673a.4d16f8",\r
+        "id": "9441abd.ea4d958",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2503.952423095703,\r
-        "y": 4868.667268753052,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2468.952423095703,\r
+        "y": 4881.920272827148,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ea2f1cf6.5574e",\r
-                "1eafb6c3.64af09"\r
+                "5cc607a9.f4749",\r
+                "26c72533.15b0ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea2f1cf6.5574e",\r
+        "id": "5cc607a9.f4749",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Unable to find owning entity from service instance\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2705.3810653686523,\r
-        "y": 4842.953462600708,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2670.3810653686523,\r
+        "y": 4856.206466674805,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1b6474fa.c07123",\r
+        "id": "b524c65d.e8c7c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2947.9998168945312,\r
-        "y": 4994.143200874329,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2912.9998168945312,\r
+        "y": 5007.396204948425,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "ad71495b.bf604",\r
-                "1eafb6c3.64af09"\r
+                "2ae5f0aa.16eba",\r
+                "26c72533.15b0ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad71495b.bf604",\r
+        "id": "2ae5f0aa.16eba",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error calling getNetworks custom query in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3163.714179992676,\r
-        "y": 4964.143190383911,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3128.714179992676,\r
+        "y": 4977.396194458008,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "10aba7ed.de916",\r
+        "id": "c4b783d3.51c55",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2959.6665649414062,\r
-        "y": 5039.143200874329,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2924.6665649414062,\r
+        "y": 5052.396204948425,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "92ff3f65.ace2f",\r
-                "1eafb6c3.64af09"\r
+                "d11e9c05.b61cf",\r
+                "26c72533.15b0ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92ff3f65.ace2f",\r
+        "id": "d11e9c05.b61cf",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3175.380928039551,\r
-        "y": 5009.143190383911,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3140.380928039551,\r
+        "y": 5022.396194458008,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6c186302.6806a4",\r
+        "id": "b7613405.a57bf",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3603.952033996582,\r
-        "y": 5140.333766937256,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3568.952033996582,\r
+        "y": 5153.5867710113525,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c91d001.4234e8",\r
-                "1eafb6c3.64af09"\r
+                "e1d3badb.4944e",\r
+                "26c72533.15b0ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c91d001.4234e8",\r
+        "id": "e1d3badb.4944e",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error getting vlan-tag object from AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3816.80916595459,\r
-        "y": 5113.190900802612,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3781.80916595459,\r
+        "y": 5126.443904876709,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1eafb6c3.64af09",\r
+        "id": "26c72533.15b0ea",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3723.6791076660156,\r
-        "y": 5591.275134086609,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3688.6791076660156,\r
+        "y": 5604.528138160706,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "45d48b66.a8078c",\r
-                "f7795356.cb57f8",\r
-                "5ac8760f.3c13c",\r
-                "149b2fa5.4d0cf8"\r
+                "db3d93.58c8227",\r
+                "ad080da7.45d5b",\r
+                "140e4a8.aa852b6",\r
+                "4fe34f3d.b60a38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11a704cb.ec6e1b",\r
+        "id": "76d0200d.fc0188",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1711.333267211914,\r
-        "y": 3536.2856159210205,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1676.333267211914,\r
+        "y": 3549.538619995117,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "9729b81b.95b818",\r
-                "b2ea455b.480508"\r
+                "ac11c09f.11a3f8",\r
+                "3000afa5.73af78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9729b81b.95b818",\r
+        "id": "ac11c09f.11a3f8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error retrieving l3-network from AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1922.7618713378906,\r
-        "y": 3504.856906890869,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1887.7618713378906,\r
+        "y": 3518.109910964966,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2ae5fa90.61994e",\r
+        "id": "2f7baa50.3a7f6e",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1847.0476913452148,\r
-        "y": 4247.714210510254,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1812.0476913452148,\r
+        "y": 4260.967214584351,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c374836e.37fed8",\r
+        "id": "d3e41f3b.440478",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1647.0476913452148,\r
-        "y": 4262,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1612.0476913452148,\r
+        "y": 4275.253004074097,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "2ae5fa90.61994e",\r
-                "1eafb6c3.64af09"\r
+                "2f7baa50.3a7f6e",\r
+                "26c72533.15b0ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf09642d.dcd6b",\r
+        "id": "9c4ebd50.5f47c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1301.3332748413086,\r
-        "y": 5434.856773376465,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1266.3332748413086,\r
+        "y": 5448.1097774505615,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "d709ac0f.fb269",\r
-                "e74586be.b8e6f8"\r
+                "26c1eaae.bf138e",\r
+                "fe30a9c6.049198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d709ac0f.fb269",\r
+        "id": "26c1eaae.bf138e",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1504.1904067993164,\r
-        "y": 5416.28534412384,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1469.1904067993164,\r
+        "y": 5429.538348197937,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "662f403a.490a78",\r
+        "id": "6293928d.4f10b4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1528.7144622802734,\r
-        "y": 5561.524040222168,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1493.7144622802734,\r
+        "y": 5574.777044296265,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "c383f700.e2fe08",\r
-                "e74586be.b8e6f8"\r
+                "a65d67ab.54ccc8",\r
+                "fe30a9c6.049198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c383f700.e2fe08",\r
+        "id": "a65d67ab.54ccc8",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating generic-vnf in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1730.1430130004883,\r
-        "y": 5541.524041175842,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1695.1430130004883,\r
+        "y": 5554.777045249939,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bf452558.9a9008",\r
+        "id": "6db07962.51fbc8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1530.381088256836,\r
-        "y": 5604.857048034668,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1495.381088256836,\r
+        "y": 5618.110052108765,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "79c5928f.79507c",\r
-                "e74586be.b8e6f8"\r
+                "f04c754d.905e58",\r
+                "fe30a9c6.049198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "79c5928f.79507c",\r
+        "id": "f04c754d.905e58",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1731.8096389770508,\r
-        "y": 5584.857048988342,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1696.8096389770508,\r
+        "y": 5598.110053062439,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e0daa6a.dcf31d8",\r
+        "id": "b28581b0.5712a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1388.238136291504,\r
-        "y": 5679.618696212769,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1353.238136291504,\r
+        "y": 5692.871700286865,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "1a45b18b.687d7e",\r
-                "e74586be.b8e6f8"\r
+                "97c4188b.d87ca",\r
+                "fe30a9c6.049198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a45b18b.687d7e",\r
+        "id": "97c4188b.d87ca",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating generic-vnf in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1585.9166717529297,\r
-        "y": 5658.011522293091,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1550.9166717529297,\r
+        "y": 5671.2645263671875,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ca1e10f7.f5af08",\r
+        "id": "1b732815.14e07",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1408.2976303100586,\r
-        "y": 5724.678614616394,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1373.2976303100586,\r
+        "y": 5737.931618690491,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "7c8d3c94.816594",\r
-                "e74586be.b8e6f8"\r
+                "3b0cf6e0.855aaa",\r
+                "fe30a9c6.049198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c8d3c94.816594",\r
+        "id": "3b0cf6e0.855aaa",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1612.583396911621,\r
-        "y": 5701.821611404419,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1577.583396911621,\r
+        "y": 5715.074615478516,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2e13fdd8.c6ad92",\r
+        "id": "8d790e64.fbc6b8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 824.0118942260742,\r
-        "y": 5834.29768371582,\r
-        "z": "652cf04d.917e78",\r
+        "x": 789.0118942260742,\r
+        "y": 5847.550687789917,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "7c4ba56.57b5cdc",\r
-                "e74586be.b8e6f8"\r
+                "c1b55e7e.c6db7",\r
+                "fe30a9c6.049198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c4ba56.57b5cdc",\r
+        "id": "c1b55e7e.c6db7",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating selflink in generic-vnf in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1029.7262344360352,\r
-        "y": 5810.011829376221,\r
-        "z": "652cf04d.917e78",\r
+        "x": 994.7262344360352,\r
+        "y": 5823.264833450317,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "eba4fe8c.3ea98",\r
+        "id": "86656044.af7ea",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 837.3452072143555,\r
-        "y": 5877.63117980957,\r
-        "z": "652cf04d.917e78",\r
+        "x": 802.3452072143555,\r
+        "y": 5890.884183883667,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "2d963807.1f3568",\r
-                "e74586be.b8e6f8"\r
+                "8343190d.5848c",\r
+                "fe30a9c6.049198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d963807.1f3568",\r
+        "id": "8343190d.5848c",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1043.0595474243164,\r
-        "y": 5853.345325469971,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1008.0595474243164,\r
+        "y": 5866.598329544067,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1ce1d0e3.b09f8f",\r
+        "id": "df50542d.c5f3b8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1417.3928909301758,\r
-        "y": 5927.011758804321,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1382.3928909301758,\r
+        "y": 5940.264762878418,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "f1dfb0ff.674588",\r
-                "e74586be.b8e6f8"\r
+                "1553bf30.21afc9",\r
+                "fe30a9c6.049198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1dfb0ff.674588",\r
+        "id": "1553bf30.21afc9",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error updating relationship in generic-vnf in AAI\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1611.678611755371,\r
-        "y": 5901.2977504730225,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1576.678611755371,\r
+        "y": 5914.550754547119,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "85592822.f54ce",\r
+        "id": "1108a556.80c593",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1432.3928909301758,\r
-        "y": 5970.345254898071,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1397.3928909301758,\r
+        "y": 5983.598258972168,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "16449f26.c6b4a1",\r
-                "e74586be.b8e6f8"\r
+                "65d2b92b.988988",\r
+                "fe30a9c6.049198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "16449f26.c6b4a1",\r
+        "id": "65d2b92b.988988",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1626.678611755371,\r
-        "y": 5944.6312465667725,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1591.678611755371,\r
+        "y": 5957.884250640869,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "634a4090.ff27d",\r
+        "id": "a2884948.862f8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode - PUT vnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 527.3212051391602,\r
-        "y": 6334.9891719818115,\r
-        "z": "652cf04d.917e78",\r
+        "x": 492.32120513916016,\r
+        "y": 6348.242176055908,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "1a97646.1d7bf9c",\r
-                "5710c473.bb38cc"\r
+                "eb2fd10f.58d528",\r
+                "766f2742.7f101"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a97646.1d7bf9c",\r
+        "id": "eb2fd10f.58d528",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 774.5339660644531,\r
-        "y": 6356.319892883301,\r
-        "z": "652cf04d.917e78",\r
+        "x": 739.5339660644531,\r
+        "y": 6369.5728969573975,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "7fa41968.bb5ec8"\r
+                "601af5e.6e5998c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5710c473.bb38cc",\r
+        "id": "766f2742.7f101",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 766.9626007080078,\r
-        "y": 6314.819912910461,\r
-        "z": "652cf04d.917e78",\r
+        "x": 731.9626007080078,\r
+        "y": 6328.072916984558,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "7fa41968.bb5ec8"\r
+                "601af5e.6e5998c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7fa41968.bb5ec8",\r
+        "id": "601af5e.6e5998c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 942.5592803955078,\r
-        "y": 6334.750367164612,\r
-        "z": "652cf04d.917e78",\r
+        "x": 907.5592803955078,\r
+        "y": 6348.0033712387085,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             [\r
-                "eb23793e.28b0d",\r
-                "e74586be.b8e6f8"\r
+                "f06a0861.c5b6a",\r
+                "fe30a9c6.049198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb23793e.28b0d",\r
+        "id": "f06a0861.c5b6a",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"Error doing PUT of vnf-data\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1148.2735900878906,\r
-        "y": 6300.464484214783,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1113.2735900878906,\r
+        "y": 6313.717488288879,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9ec4fd36.2e31c8",\r
+        "id": "5d5f2dd1.10210c",\r
         "type": "set",\r
         "name": "set so.response-code = 200",\r
         "xml": "<set>\n<parameter name=\"so.response-code\" value=\"200\" />",\r
         "comments": "",\r
-        "x": 498.09376525878906,\r
-        "y": 6477.500561714172,\r
-        "z": "652cf04d.917e78",\r
+        "x": 463.09376525878906,\r
+        "y": 6490.753565788269,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5369940c.e48364",\r
+        "id": "7e13039d.149664",\r
         "type": "set",\r
         "name": "Initialize SO 500 reponse params",\r
         "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",\r
         "comments": "",\r
-        "x": 595.7605819702148,\r
-        "y": 313.9549217224121,\r
-        "z": "652cf04d.917e78",\r
+        "x": 557.7606201171875,\r
+        "y": 350.2079162597656,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2eff60b0.82a368",\r
+        "id": "378b03ce.20c66c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2278.2909622192383,\r
-        "y": 3792.151798248291,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2243.2909622192383,\r
+        "y": 3805.4048023223877,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d8dc3738.9ff7d",\r
+        "id": "8d27e9d2.f1e978",\r
         "type": "set",\r
         "name": "set so.reponse-code = 200",\r
         "xml": "<set>\n<parameter name=\"so.response-code\" value=\"200\" />\n",\r
         "comments": "",\r
-        "x": 1238.8462142944336,\r
-        "y": 888.2629871368408,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1203.8462142944336,\r
+        "y": 901.5159912109375,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2209a27.51db7de",\r
+        "id": "7f7bd6c0.4dce5",\r
         "type": "set",\r
         "name": "set variables for deleting name",\r
         "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",\r
         "comments": "",\r
-        "x": 2225.096290588379,\r
-        "y": 3691.040738105774,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2190.096290588379,\r
+        "y": 3704.2937421798706,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8cff46f6.b77",\r
+        "id": "dd87ea49.833d68",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:naming-policy-generate-name",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2322.66756439209,\r
-        "y": 3741.1830978393555,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2287.66756439209,\r
+        "y": 3754.436101913452,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5ac8760f.3c13c",\r
+        "id": "140e4a8.aa852b6",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4057.0410079956055,\r
-        "y": 5615.346151351929,\r
-        "z": "652cf04d.917e78",\r
+        "x": 4022.0410079956055,\r
+        "y": 5628.599155426025,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "45d48b66.a8078c",\r
+        "id": "db3d93.58c8227",\r
         "type": "set",\r
         "name": "set variables for deleting name",\r
         "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",\r
         "comments": "",\r
-        "x": 4003.846336364746,\r
-        "y": 5514.235091209412,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3968.846336364746,\r
+        "y": 5527.488095283508,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f7795356.cb57f8",\r
+        "id": "ad080da7.45d5b",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:naming-policy-generate-name",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4101.417610168457,\r
-        "y": 5564.377450942993,\r
-        "z": "652cf04d.917e78",\r
+        "x": 4066.417610168457,\r
+        "y": 5577.63045501709,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fef2b74e.207f2",\r
+        "id": "574c5265.459624",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2286.2076263427734,\r
-        "y": 6596.319822311401,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2251.2076263427734,\r
+        "y": 6609.572826385498,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5e0caa6d.e903f4",\r
+        "id": "fcd8b4d3.ba6f18",\r
         "type": "set",\r
         "name": "set variables for deleting name",\r
         "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",\r
         "comments": "",\r
-        "x": 2229.262924194336,\r
-        "y": 6495.2088985443115,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2194.262924194336,\r
+        "y": 6508.461902618408,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fcbc941a.75b4b8",\r
+        "id": "7af5e0af.8b4d6",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:naming-policy-generate-name",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2326.834197998047,\r
-        "y": 6545.351258277893,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2291.834197998047,\r
+        "y": 6558.60426235199,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6ffa4d06.cd8f6c",\r
+        "id": "c1ed3b4.b543348",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2118.7077407836914,\r
-        "y": 792.8462972640991,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2083.7077407836914,\r
+        "y": 806.0993013381958,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "85f543a5.3e0c48",\r
+        "id": "e733881a.ac1f4",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3242.457305908203,\r
-        "y": 1868.596351146698,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3207.457305908203,\r
+        "y": 1881.8493552207947,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "82edd673.f84e28",\r
+        "id": "f22d0ab9.1bb94",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2894.957359313965,\r
-        "y": 2283.346435546875,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2859.957359313965,\r
+        "y": 2296.5994396209717,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1fec3768.f512f1",\r
+        "id": "f5df60ce.d84ac8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 562.5963668823242,\r
-        "y": 6531.874531745911,\r
-        "z": "652cf04d.917e78",\r
+        "x": 527.5963668823242,\r
+        "y": 6545.127535820007,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "61c39fe5.7ecd2",\r
+        "id": "97334262.a10fc",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API_send-so-response",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='send-so-response' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1310.8462448120117,\r
-        "y": 937.0129909515381,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1275.8462448120117,\r
+        "y": 950.2659950256348,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ce39ee80.3e9ff",\r
+        "id": "282b78b6.aebb7",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2000.096290588379,\r
-        "y": 843.2629833221436,\r
-        "z": "652cf04d.917e78",\r
+        "x": 1965.096290588379,\r
+        "y": 856.5159873962402,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5d5d1ee3.ba096",\r
+        "id": "3dd98612.ab55e2",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3123.84627532959,\r
-        "y": 1912.8463134765625,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3088.84627532959,\r
+        "y": 1926.0993175506592,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d16813f7.4f256",\r
+        "id": "bebfeeed.4ae468",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2778.84627532959,\r
-        "y": 2331.596435546875,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2743.84627532959,\r
+        "y": 2344.8494396209717,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e06e50cf.f6e82",\r
+        "id": "7840dd27.291b7c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2158.846424102783,\r
-        "y": 3839.929880142212,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2123.846424102783,\r
+        "y": 3853.1828842163086,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "149b2fa5.4d0cf8",\r
+        "id": "4fe34f3d.b60a38",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3939.81844329834,\r
-        "y": 5665.06884765625,\r
-        "z": "652cf04d.917e78",\r
+        "x": 3904.81844329834,\r
+        "y": 5678.321851730347,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ae834aa6.55d6c",\r
+        "id": "6358f1ef.44078",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2166.0686569213867,\r
-        "y": 6643.263185501099,\r
-        "z": "652cf04d.917e78",\r
+        "x": 2131.0686569213867,\r
+        "y": 6656.516189575195,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4ba8fd3f.c818fc",\r
+        "id": "3367c076.389b7",\r
         "type": "execute",\r
         "name": "generate vnf URL (sub service-instance-id)",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 551.3463516235352,\r
-        "y": 6138.542016029358,\r
-        "z": "652cf04d.917e78",\r
+        "x": 516.3463516235352,\r
+        "y": 6151.795020103455,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d2d8ec6e.e92468",\r
+        "id": "d71dd728.42aa",\r
         "type": "execute",\r
         "name": "generate vnf URL (sub vnf-id)",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 506.34627532958984,\r
-        "y": 6189.969970703125,\r
-        "z": "652cf04d.917e78",\r
+        "x": 471.34627532958984,\r
+        "y": 6203.222974777222,\r
+        "z": "f54d3783.41afe",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2957e806.869ab",\r
+        "id": "dac2571d.72305",\r
         "type": "set",\r
         "name": "copy vnf data",\r
         "xml": "<set>\n<parameter name='vnf-data.' value='service-data.vnfs.vnf[$vnf-index].vnf-data.' />\n",\r
         "comments": "",\r
-        "x": 452.2392349243164,\r
-        "y": 6237.827503204346,\r
-        "z": "652cf04d.917e78",\r
+        "x": 417.2392349243164,\r
+        "y": 6251.080507278442,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bb434916.4ddfd",\r
+        "id": "b8027a72.6866a",\r
         "type": "comment",\r
         "name": "'New' version of DG, called for flows where SO expects async response (so-bpmn-infra)",\r
         "info": "",\r
         "comments": "",\r
-        "x": 565,\r
-        "y": 93,\r
-        "z": "652cf04d.917e78",\r
+        "x": 530,\r
+        "y": 106.25300407409668,\r
+        "z": "f54d3783.41afe",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "caa8d84a.f0775",\r
+        "type": "switchNode",\r
+        "name": "cloud-owner passed in input?",\r
+        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.cloud-owner != ''`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 542,\r
+        "y": 304,\r
+        "z": "f54d3783.41afe",\r
+        "wires": [\r
+            [\r
+                "49ac8a59.568384"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "49ac8a59.568384",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 862,\r
+        "y": 306,\r
+        "z": "f54d3783.41afe",\r
+        "wires": [\r
+            [\r
+                "64659a33.df3f8c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "64659a33.df3f8c",\r
+        "type": "set",\r
+        "name": "set prop.cloud-region.cloud-owner to input cloud-owner",\r
+        "xml": "<set>\n<parameter name='prop.cloud-region.cloud-owner' value='`$vnf-topology-operation-input.vnf-request-input.cloud-owner`' />\n",\r
+        "comments": "",\r
+        "x": 1233,\r
+        "y": 302,\r
+        "z": "f54d3783.41afe",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
old mode 100755 (executable)
new mode 100644 (file)
index 1f6f5d8..5bccbb8
@@ -7,6 +7,13 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
                 <parameter name='contextPrefix' value='prop' />\r
             </execute>\r
+            <switch test="`$network-topology-operation-input.network-request-input.cloud-owner != ''`">\r
+                <outcome value='true'>\r
+                    <set>\r
+                        <parameter name='prop.cloud-region.cloud-owner' value='`$network-topology-operation-input.network-request-input.cloud-owner`' />\r
+                    </set>\r
+                </outcome>\r
+            </switch>\r
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="tenant" \r
                key="cloud-region.cloud-owner = $prop.cloud-region.cloud-owner AND \r
index f25087e..dbc2203 100644 (file)
@@ -7,6 +7,13 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
                 <parameter name='contextPrefix' value='prop' />\r
             </execute>\r
+            <switch test="`$pnf-topology-operation-input.pnf-request-input.cloud-owner != ''`">\r
+                <outcome value='true'>\r
+                    <set>\r
+                        <parameter name='prop.cloud-region.cloud-owner' value='`$pnf-topology-operation-input.pnf-request-input.cloud-owner`' />\r
+                    </set>\r
+                </outcome>\r
+            </switch>\r
             <switch test='`$pnf-topology-operation-input.pnf-request-input.cloud-owner`'>\r
                 <outcome value=''>\r
                     <block></block>\r
index 923303a..081a4e3 100644 (file)
@@ -7,6 +7,13 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
                 <parameter name='contextPrefix' value='prop' />\r
             </execute>\r
+            <switch test="`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner != ''`">\r
+                <outcome value='true'>\r
+                    <set>\r
+                        <parameter name='prop.cloud-region.cloud-owner' value='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`' />\r
+                    </set>\r
+                </outcome>\r
+            </switch>\r
             <set>\r
                 <parameter name="so.ack-final-indicator" value="Y" />\r
                 <parameter name="so.response-code" value="500" />\r
index 5260147..9d1f3ca 100644 (file)
@@ -7,6 +7,13 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
                 <parameter name='contextPrefix' value='prop' />\r
             </execute>\r
+            <switch test="`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner != ''`">\r
+                <outcome value='true'>\r
+                    <set>\r
+                        <parameter name='prop.cloud-region.cloud-owner' value='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`' />\r
+                    </set>\r
+                </outcome>\r
+            </switch>\r
             <switch test='`$vf-module-topology-operation-input.vf-module-request-input.cloud-owner`'>\r
                 <outcome value=''>\r
                     <block></block>\r
@@ -1430,4 +1437,4 @@ key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id
             </switch>\r
         </block>\r
     </method>\r
-</service-logic>\r
+</service-logic>
\ No newline at end of file
index 61b4226..acb3c1c 100644 (file)
@@ -7,6 +7,13 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
                 <parameter name='contextPrefix' value='prop' />\r
             </execute>\r
+            <switch test="`$vnf-topology-operation-input.vnf-request-input.cloud-owner != ''`">\r
+                <outcome value='true'>\r
+                    <set>\r
+                        <parameter name='prop.cloud-region.cloud-owner' value='`$vnf-topology-operation-input.vnf-request-input.cloud-owner`' />\r
+                    </set>\r
+                </outcome>\r
+            </switch>\r
             <set>\r
                 <parameter name="so.ack-final-indicator" value="Y" />\r
                 <parameter name="so.response-code" value="500" />\r