Re-attaching VoLTE and CCVPN DGs

Changes include: Changes to main DG to re-attach VoLTE and CCVPN sub DGs. Change-Id: I217708ac49d34706cd2f6f12c68c2929248abd96 Issue-ID: SDNC-356 Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com> Former-commit-id: 5d3980c28f3c5d16d49f8a6edacfacc0b161d01e
author: gaurav <gaurav.agrawal@huawei.com> 2018-07-31 16:06:52 +0530
committer: gaurav <gaurav.agrawal@huawei.com> 2018-07-31 16:06:52 +0530
commit: 7f6d320ccf47539d9baaaf177b0650d41bd12230 (patch)
tree: 109fa3746d14c9d834303f6cd2c09ae31e2c8579
parent: b08903f327f974cacb6a97737f9f3911d779eaa9 (diff)
9 files changed, 5328 insertions, 210 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json
index f2b4699b..25978d1d 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json
@@ -1 +1,1596 @@
-[{"id":"80860971.7a2d98","type":"dgstart","name":"DGSTART","outputs":1,"x":260.00390625,"y":120.00390625,"z":"9e04e9a4.f67a48","wires":[["35321753.65a598"]]},{"id":"35321753.65a598","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":341.9562683105469,"y":160.242018699646,"z":"9e04e9a4.f67a48","wires":[["21839cd6.ba0e34"]]},{"id":"21839cd6.ba0e34","type":"method","name":"network-topology-operation","xml":"<method rpc='network-topology-operation' mode='sync'>\n","comments":"","outputs":1,"x":321.4325408935547,"y":211.0039119720459,"z":"9e04e9a4.f67a48","wires":[["af3458e2.edff98"]]},{"id":"3b04215d.2645ae","type":"comment","name":" NETWORK-TOPOLOGY-OPERATION ","info":"","comments":"","x":654.348762512207,"y":67.59025001525879,"z":"9e04e9a4.f67a48","wires":[]},{"id":"af3458e2.edff98","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":374.0039367675781,"y":283.44738960266113,"z":"9e04e9a4.f67a48","wires":[["785c802c.065ba","1d399d6e.1c4783","13771147.44e61f","1e0000f5.f479bf"]]},{"id":"785c802c.065ba","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":604.0873107910156,"y":998.5400505065918,"z":"9e04e9a4.f67a48","wires":[]},{"id":"1d399d6e.1c4783","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":600.7181701660156,"y":513.861083984375,"z":"9e04e9a4.f67a48","wires":[["1793dad0.8ae325","4ff33a14.aa46b4","8b320f87.323ed","c7c6e669.4c0ea8","82971b8d.ec65e8","e560f1d4.fee42"]]},{"id":"1793dad0.8ae325","type":"other","name":"assign","xml":"<outcome value='assign'>\n","comments":"","outputs":1,"x":821.1943664550781,"y":376.1467342376709,"z":"9e04e9a4.f67a48","wires":[["f45218dc.949518"]]},{"id":"f45218dc.949518","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1002.4325256347656,"y":377.1468563079834,"z":"9e04e9a4.f67a48","wires":[["a8240529.3feab8"]]},{"id":"13771147.44e61f","type":"call","name":"call GENERIC-RESOURCE-API:validate-network-input","xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-network-input' mode='sync' >\n","comments":"","outputs":1,"x":732.00390625,"y":284.00390625,"z":"9e04e9a4.f67a48","wires":[[]]},{"id":"4ff33a14.aa46b4","type":"other","name":"activate","xml":"<outcome value='activate'>\n","comments":"","outputs":1,"x":823.00390625,"y":464.00390625,"z":"9e04e9a4.f67a48","wires":[["7c3e19c4.ef5188"]]},{"id":"7c3e19c4.ef5188","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1007.2420654296875,"y":465.0040283203125,"z":"9e04e9a4.f67a48","wires":[["6e412045.72665","a75318f4.373a38","f9bd493e.491498"]]},{"id":"f1bdf407.7a7098","type":"call","name":"call GENERIC-RESOURCE-API:network-topology-operation-activate","xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-activate' mode='sync' >\n","comments":"","outputs":1,"x":2171.0636978149414,"y":920.6111240386963,"z":"9e04e9a4.f67a48","wires":[[]]},{"id":"8b320f87.323ed","type":"other","name":"deactivate","xml":"<outcome value='deactivate'>\n","comments":"","outputs":1,"x":812.00390625,"y":624.0039310455322,"z":"9e04e9a4.f67a48","wires":[["7b681dba.6ee5b4"]]},{"id":"7b681dba.6ee5b4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":993.2420654296875,"y":625.0040531158447,"z":"9e04e9a4.f67a48","wires":[["6e412045.72665","785b82f7.c95c3c","f9bd493e.491498"]]},{"id":"785b82f7.c95c3c","type":"call","name":"call GENERIC-RESOURCE-API:network-topology-operation-deactivate","xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-deactivate' mode='sync' >\n","comments":"","outputs":1,"x":1499.2303009033203,"y":1008.8611717224121,"z":"9e04e9a4.f67a48","wires":[[]]},{"id":"c7c6e669.4c0ea8","type":"other","name":"unassign","xml":"<outcome value='unassign'>\n","comments":"","outputs":1,"x":820.00390625,"y":689.0039310455322,"z":"9e04e9a4.f67a48","wires":[["6ddc5a42.cfe224"]]},{"id":"6ddc5a42.cfe224","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1001.2420654296875,"y":690.0040531158447,"z":"9e04e9a4.f67a48","wires":[["6e412045.72665","462ccc94.6beb64","f9bd493e.491498"]]},{"id":"48de2ebb.c0365","type":"call","name":"call GENERIC-RESOURCE-API:network-topology-operation-unassign","xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' >\n","comments":"","outputs":1,"x":2166.81356048584,"y":1114.1110935211182,"z":"9e04e9a4.f67a48","wires":[[]]},{"id":"82971b8d.ec65e8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":811.0039100646973,"y":749.0039215087891,"z":"9e04e9a4.f67a48","wires":[["148d6e51.ec1a92"]]},{"id":"148d6e51.ec1a92","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-action is a required input\" />\n","comments":"","x":993.00390625,"y":748.0039310455322,"z":"9e04e9a4.f67a48","wires":[]},{"id":"1e0000f5.f479bf","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":623.1150054931641,"y":957.6983890533447,"z":"9e04e9a4.f67a48","wires":[]},{"id":"4eefcd8e.4dcfc4","type":"for","name":"for nidx..service-data.networks.network[]","xml":"<for index='nidx' start='0' end='`$service-data.networks.network_length`' >\n","comments":"","outputs":1,"x":2041.7342681884766,"y":520.765832901001,"z":"9e04e9a4.f67a48","wires":[["1628ac3e.d64384"]]},{"id":"6e412045.72665","type":"switchNode","name":"switch service-data.networks.network_length","xml":"<switch test='`$service-data.networks.network_length`'>\n","comments":"","outputs":1,"x":1319.1984252929688,"y":489.08722496032715,"z":"9e04e9a4.f67a48","wires":[["ad0b44f0.57c218","c8bc796a.7462d8"]]},{"id":"ad0b44f0.57c218","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1618.4483032226562,"y":487.3372230529785,"z":"9e04e9a4.f67a48","wires":[["4cf192f7.6ad02c"]]},{"id":"c8bc796a.7462d8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1572.4483337402344,"y":520.3372440338135,"z":"9e04e9a4.f67a48","wires":[["f7a3bf51.65627"]]},{"id":"1628ac3e.d64384","type":"switchNode","name":"switch networkid found","xml":"<switch test=\"`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n","comments":"","outputs":1,"x":2332.1628189086914,"y":520.0159168243408,"z":"9e04e9a4.f67a48","wires":[["8dbd4d82.f084c"]]},{"id":"8dbd4d82.f084c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2521.1151733398438,"y":520.908655166626,"z":"9e04e9a4.f67a48","wires":[["9cf530e.b6158d"]]},{"id":"9cf530e.b6158d","type":"set","name":"set tmp.nidx and network-data","xml":"<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />\n","comments":"","x":2754.646942138672,"y":519.6586627960205,"z":"9e04e9a4.f67a48","wires":[]},{"id":"371caf2.937dc5","type":"comment","name":"Find the index to service data for this network - save id in tmp.nidx, save service-data","info":"","comments":"","x":1498.5594482421875,"y":454.33723640441895,"z":"9e04e9a4.f67a48","wires":[]},{"id":"ccc1a22f.17742","type":"comment","name":"service-data  will not be stored until we have a network-id","info":"","comments":"","x":1325.6707000732422,"y":65.22616004943848,"z":"9e04e9a4.f67a48","wires":[]},{"id":"4cf192f7.6ad02c","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-topology-operation-input.network-request-input.network-id not found in service-data\" />\n","comments":"","x":1810.2258605957031,"y":485.2262210845947,"z":"9e04e9a4.f67a48","wires":[]},{"id":"f7a3bf51.65627","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1739.7182998657227,"y":519.8918209075928,"z":"9e04e9a4.f67a48","wires":[["4eefcd8e.4dcfc4","d4dba645.f19fb8"]]},{"id":"d4dba645.f19fb8","type":"switchNode","name":"switch tmp.nidx ","xml":"<switch test=\"`$tmp.nidx`\">\n\n","comments":"","outputs":1,"x":1968.7858123779297,"y":570.2490320205688,"z":"9e04e9a4.f67a48","wires":[["d8ff3217.6edda","87d798a7.78ab9"]]},{"id":"c07f7024.caab9","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-topology-operation-input.network-request-input.network-id not found in service-data\" />\n","comments":"","x":2321.642795562744,"y":565.9632740020752,"z":"9e04e9a4.f67a48","wires":[]},{"id":"d8ff3217.6edda","type":"outcome","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":2140.2143478393555,"y":568.8204174041748,"z":"9e04e9a4.f67a48","wires":[["c07f7024.caab9"]]},{"id":"a75318f4.373a38","type":"switchNode","name":"switch network-level-oper-status","xml":"<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1384.0319290161133,"y":920.5625247955322,"z":"9e04e9a4.f67a48","wires":[["2e5752c8.ad50fe","bbfd426a.a73de"]]},{"id":"2e5752c8.ad50fe","type":"outcome","name":"outcome PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":1749.0319086710606,"y":920.5625095367432,"z":"9e04e9a4.f67a48","wires":[["f1bdf407.7a7098"]]},{"id":"bbfd426a.a73de","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1699.0319557189941,"y":960.5625400543213,"z":"9e04e9a4.f67a48","wires":[["aebde0b1.1a71b"]]},{"id":"aebde0b1.1a71b","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 is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />","comments":"","x":1869.0319557189941,"y":960.5625400543213,"z":"9e04e9a4.f67a48","wires":[]},{"id":"462ccc94.6beb64","type":"switchNode","name":"switch network-level-oper-status","xml":"<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1373.6349411010742,"y":1115.715295791626,"z":"9e04e9a4.f67a48","wires":[["291e18de.cf7f18","c96c41cb.84c93","851864a5.fcbbb8"]]},{"id":"291e18de.cf7f18","type":"outcome","name":"outcome PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":1733.634910583496,"y":1115.715326309204,"z":"9e04e9a4.f67a48","wires":[["48de2ebb.c0365"]]},{"id":"c96c41cb.84c93","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1689.3848342895508,"y":1187.215389251709,"z":"9e04e9a4.f67a48","wires":[["79b40969.543ca8"]]},{"id":"79b40969.543ca8","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 is not in appropriate state for unassign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />","comments":"","x":1880.7182540893555,"y":1185.8820180892944,"z":"9e04e9a4.f67a48","wires":[]},{"id":"851864a5.fcbbb8","type":"outcome","name":"outcome PendingDelete","xml":"<outcome value='PendingDelete'>\n","comments":"","outputs":1,"x":1736.865135192871,"y":1153.562494277954,"z":"9e04e9a4.f67a48","wires":[["48de2ebb.c0365"]]},{"id":"e560f1d4.fee42","type":"other","name":"changeassign","xml":"<outcome value='changeassign'>","comments":"","outputs":1,"x":837.0039463043213,"y":550.0039367675781,"z":"9e04e9a4.f67a48","wires":[["ce44237c.5be2d"]]},{"id":"ce44237c.5be2d","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1016.25390625,"y":550.00390625,"z":"9e04e9a4.f67a48","wires":[["6e412045.72665","7ac1b98d.08b398"]]},{"id":"4f7c4ca5.5a39c4","type":"call","name":"call GENERIC-RESOURCE-API:network-topology-operation-assign","xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign' mode='sync' >\n","comments":"","outputs":1,"x":2050.004066467285,"y":334.0039176940918,"z":"9e04e9a4.f67a48","wires":[[]]},{"id":"a8240529.3feab8","type":"switchNode","name":"switch network-level-oper-status","xml":"<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1364.9721374511719,"y":293.95530700683594,"z":"9e04e9a4.f67a48","wires":[["7517ea2b.0da5b4","db31cd1e.e0cfa","93d594a7.6eeac8","9e432f80.85537"]]},{"id":"7517ea2b.0da5b4","type":"outcome","name":"outcome PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":1731.97216796875,"y":291.95529079437256,"z":"9e04e9a4.f67a48","wires":[["b3c7f566.404088"]]},{"id":"db31cd1e.e0cfa","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1679.9721641540527,"y":333.955322265625,"z":"9e04e9a4.f67a48","wires":[["4f7c4ca5.5a39c4"]]},{"id":"b3c7f566.404088","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 is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />","comments":"","x":2006.9723892211914,"y":287.9553394317627,"z":"9e04e9a4.f67a48","wires":[]},{"id":"9e432f80.85537","type":"outcome","name":"outcome PendingDelete","xml":"<outcome value='PendingDelete'>\n","comments":"","outputs":1,"x":1730.00390625,"y":257.00390625,"z":"9e04e9a4.f67a48","wires":[["b3c7f566.404088"]]},{"id":"93d594a7.6eeac8","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":1710.0039443969727,"y":222.00390815734863,"z":"9e04e9a4.f67a48","wires":[["b3c7f566.404088"]]},{"id":"7ac1b98d.08b398","type":"call","name":"call GENERIC-RESOURCE-API:network-topology-operation-changeassign","xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-changeassign' mode='sync' >\n","comments":"","outputs":1,"x":1476.2501754760742,"y":852.5000152587891,"z":"9e04e9a4.f67a48","wires":[[]]},{"id":"7e310ca2.ddc884","type":"set","name":"set object-path","xml":"<set>\n<parameter name='network-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/'\n + $networkId\n + '/network-data/network-topology/'` \" />\n \n","comments":"","x":632.5048828125,"y":863.7548828125,"z":"9e04e9a4.f67a48","wires":[]},{"id":"e15e95da.0c5038","type":"set","name":"set networkId","xml":"<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n","comments":"","x":626.7905158996582,"y":826.6119909286499,"z":"9e04e9a4.f67a48","wires":[]},{"id":"27b6f380.c84aac","type":"set","name":"set network-level-oper-status","xml":"<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n","comments":"","x":674.7905769348145,"y":909.1833562850952,"z":"9e04e9a4.f67a48","wires":[]},{"id":"f9bd493e.491498","type":"switchNode","name":"switch network-information.network-instance-group-id","xml":"<switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>\n\n","comments":"","outputs":1,"x":1388.4423828125,"y":642.5048828125,"z":"9e04e9a4.f67a48","wires":[["9633a29a.a507e","9354dc6d.8f6cb"]]},{"id":"9633a29a.a507e","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1678.1922721862793,"y":672.6715660095215,"z":"9e04e9a4.f67a48","wires":[["f073821e.dc605"]]},{"id":"9354dc6d.8f6cb","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1675.8591690063477,"y":639.6714401245117,"z":"9e04e9a4.f67a48","wires":[["96d8f132.2319d"]]},{"id":"96d8f132.2319d","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='' value='' />\n","comments":"","x":1836.192398071289,"y":636.6714973449707,"z":"9e04e9a4.f67a48","wires":[]},{"id":"869d510a.11315","type":"switchNode","name":"service-data.network-instance-groups.network-instance-group_length","xml":"<switch test='`$service-data.network-instance-groups.network-instance-group_length`'>\n","comments":"","outputs":1,"x":2162.267951965332,"y":670.9373474121094,"z":"9e04e9a4.f67a48","wires":[["6c9060fd.81509","523bb131.81c94"]]},{"id":"6c9060fd.81509","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":2527.5177307128906,"y":672.9373207092285,"z":"9e04e9a4.f67a48","wires":[["2843030f.4bc7ec"]]},{"id":"523bb131.81c94","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2507.5177307128906,"y":707.9373207092285,"z":"9e04e9a4.f67a48","wires":[["7ff73a97.aa0634"]]},{"id":"f073821e.dc605","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1812.3035278320312,"y":673.1159706115723,"z":"9e04e9a4.f67a48","wires":[["869d510a.11315"]]},{"id":"f3155af3.fb2478","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3937.511589050293,"y":713.1479244232178,"z":"9e04e9a4.f67a48","wires":[["1b137fef.7ea88"]]},{"id":"bf03131d.937eb","type":"set","name":"set tmp.ngidx and ctx.network-instance-group-data","xml":"<set>\n<parameter name='tmp.ngidx' value='`$ngidx`' />\n<parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />\n","comments":"","x":4380.043556213379,"y":712.89794921875,"z":"9e04e9a4.f67a48","wires":[]},{"id":"1b137fef.7ea88","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":4086.130027770996,"y":713.0051097869873,"z":"9e04e9a4.f67a48","wires":[["bf03131d.937eb"]]},{"id":"4ff03708.0c0798","type":"for","name":"for ngidx..service-data.network-instance-groups.network-instance-group[]","xml":"<for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >\n","comments":"","outputs":1,"x":3114.379951477051,"y":711.2548971176147,"z":"9e04e9a4.f67a48","wires":[["c86f06ee.494348"]]},{"id":"c86f06ee.494348","type":"switchNode","name":"switch network-instance-group-id found","xml":"<switch test=\"`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`\">\n\n","comments":"","outputs":1,"x":3559.808547973633,"y":711.0050659179688,"z":"9e04e9a4.f67a48","wires":[["f3155af3.fb2478"]]},{"id":"7ff73a97.aa0634","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2726.3638305664062,"y":709.1308221817017,"z":"9e04e9a4.f67a48","wires":[["4ff03708.0c0798"]]},{"id":"2843030f.4bc7ec","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-topology-operation-input.network-request-input.network-instance-group-id not found in service-data\" />\n","comments":"","x":2719.0673828125,"y":672.5048875808716,"z":"9e04e9a4.f67a48","wires":[]},{"id":"87d798a7.78ab9","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2139.75,"y":599.75,"z":"9e04e9a4.f67a48","wires":[["489f12a9.f43554"]]},{"id":"489f12a9.f43554","type":"set","name":"set nidx","xml":"<set>\n<parameter name='nidx' value='`$tmp.nidx`' />\n","comments":"","x":2296.75,"y":600.75,"z":"9e04e9a4.f67a48","wires":[]}]
-\ No newline at end of file
+[
+  {
+    "id": "d276ec27.0866",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 136.1214714050293,
+    "y": 82.77775192260742,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "66987af3.af1924"
+      ]
+    ]
+  },
+  {
+    "id": "66987af3.af1924",
+    "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": 218.07383346557617,
+    "y": 123.01586437225342,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "f1b0134c.c5b0a"
+      ]
+    ]
+  },
+  {
+    "id": "f1b0134c.c5b0a",
+    "type": "method",
+    "name": "network-topology-operation",
+    "xml": "<method rpc='network-topology-operation' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 197.55010604858398,
+    "y": 173.77775764465332,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "c003577e.c54298"
+      ]
+    ]
+  },
+  {
+    "id": "7056cdf4.c4bad4",
+    "type": "comment",
+    "name": " NETWORK-TOPOLOGY-OPERATION ",
+    "info": "",
+    "comments": "",
+    "x": 530.4663276672363,
+    "y": 30.36409568786621,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "c003577e.c54298",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 250.12150192260742,
+    "y": 246.22123527526855,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "652c71cd.5bf74",
+        "dda0c26b.24c19",
+        "f618f19d.3c0f3",
+        "df1e6363.a8583"
+      ]
+    ]
+  },
+  {
+    "id": "652c71cd.5bf74",
+    "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": 454.2048759460449,
+    "y": 1272.3138885498047,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "dda0c26b.24c19",
+    "type": "switchNode",
+    "name": "switch svc-action",
+    "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 476.8357353210449,
+    "y": 476.6349296569824,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "a977edb.79e281",
+        "8c392a7f.92a2a8",
+        "3ca5b98a.51cfb6",
+        "3092b4a7.3417bc",
+        "c46511e9.7ee6f",
+        "c11431a0.2a357",
+        "4adddee6.536c1",
+        "a471ef3a.82ee1"
+      ]
+    ]
+  },
+  {
+    "id": "a977edb.79e281",
+    "type": "other",
+    "name": "assign",
+    "xml": "<outcome value='assign'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 691.3119735717773,
+    "y": 248.9206085205078,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "2d6049f7.1b6df6"
+      ]
+    ]
+  },
+  {
+    "id": "2d6049f7.1b6df6",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 863.5501441955566,
+    "y": 246.92073726654053,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "9557e9f.7417f18"
+      ]
+    ]
+  },
+  {
+    "id": "f618f19d.3c0f3",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:validate-network-input",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-network-input' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 587.1214599609375,
+    "y": 186.77775883674622,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "8c392a7f.92a2a8",
+    "type": "other",
+    "name": "activate",
+    "xml": "<outcome value='activate'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 694.1215133666992,
+    "y": 338.7777462005615,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "6976ed5b.280d44"
+      ]
+    ]
+  },
+  {
+    "id": "a8c8cbe2.91bf68",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1070.359764099121,
+    "y": 415.77792835235596,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "90460675.cf5568",
+        "ec32e473.a43f78",
+        "e36653ec.961d4"
+      ]
+    ]
+  },
+  {
+    "id": "994ac0b1.0c869",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:network-topology-operation-activate",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-activate' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2335.1813583374023,
+    "y": 865.3849945068359,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "3ca5b98a.51cfb6",
+    "type": "other",
+    "name": "deactivate",
+    "xml": "<outcome value='deactivate'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 688.1215057373047,
+    "y": 570.7777442932129,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "48d75ce9.275f44"
+      ]
+    ]
+  },
+  {
+    "id": "6b404d95.49ee94",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1084.3596878051758,
+    "y": 703.7780342102051,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "90460675.cf5568",
+        "2838a9bc.3fa006",
+        "e36653ec.961d4"
+      ]
+    ]
+  },
+  {
+    "id": "2838a9bc.3fa006",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:network-topology-operation-deactivate",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-deactivate' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1663.3479614257812,
+    "y": 953.6350421905518,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "3092b4a7.3417bc",
+    "type": "other",
+    "name": "unassign",
+    "xml": "<outcome value='unassign'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 679.1214828491211,
+    "y": 760.7777938842773,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "2cde702d.cb5cf"
+      ]
+    ]
+  },
+  {
+    "id": "2cde702d.cb5cf",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 860.3596420288086,
+    "y": 761.7779159545898,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "90460675.cf5568",
+        "cba3cf9d.18a25",
+        "e36653ec.961d4"
+      ]
+    ]
+  },
+  {
+    "id": "f781dfc6.aa561",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:network-topology-operation-unassign",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2330.931221008301,
+    "y": 1058.8849639892578,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "c46511e9.7ee6f",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 663.1214828491211,
+    "y": 1015.7777905464172,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "31c67734.03c588"
+      ]
+    ]
+  },
+  {
+    "id": "31c67734.03c588",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-action is a required input\" />\n",
+    "comments": "",
+    "x": 845.1214790344238,
+    "y": 1014.7778000831604,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "df1e6363.a8583",
+    "type": "set",
+    "name": "Set final indicator to Y",
+    "xml": "<set>\n<parameter name=\"ack-final\" value=\"Y\"/>",
+    "comments": "",
+    "x": 473.23257064819336,
+    "y": 1231.4722270965576,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "d669adab.d2ab4",
+    "type": "for",
+    "name": "for nidx..service-data.networks.network[]",
+    "xml": "<for index='nidx' start='0' end='`$service-data.networks.network_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2205.8519287109375,
+    "y": 465.5397033691406,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "b88a3bc.7eab6c8"
+      ]
+    ]
+  },
+  {
+    "id": "90460675.cf5568",
+    "type": "switchNode",
+    "name": "switch service-data.networks.network_length",
+    "xml": "<switch test='`$service-data.networks.network_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1483.3160858154297,
+    "y": 433.8610954284668,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "b10bb014.abf41",
+        "d3656963.b69488"
+      ]
+    ]
+  },
+  {
+    "id": "b10bb014.abf41",
+    "type": "other",
+    "name": "outcome Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1782.5659637451172,
+    "y": 432.11109352111816,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "128445f6.2b925a"
+      ]
+    ]
+  },
+  {
+    "id": "d3656963.b69488",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1736.5659942626953,
+    "y": 465.1111145019531,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "69ca6be2.c47e44"
+      ]
+    ]
+  },
+  {
+    "id": "b88a3bc.7eab6c8",
+    "type": "switchNode",
+    "name": "switch networkid found",
+    "xml": "<switch test=\"`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2496.2804794311523,
+    "y": 464.78978729248047,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "2fa14bee.cef564"
+      ]
+    ]
+  },
+  {
+    "id": "2fa14bee.cef564",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2685.2328338623047,
+    "y": 465.6825256347656,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "6f9efa6c.844604"
+      ]
+    ]
+  },
+  {
+    "id": "6f9efa6c.844604",
+    "type": "set",
+    "name": "set tmp.nidx and network-data",
+    "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />\n",
+    "comments": "",
+    "x": 2918.764602661133,
+    "y": 464.43253326416016,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "12e0a69e.bd3e39",
+    "type": "comment",
+    "name": "Find the index to service data for this network - save id in tmp.nidx, save service-data",
+    "info": "",
+    "comments": "",
+    "x": 1662.6771087646484,
+    "y": 399.1111068725586,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "1eb25cf9.844f63",
+    "type": "comment",
+    "name": "service-data  will not be stored until we have a network-id",
+    "info": "",
+    "comments": "",
+    "x": 1201.7882652282715,
+    "y": 28.0000057220459,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "128445f6.2b925a",
+    "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-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
+    "comments": "",
+    "x": 1974.343521118164,
+    "y": 430.0000915527344,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "69ca6be2.c47e44",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1903.8359603881836,
+    "y": 464.6656913757324,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "d669adab.d2ab4",
+        "afac9ad.985bc68"
+      ]
+    ]
+  },
+  {
+    "id": "afac9ad.985bc68",
+    "type": "switchNode",
+    "name": "switch tmp.nidx ",
+    "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2132.9034729003906,
+    "y": 515.0229024887085,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "c23bd54c.511518",
+        "81ca2a3e.0d6c18"
+      ]
+    ]
+  },
+  {
+    "id": "12f6b523.cb143b",
+    "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-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
+    "comments": "",
+    "x": 2485.760456085205,
+    "y": 510.73714447021484,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "c23bd54c.511518",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2304.3320083618164,
+    "y": 513.5942878723145,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "12f6b523.cb143b"
+      ]
+    ]
+  },
+  {
+    "id": "ec32e473.a43f78",
+    "type": "switchNode",
+    "name": "switch network-level-oper-status",
+    "xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1548.1495895385742,
+    "y": 865.3363952636719,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "462bf0db.4f771",
+        "a326444a.4d9638"
+      ]
+    ]
+  },
+  {
+    "id": "462bf0db.4f771",
+    "type": "outcome",
+    "name": "outcome PendingCreate",
+    "xml": "<outcome value='PendingCreate'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1913.1495691935215,
+    "y": 865.3363800048828,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "994ac0b1.0c869"
+      ]
+    ]
+  },
+  {
+    "id": "a326444a.4d9638",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1863.149616241455,
+    "y": 905.3364105224609,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "406691ae.b1b3d"
+      ]
+    ]
+  },
+  {
+    "id": "406691ae.b1b3d",
+    "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 is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
+    "comments": "",
+    "x": 2033.149616241455,
+    "y": 905.3364105224609,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "cba3cf9d.18a25",
+    "type": "switchNode",
+    "name": "switch network-level-oper-status",
+    "xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1537.7526016235352,
+    "y": 1060.4891662597656,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "f04c0e43.ba592",
+        "94dee4e8.caed68",
+        "2a14e849.1c8f28"
+      ]
+    ]
+  },
+  {
+    "id": "f04c0e43.ba592",
+    "type": "outcome",
+    "name": "outcome PendingCreate",
+    "xml": "<outcome value='PendingCreate'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1897.752571105957,
+    "y": 1060.4891967773438,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "f781dfc6.aa561"
+      ]
+    ]
+  },
+  {
+    "id": "94dee4e8.caed68",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1853.5024948120117,
+    "y": 1131.9892597198486,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "5a43e0d8.b0755"
+      ]
+    ]
+  },
+  {
+    "id": "5a43e0d8.b0755",
+    "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 is not in appropriate state for unassign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
+    "comments": "",
+    "x": 2044.8359146118164,
+    "y": 1130.655888557434,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "2a14e849.1c8f28",
+    "type": "outcome",
+    "name": "outcome PendingDelete",
+    "xml": "<outcome value='PendingDelete'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1900.982795715332,
+    "y": 1098.3363647460938,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "f781dfc6.aa561"
+      ]
+    ]
+  },
+  {
+    "id": "c11431a0.2a357",
+    "type": "other",
+    "name": "changeassign",
+    "xml": "<outcome value='changeassign'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 696.1215438842773,
+    "y": 473.77777671813965,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "2cd7c2c4.b0ed0e"
+      ]
+    ]
+  },
+  {
+    "id": "2cd7c2c4.b0ed0e",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1068.371482849121,
+    "y": 470.7777681350708,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "90460675.cf5568",
+        "f390e91b.d09948"
+      ]
+    ]
+  },
+  {
+    "id": "8700a609.f92848",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:network-topology-operation-assign",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1837.1216659545898,
+    "y": 168.77776908874512,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "9557e9f.7417f18",
+    "type": "switchNode",
+    "name": "switch network-level-oper-status",
+    "xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1133.0897216796875,
+    "y": 106.72916030883789,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "3a93c4b5.f2ff8c",
+        "2f3e0c06.82ec24",
+        "eef104f8.713bf8",
+        "760fa471.65ceac"
+      ]
+    ]
+  },
+  {
+    "id": "3a93c4b5.f2ff8c",
+    "type": "outcome",
+    "name": "outcome PendingCreate",
+    "xml": "<outcome value='PendingCreate'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1519.0897674560547,
+    "y": 126.72914218902588,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "e929e5de.80f968"
+      ]
+    ]
+  },
+  {
+    "id": "2f3e0c06.82ec24",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1467.0897636413574,
+    "y": 168.72917366027832,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "8700a609.f92848"
+      ]
+    ]
+  },
+  {
+    "id": "e929e5de.80f968",
+    "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 is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
+    "comments": "",
+    "x": 1794.089988708496,
+    "y": 122.72919082641602,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "760fa471.65ceac",
+    "type": "outcome",
+    "name": "outcome PendingDelete",
+    "xml": "<outcome value='PendingDelete'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1517.1215057373047,
+    "y": 91.77775764465332,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "e929e5de.80f968"
+      ]
+    ]
+  },
+  {
+    "id": "eef104f8.713bf8",
+    "type": "outcome",
+    "name": "outcome Created",
+    "xml": "<outcome value='Created'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1497.1215438842773,
+    "y": 56.77775955200195,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "e929e5de.80f968"
+      ]
+    ]
+  },
+  {
+    "id": "f390e91b.d09948",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:network-topology-operation-changeassign",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-changeassign' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1640.3678359985352,
+    "y": 797.2738857269287,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "f47e682e.86e828",
+    "type": "set",
+    "name": "set object-path",
+    "xml": "<set>\n<parameter name='network-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/'\n + $networkId\n + '/network-data/network-topology/'` \" />\n \n",
+    "comments": "",
+    "x": 482.6224479675293,
+    "y": 1137.528720855713,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "93c706b1.771668",
+    "type": "set",
+    "name": "set networkId",
+    "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
+    "comments": "",
+    "x": 476.9080810546875,
+    "y": 1100.3858289718628,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "8bebbe1e.84829",
+    "type": "set",
+    "name": "set network-level-oper-status",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n",
+    "comments": "",
+    "x": 524.9081420898438,
+    "y": 1182.957194328308,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "e36653ec.961d4",
+    "type": "switchNode",
+    "name": "switch network-information.network-instance-group-id",
+    "xml": "<switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1552.5600776672363,
+    "y": 629.278772354126,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "381493.7b57fb6e",
+        "860fc721.1f1a18"
+      ]
+    ]
+  },
+  {
+    "id": "381493.7b57fb6e",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1839.309959411621,
+    "y": 667.4454393386841,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "9fbd3013.47415"
+      ]
+    ]
+  },
+  {
+    "id": "860fc721.1f1a18",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1836.9768562316895,
+    "y": 634.4453134536743,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "5af426b3.790798"
+      ]
+    ]
+  },
+  {
+    "id": "5af426b3.790798",
+    "type": "returnSuccess",
+    "name": "return success",
+    "xml": "<return status='success'>\n<parameter name='' value='' />\n",
+    "comments": "",
+    "x": 1997.3100852966309,
+    "y": 631.4453706741333,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "68215b65.4e0fa4",
+    "type": "switchNode",
+    "name": "service-data.network-instance-groups.network-instance-group_length",
+    "xml": "<switch test='`$service-data.network-instance-groups.network-instance-group_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2332.38570022583,
+    "y": 660.7111883163452,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "b700bba7.772938",
+        "5a541c24.7df2a4"
+      ]
+    ]
+  },
+  {
+    "id": "b700bba7.772938",
+    "type": "other",
+    "name": "outcome Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2691.6353912353516,
+    "y": 617.7111911773682,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "e79853a5.ac004"
+      ]
+    ]
+  },
+  {
+    "id": "5a541c24.7df2a4",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2671.6353912353516,
+    "y": 652.7111911773682,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "440fa626.979958"
+      ]
+    ]
+  },
+  {
+    "id": "9fbd3013.47415",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1973.421215057373,
+    "y": 667.8898439407349,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "68215b65.4e0fa4"
+      ]
+    ]
+  },
+  {
+    "id": "b5479d1a.5649e",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4101.629249572754,
+    "y": 657.9217948913574,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "21010343.a1a7bc"
+      ]
+    ]
+  },
+  {
+    "id": "71841938.f374b8",
+    "type": "set",
+    "name": "set tmp.ngidx and ctx.network-instance-group-data",
+    "xml": "<set>\n<parameter name='tmp.ngidx' value='`$ngidx`' />\n<parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />\n",
+    "comments": "",
+    "x": 4544.16121673584,
+    "y": 657.6718196868896,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "21010343.a1a7bc",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4250.247688293457,
+    "y": 657.778980255127,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "71841938.f374b8"
+      ]
+    ]
+  },
+  {
+    "id": "4c5fe551.3b81dc",
+    "type": "for",
+    "name": "for ngidx..service-data.network-instance-groups.network-instance-group[]",
+    "xml": "<for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3278.4976119995117,
+    "y": 656.0287675857544,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "b936ff96.5eec"
+      ]
+    ]
+  },
+  {
+    "id": "b936ff96.5eec",
+    "type": "switchNode",
+    "name": "switch network-instance-group-id found",
+    "xml": "<switch test=\"`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3723.9262084960938,
+    "y": 655.7789363861084,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "b5479d1a.5649e"
+      ]
+    ]
+  },
+  {
+    "id": "440fa626.979958",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2890.481491088867,
+    "y": 653.9046926498413,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "4c5fe551.3b81dc"
+      ]
+    ]
+  },
+  {
+    "id": "e79853a5.ac004",
+    "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-topology-operation-input.network-request-input.network-instance-group-id not found in service-data\" />\n",
+    "comments": "",
+    "x": 2883.185043334961,
+    "y": 617.2787580490112,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "81ca2a3e.0d6c18",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2303.867660522461,
+    "y": 544.5238704681396,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "f6668543.543498"
+      ]
+    ]
+  },
+  {
+    "id": "f6668543.543498",
+    "type": "set",
+    "name": "set nidx",
+    "xml": "<set>\n<parameter name='nidx' value='`$tmp.nidx`' />\n",
+    "comments": "",
+    "x": 2460.867660522461,
+    "y": 545.5238704681396,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "6976ed5b.280d44",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 885.2326583862305,
+    "y": 331.2326822280884,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "91a1d59.5506628",
+        "b38072e2.360e7",
+        "9675034c.650f5"
+      ]
+    ]
+  },
+  {
+    "id": "91a1d59.5506628",
+    "type": "outcome",
+    "name": "ActivateDCINetworkInstance",
+    "xml": "<outcome value='ActivateDCINetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1145.5658798217773,
+    "y": 276.2324981689453,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "cc61e75c.f46fa8"
+      ]
+    ]
+  },
+  {
+    "id": "cc61e75c.f46fa8",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:dci-connects-network-topology-operation-activate",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-activate' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1591.5659790039062,
+    "y": 277.8993282318115,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "b38072e2.360e7",
+    "type": "outcome",
+    "name": "other",
+    "xml": "<outcome value='other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1077.5658988952637,
+    "y": 317.8992328643799,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "a8c8cbe2.91bf68"
+      ]
+    ]
+  },
+  {
+    "id": "48d75ce9.275f44",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 889.7882080078125,
+    "y": 572.6770629882812,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "1aa76512.222f4b",
+        "e4fa13e2.b067",
+        "180a8601.c0536a"
+      ]
+    ]
+  },
+  {
+    "id": "1aa76512.222f4b",
+    "type": "outcome",
+    "name": "DeactivateSOTNConnectivityInstance",
+    "xml": "<outcome value='DeactivateSOTNConnectivityInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1179.5660858154297,
+    "y": 516.8992004394531,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "e5cc673d.dff018"
+      ]
+    ]
+  },
+  {
+    "id": "e4fa13e2.b067",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1082.0110092163086,
+    "y": 602.5907745361328,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "6b404d95.49ee94"
+      ]
+    ]
+  },
+  {
+    "id": "e5cc673d.dff018",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-deactivate",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-deactivate' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1639.9232025146484,
+    "y": 518.1825275421143,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "4adddee6.536c1",
+    "type": "other",
+    "name": "create",
+    "xml": "<outcome value='create'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 669.4549331665039,
+    "y": 850.0106019973755,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "77afb22f.0154cc"
+      ]
+    ]
+  },
+  {
+    "id": "77afb22f.0154cc",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 869.7687530517578,
+    "y": 849.7882747650146,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "47caedb.c84d914",
+        "4cac5319.13eecc"
+      ]
+    ]
+  },
+  {
+    "id": "a471ef3a.82ee1",
+    "type": "other",
+    "name": "delete",
+    "xml": "<outcome value='delete'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 667.4549369812012,
+    "y": 927.0106058120728,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "841198d0.4df568"
+      ]
+    ]
+  },
+  {
+    "id": "841198d0.4df568",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 869.7431945800781,
+    "y": 928.0714063644409,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "f9d80d07.57de1",
+        "30bbe85.c379118"
+      ]
+    ]
+  },
+  {
+    "id": "17f9f788.8ff328",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1625.5661582946777,
+    "y": 1248.8993555465713,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "8b5d3c47.c2f2b"
+      ]
+    ]
+  },
+  {
+    "id": "d4f55e73.2e1c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1599.0106163024902,
+    "y": 1403.4548937240615,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "35ceb905.d5d9a6"
+      ]
+    ]
+  },
+  {
+    "id": "8b5d3c47.c2f2b",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:network-topology-operation-create",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-create' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1990.2326545715332,
+    "y": 1248.3439775863662,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "35ceb905.d5d9a6",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:network-topology-operation-delete",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-delete' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1964.010540008545,
+    "y": 1402.4548221984878,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "47caedb.c84d914",
+    "type": "outcome",
+    "name": "other",
+    "xml": "<outcome value='other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1443.7686920166016,
+    "y": 1250.6769691864029,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "17f9f788.8ff328"
+      ]
+    ]
+  },
+  {
+    "id": "4cac5319.13eecc",
+    "type": "outcome",
+    "name": "CreateSOTNConnectivityInstance",
+    "xml": "<outcome value='CreateSOTNConnectivityInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1511.4354667663574,
+    "y": 1187.4549089828506,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "10d3a091.69adcf"
+      ]
+    ]
+  },
+  {
+    "id": "10d3a091.69adcf",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-create",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-create' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1990.3242835998535,
+    "y": 1189.6770912567154,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "30bbe85.c379118",
+    "type": "outcome",
+    "name": "DeleteSOTNConnectivityInstance",
+    "xml": "<outcome value='DeleteSOTNConnectivityInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1520.8545188903809,
+    "y": 1344.6269198814407,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "735a9502.6e869c"
+      ]
+    ]
+  },
+  {
+    "id": "735a9502.6e869c",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-delete",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-delete' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1987.743335723877,
+    "y": 1346.8491021553054,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "f9d80d07.57de1",
+    "type": "outcome",
+    "name": "other",
+    "xml": "<outcome value='other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1441.187744140625,
+    "y": 1407.848980084993,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "d4f55e73.2e1c"
+      ]
+    ]
+  },
+  {
+    "id": "9675034c.650f5",
+    "type": "outcome",
+    "name": "ActivateSOTNConnectivityInstance",
+    "xml": "<outcome value='ActivateSOTNConnectivityInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1168.56591796875,
+    "y": 231.01040649414062,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "de8bdb94.3cf588"
+      ]
+    ]
+  },
+  {
+    "id": "de8bdb94.3cf588",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-activate",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-activate' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1593.7880744934082,
+    "y": 227.24494899902493,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "180a8601.c0536a",
+    "type": "outcome",
+    "name": "DeActivateDCINetworkInstance",
+    "xml": "<outcome value='DeActivateDCINetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1159.6666259765625,
+    "y": 560,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        "d9e73bb1.305be8"
+      ]
+    ]
+  },
+  {
+    "id": "d9e73bb1.305be8",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:dci-connects-network-topology-operation-deactivate",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-deactivate' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1634.666847229004,
+    "y": 558.6668181419373,
+    "z": "769245e0.4dbeec",
+    "wires": [
+      [
+        
+      ]
+    ]
+  }
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input.json
index 7d320805..581636d5 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input.json
@@ -1 +1,2265 @@
-[{"id":"a575a9c4.d386a8","type":"dgstart","name":"DGSTART","outputs":1,"x":195.00390625,"y":130.00390625,"z":"4b761587.bcd5cc","wires":[["78ce8bb5.3ca064"]]},{"id":"78ce8bb5.3ca064","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":267.28961181640625,"y":182.2420196533203,"z":"4b761587.bcd5cc","wires":[["80fe6ca3.90344"]]},{"id":"80fe6ca3.90344","type":"method","name":"validate-network-input","xml":"<method rpc='validate-network-input' mode='sync'>\n","comments":"","outputs":1,"x":267.43253326416016,"y":244.00390625,"z":"4b761587.bcd5cc","wires":[["933a60e0.2f57"]]},{"id":"933a60e0.2f57","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":280.7539520263672,"y":526.4474010467529,"z":"4b761587.bcd5cc","wires":[["16dc9200.e7ae8e","8d5f5ba0.e9ed18","78b8111a.f3016","a7f24ca4.b41d5","6496f9af.ef02c8","af3a5ed9.dde35"]]},{"id":"16dc9200.e7ae8e","type":"switchNode","name":"switch svc-request-id","xml":"<switch test='`$network-topology-operation-input.sdnc-request-header.svc-request-id`'>\n","comments":"","outputs":1,"x":597.1467666625977,"y":252.43249702453613,"z":"4b761587.bcd5cc","wires":[["e094c8c2.63f878"]]},{"id":"e094c8c2.63f878","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":822.8610709054128,"y":252.43249947684126,"z":"4b761587.bcd5cc","wires":[["b99fd027.7865b"]]},{"id":"b99fd027.7865b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-request-id is a required input\" />\n","comments":"","x":974.2896368844167,"y":252.43249756949263,"z":"4b761587.bcd5cc","wires":[]},{"id":"8d5f5ba0.e9ed18","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":585.7181396484375,"y":211.00392723083496,"z":"4b761587.bcd5cc","wires":[["e97de125.9275d"]]},{"id":"e97de125.9275d","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":821.4324913024902,"y":209.57532501220703,"z":"4b761587.bcd5cc","wires":[["f81ddcb0.227e8"]]},{"id":"f81ddcb0.227e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-action is a required input\" />\n","comments":"","x":971.4324645996094,"y":209.5753345489502,"z":"4b761587.bcd5cc","wires":[]},{"id":"78b8111a.f3016","type":"switchNode","name":"switch request-action","xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":595.7181777954102,"y":295.289644241333,"z":"4b761587.bcd5cc","wires":[["216008bf.088b78"]]},{"id":"216008bf.088b78","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":822.8610665457591,"y":295.2896532331197,"z":"4b761587.bcd5cc","wires":[["782e0756.309be8"]]},{"id":"782e0756.309be8","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=\"request-information.request-action is a required input\" />\n","comments":"","x":974.289632524763,"y":295.28965132577105,"z":"4b761587.bcd5cc","wires":[]},{"id":"a7f24ca4.b41d5","type":"switchNode","name":"switch service-instance-id","xml":"<switch test='`$network-topology-operation-input.service-information.service-instance-id`'>\n","comments":"","outputs":1,"x":604.861083984375,"y":338.00390625,"z":"4b761587.bcd5cc","wires":[["c30c9ee5.ea58"]]},{"id":"c30c9ee5.ea58","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":821.2896728515625,"y":339.00390625,"z":"4b761587.bcd5cc","wires":[["e20b6f76.38f0e"]]},{"id":"e20b6f76.38f0e","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=\"service-information.service-instance-id is a required input\" />\n","comments":"","x":979.7182006835938,"y":338.00390625,"z":"4b761587.bcd5cc","wires":[]},{"id":"6afee272.ecf31c","type":"comment","name":"validate-network-input - CHANGELOG","info":"12/8: Initial release 1.0.0","comments":"","x":480.00390625,"y":94.00390625,"z":"4b761587.bcd5cc","wires":[]},{"id":"6496f9af.ef02c8","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":582.00390625,"y":425.00390625,"z":"4b761587.bcd5cc","wires":[["62ca6cb8.0e6c14","eeec5ba1.a4cfd8","bfed0059.9a24d","5cc31e70.e63f4","fe63e819.199838"]]},{"id":"62ca6cb8.0e6c14","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":814.71826171875,"y":430.5753173828125,"z":"4b761587.bcd5cc","wires":[["b1998b37.606ca8"]]},{"id":"eeec5ba1.a4cfd8","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":820.00390625,"y":488.00390625,"z":"4b761587.bcd5cc","wires":[["4c3c9c08.6503f4"]]},{"id":"bfed0059.9a24d","type":"other","name":"deactivate","xml":"<outcome value='deactivate'>","comments":"","outputs":1,"x":826.0039367675781,"y":670.00390625,"z":"4b761587.bcd5cc","wires":[["98cf52b1.8e595"]]},{"id":"b1998b37.606ca8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":977.00390625,"y":430.00390625,"z":"4b761587.bcd5cc","wires":[["5dff0a4c.ffd994"]]},{"id":"5dff0a4c.ffd994","type":"switchNode","name":"switch request-action","xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":1197.00390625,"y":430.00390625,"z":"4b761587.bcd5cc","wires":[["442e6fae.b1604","230c2083.66128"]]},{"id":"442e6fae.b1604","type":"other","name":"CreateNetworkInstance","xml":"<outcome value='CreateNetworkInstance'>","comments":"","outputs":1,"x":1477.00390625,"y":395.00390625,"z":"4b761587.bcd5cc","wires":[["ccdeebd9.e7de18"]]},{"id":"230c2083.66128","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1426.00390625,"y":439.00390625,"z":"4b761587.bcd5cc","wires":[["9097d31d.3dbdc"]]},{"id":"9097d31d.3dbdc","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=\"request-information.request-action is required to be CreateNetworkInstance for svc-action=assign\" />\n","comments":"","x":1595.00390625,"y":439.00390625,"z":"4b761587.bcd5cc","wires":[]},{"id":"4c3c9c08.6503f4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":994.00390625,"y":488.00390625,"z":"4b761587.bcd5cc","wires":[["a78c441f.4c74f8"]]},{"id":"a78c441f.4c74f8","type":"switchNode","name":"switch request-action","xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":1211.00390625,"y":488.00390625,"z":"4b761587.bcd5cc","wires":[["a87f4a60.d57e78","188ac60b.54f75a"]]},{"id":"a87f4a60.d57e78","type":"other","name":"CreateNetworkInstance","xml":"<outcome value='CreateNetworkInstance'>","comments":"","outputs":1,"x":1492.00390625,"y":489.00390625,"z":"4b761587.bcd5cc","wires":[["fa1ba922.8fcf38"]]},{"id":"188ac60b.54f75a","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1435.00390625,"y":529.00390625,"z":"4b761587.bcd5cc","wires":[["e977befe.5e4e7"]]},{"id":"e977befe.5e4e7","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=\"request-information.request-action is required to be CreateNetworkInstance for svc-action=activate\" />\n","comments":"","x":1593.8612060546875,"y":528.4325265884399,"z":"4b761587.bcd5cc","wires":[]},{"id":"98cf52b1.8e595","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1008.0039367675781,"y":669.00390625,"z":"4b761587.bcd5cc","wires":[["118b2f7.0969dd1"]]},{"id":"118b2f7.0969dd1","type":"switchNode","name":"switch request-action","xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":1225.0039367675781,"y":669.00390625,"z":"4b761587.bcd5cc","wires":[["b89a7f5f.04c67","a53dd945.4f8148"]]},{"id":"b89a7f5f.04c67","type":"other","name":"DeleteNetworkInstance","xml":"<outcome value='DeleteNetworkInstance'>","comments":"","outputs":1,"x":1506.0039367675781,"y":670.00390625,"z":"4b761587.bcd5cc","wires":[["6d65178b.629968"]]},{"id":"a53dd945.4f8148","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1449.0039367675781,"y":710.00390625,"z":"4b761587.bcd5cc","wires":[["34091f71.54518"]]},{"id":"34091f71.54518","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=\"request-information.request-action is required to be DeleteNetworkInstance for svc-action=deactivate\" />\n","comments":"","x":1618.0040016174316,"y":712.8610677719116,"z":"4b761587.bcd5cc","wires":[]},{"id":"5cc31e70.e63f4","type":"other","name":"unassign","xml":"<outcome value='unassign'>","comments":"","outputs":1,"x":822.00390625,"y":764.0038833618164,"z":"4b761587.bcd5cc","wires":[["5cbecfd9.c1a88"]]},{"id":"5cbecfd9.c1a88","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1004.0039367675781,"y":760.00390625,"z":"4b761587.bcd5cc","wires":[["f5752367.6fda3"]]},{"id":"f5752367.6fda3","type":"switchNode","name":"switch request-action","xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":1221.0039367675781,"y":760.00390625,"z":"4b761587.bcd5cc","wires":[["43a3233a.5a8f7c","64855dd3.5b6584"]]},{"id":"43a3233a.5a8f7c","type":"other","name":"DeleteNetworkInstance","xml":"<outcome value='DeleteNetworkInstance'>","comments":"","outputs":1,"x":1502.0039367675781,"y":761.00390625,"z":"4b761587.bcd5cc","wires":[["76985808.90bf68"]]},{"id":"64855dd3.5b6584","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1445.0039367675781,"y":801.00390625,"z":"4b761587.bcd5cc","wires":[["61cea17f.1716d"]]},{"id":"61cea17f.1716d","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=\"request-information.request-action is required to be DeleteNetworkInstance for svc-action=unassign\" />\n","comments":"","x":1614.0039367675781,"y":801.00390625,"z":"4b761587.bcd5cc","wires":[]},{"id":"ccdeebd9.e7de18","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1713.00390625,"y":394.00390625,"z":"4b761587.bcd5cc","wires":[["66782d09.f4ad54","30af6b4d.2b4524","48232f31.a7802","6289cff0.f55e5","f0bb7cd0.da95f","64256824.d847c8","118b4a39.c7d006","ff9ede0b.4057d"]]},{"id":"fa1ba922.8fcf38","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1717.00390625,"y":489.00390625,"z":"4b761587.bcd5cc","wires":[["df3a697d.32edd8","66782d09.f4ad54","30af6b4d.2b4524","48232f31.a7802","6289cff0.f55e5","64256824.d847c8","118b4a39.c7d006"]]},{"id":"6d65178b.629968","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1762.0039367675781,"y":671.00390625,"z":"4b761587.bcd5cc","wires":[["df3a697d.32edd8"]]},{"id":"76985808.90bf68","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1761.0039367675781,"y":762.00390625,"z":"4b761587.bcd5cc","wires":[["df3a697d.32edd8"]]},{"id":"118b4a39.c7d006","type":"switchNode","name":"switch onap-model-information.model-uuid","xml":"<switch test='`$network-topology-operation-input.service-information.onap-model-information.model-uuid`'>\n","comments":"","outputs":1,"x":2302.170722961426,"y":1201.7539043426514,"z":"4b761587.bcd5cc","wires":[["73adb89.8153848","498ce4bd.76976c"]]},{"id":"df3a697d.32edd8","type":"switchNode","name":"switch network-information.network-id","xml":"<switch test='`$network-topology-operation-input.network-information.network-id`'>\n","comments":"","outputs":1,"x":2313.6705017089844,"y":368.670636177063,"z":"4b761587.bcd5cc","wires":[["13f55f7e.2f7e91"]]},{"id":"13f55f7e.2f7e91","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2544.384620666504,"y":368.6706600189209,"z":"4b761587.bcd5cc","wires":[["a40048df.8d3098"]]},{"id":"a40048df.8d3098","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=\"service-information.network-information.network-id is a required input\" />\n","comments":"","x":2705.8134536743164,"y":370.67065238952637,"z":"4b761587.bcd5cc","wires":[]},{"id":"d8afd46b.5089b8","type":"comment","name":"validations - required for all","info":"","comments":"","x":613.00390625,"y":168.00390625,"z":"4b761587.bcd5cc","wires":[]},{"id":"f249596c.e50498","type":"comment","name":"validations specific per svc-action","info":"","comments":"","x":625.00390625,"y":383.00390625,"z":"4b761587.bcd5cc","wires":[]},{"id":"9ffc22e8.9d37d","type":"comment","name":"network-request-information block validations","info":"","comments":"","x":2305.5040588378906,"y":1053.7539529800415,"z":"4b761587.bcd5cc","wires":[]},{"id":"66782d09.f4ad54","type":"switchNode","name":"switch network-request-information.tenant","xml":"<switch test='`$network-topology-operation-input.network-request-input.tenant`'>\n","comments":"","outputs":1,"x":2302.5040588378906,"y":1103.7539529800415,"z":"4b761587.bcd5cc","wires":[["1f3d5eac.dfe181"]]},{"id":"1f3d5eac.dfe181","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2544.2184143066406,"y":1105.7539529800415,"z":"4b761587.bcd5cc","wires":[["f9a01d6f.99ad2"]]},{"id":"f9a01d6f.99ad2","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-request-input.tenant is a required input\" />\n","comments":"","x":2695.647003173828,"y":1103.7539529800415,"z":"4b761587.bcd5cc","wires":[]},{"id":"30af6b4d.2b4524","type":"switchNode","name":"switch network-request-information.aic-cloud-region","xml":"<switch test='`$network-topology-operation-input.network-request-input.aic-cloud-region`'>\n","comments":"","outputs":1,"x":2331.5040588378906,"y":1146.7539529800415,"z":"4b761587.bcd5cc","wires":[["efd07b0.1bff288"]]},{"id":"efd07b0.1bff288","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2593.2184143066406,"y":1146.7539529800415,"z":"4b761587.bcd5cc","wires":[["321c5b8f.d40d44"]]},{"id":"321c5b8f.d40d44","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=\"service-information.network-request-information.aic-cloud-region is a required input\" />\n","comments":"","x":2757.6468811035156,"y":1145.7539529800415,"z":"4b761587.bcd5cc","wires":[]},{"id":"48232f31.a7802","type":"switchNode","name":"switch onap-model-information.model-invariant-uuid","xml":"<switch test='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`'>\n","comments":"","outputs":1,"x":2344.0040283203125,"y":877.753963470459,"z":"4b761587.bcd5cc","wires":[["e63ef562.799ef8"]]},{"id":"e63ef562.799ef8","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2629.0040893554688,"y":876.7539577484131,"z":"4b761587.bcd5cc","wires":[["53c13129.be47f"]]},{"id":"53c13129.be47f","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-information.onap-model-information.model-invariant-uuid is a required input\" />\n","comments":"","x":2780.4325561523438,"y":875.7539577484131,"z":"4b761587.bcd5cc","wires":[]},{"id":"6289cff0.f55e5","type":"switchNode","name":"switch onap-model-information.model-uuid","xml":"<switch test='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`'>\n","comments":"","outputs":1,"x":2316.1468200683594,"y":953.6111078262329,"z":"4b761587.bcd5cc","wires":[["8e68950c.ad4328"]]},{"id":"8e68950c.ad4328","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2557.1469116210938,"y":954.6110439300537,"z":"4b761587.bcd5cc","wires":[["b7375f23.a9e72"]]},{"id":"b7375f23.a9e72","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-information.onap-model-information.model-uuid is a required input\" />\n","comments":"","x":2722.5753784179688,"y":952.6110134124756,"z":"4b761587.bcd5cc","wires":[]},{"id":"d03404c6.587bf8","type":"comment","name":"network-information.onap-model-information block validations","info":"","comments":"","x":2363.1471557617188,"y":837.6111059188843,"z":"4b761587.bcd5cc","wires":[]},{"id":"64256824.d847c8","type":"switchNode","name":"switch onap-model-information.model-customization-uuid","xml":"<switch test='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`'>\n","comments":"","outputs":1,"x":2362.0039672851562,"y":912.753927230835,"z":"4b761587.bcd5cc","wires":[["f71efea5.c9c5c"]]},{"id":"f71efea5.c9c5c","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2658.0039672851562,"y":913.753927230835,"z":"4b761587.bcd5cc","wires":[["d2985d77.8ad17"]]},{"id":"d2985d77.8ad17","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-information.onap-model-information.model-customization-uuid is a required input\" />\n","comments":"","x":2805.4324340820312,"y":913.753927230835,"z":"4b761587.bcd5cc","wires":[]},{"id":"af3a5ed9.dde35","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":587.3609809875488,"y":746.6467409133911,"z":"4b761587.bcd5cc","wires":[]},{"id":"f0bb7cd0.da95f","type":"switchNode","name":"switch network-information.network-instance-group-id","xml":"<switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>\n\n","comments":"","outputs":1,"x":2346.5040283203125,"y":674.5874137878418,"z":"4b761587.bcd5cc","wires":[["662c9d71.079304","d0f5f52f.375f18"]]},{"id":"662c9d71.079304","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":2636.253917694092,"y":704.7540969848633,"z":"4b761587.bcd5cc","wires":[["25ac7c89.8ac374"]]},{"id":"d0f5f52f.375f18","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2633.92081451416,"y":671.7539710998535,"z":"4b761587.bcd5cc","wires":[["2ab9ef88.04d4d"]]},{"id":"2ab9ef88.04d4d","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='' value='' />\n","comments":"","x":2794.2540435791016,"y":668.7540283203125,"z":"4b761587.bcd5cc","wires":[]},{"id":"555a87f8.e8b208","type":"get-resource","name":"get-resource NETWORK_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid\n  and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'\n  pfx='network-model'>\n\n","comments":"","outputs":1,"x":3010.187225341797,"y":1449.4324855804443,"z":"4b761587.bcd5cc","wires":[["dae1ad8.3e15b5","23ea44a6.b4860c"]]},{"id":"b99278a2.2a4fa8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No network model found for customization UUID ' \n    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +\n    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n","comments":"","x":3504.6513671875,"y":1446.7299497127533,"z":"4b761587.bcd5cc","wires":[]},{"id":"dae1ad8.3e15b5","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":3305.901378631592,"y":1440.0871560573578,"z":"4b761587.bcd5cc","wires":[["b99278a2.2a4fa8"]]},{"id":"23ea44a6.b4860c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3299.651378631592,"y":1472.5871560573578,"z":"4b761587.bcd5cc","wires":[["b99278a2.2a4fa8"]]},{"id":"1cb5cc50.1f1354","type":"for","name":"for ngidx..service-data.network-instance-groups.network-instance-group[]","xml":"<for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >\n","comments":"","outputs":1,"x":4033.615447998047,"y":741.9484825134277,"z":"4b761587.bcd5cc","wires":[["6633224f.bb357c"]]},{"id":"529c6dcd.5923d4","type":"switchNode","name":"service-data.network-instance-groups.network-instance-group_length","xml":"<switch test='`$service-data.network-instance-groups.network-instance-group_length`'>\n","comments":"","outputs":1,"x":3120.3295974731445,"y":703.0198783874512,"z":"4b761587.bcd5cc","wires":[["d3dcb543.d2a348","20a9db4c.d3d484"]]},{"id":"d3dcb543.d2a348","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":3485.579376220703,"y":705.0198516845703,"z":"4b761587.bcd5cc","wires":[["3a5960b6.10bb4"]]},{"id":"20a9db4c.d3d484","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":3465.579376220703,"y":740.0198516845703,"z":"4b761587.bcd5cc","wires":[["f3e77f59.0aa6b"]]},{"id":"6633224f.bb357c","type":"switchNode","name":"switch network-instance-group-id found","xml":"<switch test=\"`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`\">\n\n","comments":"","outputs":1,"x":4481.54411315918,"y":741.6986656188965,"z":"4b761587.bcd5cc","wires":[["9641e6d8.090418"]]},{"id":"9641e6d8.090418","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":4727.99715423584,"y":742.5915241241455,"z":"4b761587.bcd5cc","wires":[["198f8718.01b009"]]},{"id":"9f5bddf0.3d56a","type":"set","name":"set tmp.ngidx and ctx.network-instance-group-data","xml":"<set>\n<parameter name='tmp.ngidx' value='`$ngidx`' />\n<parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />\n","comments":"","x":5170.529121398926,"y":742.3415489196777,"z":"4b761587.bcd5cc","wires":[]},{"id":"f3e77f59.0aa6b","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":3666.849395751953,"y":741.5744171142578,"z":"4b761587.bcd5cc","wires":[["1cb5cc50.1f1354"]]},{"id":"25ac7c89.8ac374","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2770.3651733398438,"y":705.1985015869141,"z":"4b761587.bcd5cc","wires":[["529c6dcd.5923d4"]]},{"id":"3a5960b6.10bb4","type":"record","name":"record","xml":"<record plugin=\"com.att.sdnctl.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API.validate-network-input\"/>\n<parameter name=\"field3\" value=\"`$network-topology-operation-input.sdnc-request-header.svc-request-id`\"/>\n<parameter name=\"field4\" value=\"Network instance group id proveded but no network instance group exists that matches\"/>\n<parameter name=\"field5\" value=\"`$network-topology-operation-input.network-information.network-instance-group-id`\"/>\n\n\n\n","comments":"","outputs":1,"x":3646.865264892578,"y":704.4484405517578,"z":"4b761587.bcd5cc","wires":[[]]},{"id":"198f8718.01b009","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":4876.615592956543,"y":742.448709487915,"z":"4b761587.bcd5cc","wires":[["9f5bddf0.3d56a"]]},{"id":"73adb89.8153848","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2567.318801879883,"y":1201.3465433120728,"z":"4b761587.bcd5cc","wires":[["cc905fa7.0179e"]]},{"id":"498ce4bd.76976c","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":2566.068836212158,"y":1373.013204574585,"z":"4b761587.bcd5cc","wires":[["e65bfc3.1eaa5"]]},{"id":"6df7a370.240b1c","type":"get-resource","name":"get-resource SERVICE_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'\n  pfx='service-model'>\n\n","comments":"","outputs":1,"x":3012.687210083008,"y":1372.4972581863403,"z":"4b761587.bcd5cc","wires":[["dd24c761.da4db8","32523dd1.040262"]]},{"id":"1fcfe42.4448d1c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n","comments":"","x":3494.7705154418945,"y":1378.74733710289,"z":"4b761587.bcd5cc","wires":[]},{"id":"dd24c761.da4db8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":3296.020595550537,"y":1374.1045529842377,"z":"4b761587.bcd5cc","wires":[["1fcfe42.4448d1c"]]},{"id":"32523dd1.040262","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3289.770595550537,"y":1406.6045529842377,"z":"4b761587.bcd5cc","wires":[["1fcfe42.4448d1c"]]},{"id":"f7fe85c3.693f98","type":"get-resource","name":"get-resource NETWORK_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid\n  and service_uuid = $service-data.service-information.onap-model-information.model-uuid'\n  pfx='network-model'>\n\n","comments":"","outputs":1,"x":3012.8732147216797,"y":1274.1548709869385,"z":"4b761587.bcd5cc","wires":[["ff530ff9.b82d1","d026e041.c8ad5"]]},{"id":"113e1d67.3f5fb3","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No network model found for customization UUID ' \n    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +\n    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n","comments":"","x":3508.3374557495117,"y":1273.4522159099579,"z":"4b761587.bcd5cc","wires":[]},{"id":"ff530ff9.b82d1","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":3309.5874671936035,"y":1266.8094222545624,"z":"4b761587.bcd5cc","wires":[["113e1d67.3f5fb3"]]},{"id":"d026e041.c8ad5","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3304.58744430542,"y":1298.059421300888,"z":"4b761587.bcd5cc","wires":[["113e1d67.3f5fb3"]]},{"id":"5528e6e9.e48998","type":"get-resource","name":"get-resource SERVICE_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'\n  pfx='service-model'>","comments":"","outputs":1,"x":3011.373245239258,"y":1200.4694242477417,"z":"4b761587.bcd5cc","wires":[["fa9735e2.86a0c8","99632634.dfe8b8"]]},{"id":"43fb1181.88123","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n","comments":"","x":3498.4566040039062,"y":1205.4696033000946,"z":"4b761587.bcd5cc","wires":[]},{"id":"fa9735e2.86a0c8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":3299.706684112549,"y":1200.8268191814423,"z":"4b761587.bcd5cc","wires":[["43fb1181.88123"]]},{"id":"99632634.dfe8b8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":3293.456684112549,"y":1233.3268191814423,"z":"4b761587.bcd5cc","wires":[["43fb1181.88123"]]},{"id":"cc905fa7.0179e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2742.643051147461,"y":1200.559371471405,"z":"4b761587.bcd5cc","wires":[["5528e6e9.e48998","f7fe85c3.693f98"]]},{"id":"e65bfc3.1eaa5","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2727.64315032959,"y":1371.8094310760498,"z":"4b761587.bcd5cc","wires":[["6df7a370.240b1c","555a87f8.e8b208"]]},{"id":"fe63e819.199838","type":"other","name":"changeassign","xml":"<outcome value='changeassign'>","comments":"","outputs":1,"x":835.0039672851562,"y":609.00390625,"z":"4b761587.bcd5cc","wires":[["c5091125.669bd"]]},{"id":"c5091125.669bd","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1020.2896118164062,"y":608.4325103759766,"z":"4b761587.bcd5cc","wires":[["a84f67a.efc5a98"]]},{"id":"a84f67a.efc5a98","type":"switchNode","name":"switch request-action","xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":1212.28955078125,"y":608.4324951171875,"z":"4b761587.bcd5cc","wires":[["418aa1fe.77858","441b97df.8981e8"]]},{"id":"418aa1fe.77858","type":"other","name":"CreateNetworkInstance","xml":"<outcome value='CreateNetworkInstance'>","comments":"","outputs":1,"x":1492.28955078125,"y":573.4324951171875,"z":"4b761587.bcd5cc","wires":[["f845b8f.2f46748"]]},{"id":"441b97df.8981e8","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1441.28955078125,"y":617.4324951171875,"z":"4b761587.bcd5cc","wires":[["5d6a1028.d64d7"]]},{"id":"5d6a1028.d64d7","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=\"request-information.request-action is required to be CreateNetworkInstance for svc-action=changeassign\" />\n","comments":"","x":1610.28955078125,"y":617.4324951171875,"z":"4b761587.bcd5cc","wires":[]},{"id":"f845b8f.2f46748","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1728.28955078125,"y":572.4324951171875,"z":"4b761587.bcd5cc","wires":[["df3a697d.32edd8","46719c95.4e3af4","48232f31.a7802","64256824.d847c8","6289cff0.f55e5","66782d09.f4ad54","30af6b4d.2b4524"]]},{"id":"46719c95.4e3af4","type":"switchNode","name":"switch network-information.from-preload","xml":"<switch test='`$network-topology-operation-input.network-information.from-preload`'>\n","comments":"","outputs":1,"x":2319.92041015625,"y":419.0039415359497,"z":"4b761587.bcd5cc","wires":[["902df62f.21c5b8"]]},{"id":"902df62f.21c5b8","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2555.634719848633,"y":419.0039415359497,"z":"4b761587.bcd5cc","wires":[["931d936c.133fa"]]},{"id":"931d936c.133fa","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-information.from-preload is a required input\" />\n","comments":"","x":2720.0633392333984,"y":417.0039415359497,"z":"4b761587.bcd5cc","wires":[]},{"id":"dab6ec6c.eee4a","type":"comment","name":"If service model uuid not passed in input, use from service-data","info":"","comments":"","x":3108.7501831054688,"y":1161.2500619888306,"z":"4b761587.bcd5cc","wires":[]},{"id":"2625936e.a0b20c","type":"comment","name":"get network and service model using input","info":"","comments":"","x":3036.250198364258,"y":1335.0000658035278,"z":"4b761587.bcd5cc","wires":[]},{"id":"ff9ede0b.4057d","type":"switchNode","name":"switch network-information.network-id","xml":"<switch test='`$network-topology-operation-input.network-information.network-id`'>\n\n","comments":"","outputs":1,"x":2323.3397064208984,"y":472.6731643676758,"z":"4b761587.bcd5cc","wires":[["c18b5326.8b0e2","574d21aa.f4822"]]},{"id":"c18b5326.8b0e2","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":2619.339656829834,"y":505.33987617492676,"z":"4b761587.bcd5cc","wires":[["95db26ad.3d98a8"]]},{"id":"574d21aa.f4822","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2617.0065536499023,"y":472.339750289917,"z":"4b761587.bcd5cc","wires":[["50e6c68c.d82018"]]},{"id":"50e6c68c.d82018","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name='' value='' />\n","comments":"","x":2777.3397827148438,"y":469.339807510376,"z":"4b761587.bcd5cc","wires":[]},{"id":"3a8a6f8b.689e","type":"for","name":"for nidx..service-data.networks.network[]","xml":"<for index='nidx' start='0' end='`$service-data.networks.network_length`' >\n","comments":"","outputs":1,"x":3767.4510803222656,"y":544.784273147583,"z":"4b761587.bcd5cc","wires":[["60a1cc9b.30be54"]]},{"id":"7a6837aa.36e728","type":"switchNode","name":"switch service-data.networks.network_length","xml":"<switch test='`$service-data.networks.network_length`'>\n","comments":"","outputs":1,"x":3027.165023803711,"y":507.3556308746338,"z":"4b761587.bcd5cc","wires":[["f6c1026.77f49","2afbf728.727d08"]]},{"id":"f6c1026.77f49","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":3316.165023803711,"y":509.35569190979004,"z":"4b761587.bcd5cc","wires":[["7ca1c1c4.b6cb"]]},{"id":"2afbf728.727d08","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":3287.415237426758,"y":544.8557472229004,"z":"4b761587.bcd5cc","wires":[["83cea7a3.463298"]]},{"id":"60a1cc9b.30be54","type":"switchNode","name":"switch networkid found","xml":"<switch test=\"`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n","comments":"","outputs":1,"x":4057.8796310424805,"y":544.0343570709229,"z":"4b761587.bcd5cc","wires":[["33437dfd.673f12"]]},{"id":"33437dfd.673f12","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":4246.831985473633,"y":544.927095413208,"z":"4b761587.bcd5cc","wires":[["a1e01eb3.375fc"]]},{"id":"8500cc55.cbbd4","type":"set","name":"set tmp.nidx and ctx.network-data","xml":"<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />\n","comments":"","x":4689.363952636719,"y":544.6771202087402,"z":"4b761587.bcd5cc","wires":[]},{"id":"83cea7a3.463298","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":3488.685256958008,"y":546.4103126525879,"z":"4b761587.bcd5cc","wires":[["3a8a6f8b.689e"]]},{"id":"ac4a28ac.0b5f78","type":"switchNode","name":"switch tmp.nidx ","xml":"<switch test=\"`$tmp.nidx`\">\n\n","comments":"","outputs":1,"x":3685.752655029297,"y":620.7674798965454,"z":"4b761587.bcd5cc","wires":[["f71b42ba.2c3d5"]]},{"id":"fcd105b3.f1f4e8","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-topology-operation-input.network-request-input.network-id not found in service-data\" />\n","comments":"","x":4040.609931945801,"y":620.4817447662354,"z":"4b761587.bcd5cc","wires":[]},{"id":"f71b42ba.2c3d5","type":"outcome","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":3857.1811904907227,"y":619.3388652801514,"z":"4b761587.bcd5cc","wires":[["fcd105b3.f1f4e8"]]},{"id":"95db26ad.3d98a8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2753.450912475586,"y":505.78428077697754,"z":"4b761587.bcd5cc","wires":[["7a6837aa.36e728"]]},{"id":"7ca1c1c4.b6cb","type":"record","name":"record","xml":"<record plugin=\"com.att.sdnctl.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API.validate-network-input\"/>\n<parameter name=\"field3\" value=\"`$network-topology-operation-input.sdnc-request-header.svc-request-id`\"/>\n<parameter name=\"field4\" value=\"Network id proveded but no network exists that matches\"/>\n<parameter name=\"field5\" value=\"`$network-topology-operation-input.network-information.network-id`\"/>\n\n\n\n","comments":"","outputs":1,"x":3477.450912475586,"y":508.78428077697754,"z":"4b761587.bcd5cc","wires":[[]]},{"id":"a1e01eb3.375fc","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":4395.450424194336,"y":544.7842807769775,"z":"4b761587.bcd5cc","wires":[["8500cc55.cbbd4"]]},{"id":"bcde6b54.161698","type":"comment","name":"1806: Removed logic that requires service data to have network if network id is passed from mso on assign","info":"","comments":"","x":3965.3399963378906,"y":582.3398523330688,"z":"4b761587.bcd5cc","wires":[]}]
-\ No newline at end of file
+[
+  {
+    "id": "aa22e363.5ad9c",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 173,
+    "y": 104,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "3634cf2d.3f674"
+      ]
+    ]
+  },
+  {
+    "id": "3634cf2d.3f674",
+    "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": 245.28570556640625,
+    "y": 156.2381134033203,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "dc6b50ac.b14ae"
+      ]
+    ]
+  },
+  {
+    "id": "dc6b50ac.b14ae",
+    "type": "method",
+    "name": "validate-network-input",
+    "xml": "<method rpc='validate-network-input' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 245.42862701416016,
+    "y": 218,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "60705b95.8e4c74"
+      ]
+    ]
+  },
+  {
+    "id": "60705b95.8e4c74",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 258.7500457763672,
+    "y": 500.44349479675293,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "424a6588.75405c",
+        "41aac9e2.714da8",
+        "34794cd4.bfbb54",
+        "aba5bba0.164998",
+        "763368b.8211298",
+        "72fc5045.064b6"
+      ]
+    ]
+  },
+  {
+    "id": "424a6588.75405c",
+    "type": "switchNode",
+    "name": "switch svc-request-id",
+    "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-request-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 575.1428604125977,
+    "y": 226.42859077453613,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "3ab28c54.b072c4"
+      ]
+    ]
+  },
+  {
+    "id": "3ab28c54.b072c4",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 800.8571646554128,
+    "y": 226.42859322684126,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "8d0406d6.b8ee88"
+      ]
+    ]
+  },
+  {
+    "id": "8d0406d6.b8ee88",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-request-id is a required input\" />\n",
+    "comments": "",
+    "x": 952.2857306344167,
+    "y": 226.42859131949263,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "41aac9e2.714da8",
+    "type": "switchNode",
+    "name": "switch svc-action",
+    "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 563.7142333984375,
+    "y": 185.00002098083496,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "cc6829d4.0c5c98"
+      ]
+    ]
+  },
+  {
+    "id": "cc6829d4.0c5c98",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 799.4285850524902,
+    "y": 183.57141876220703,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "954a45b4.c4bd48"
+      ]
+    ]
+  },
+  {
+    "id": "954a45b4.c4bd48",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-action is a required input\" />\n",
+    "comments": "",
+    "x": 949.4285583496094,
+    "y": 183.5714282989502,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "34794cd4.bfbb54",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 573.7142715454102,
+    "y": 269.285737991333,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "e865d69c.ca4628"
+      ]
+    ]
+  },
+  {
+    "id": "e865d69c.ca4628",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 800.8571602957591,
+    "y": 269.2857469831197,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "62d97ca4.f50d34"
+      ]
+    ]
+  },
+  {
+    "id": "62d97ca4.f50d34",
+    "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=\"request-information.request-action is a required input\" />\n",
+    "comments": "",
+    "x": 952.285726274763,
+    "y": 269.28574507577105,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "aba5bba0.164998",
+    "type": "switchNode",
+    "name": "switch service-instance-id",
+    "xml": "<switch test='`$network-topology-operation-input.service-information.service-instance-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 582.857177734375,
+    "y": 312,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "752234db.04545c"
+      ]
+    ]
+  },
+  {
+    "id": "752234db.04545c",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 799.2857666015625,
+    "y": 313,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "adc2cc4f.6110e"
+      ]
+    ]
+  },
+  {
+    "id": "adc2cc4f.6110e",
+    "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=\"service-information.service-instance-id is a required input\" />\n",
+    "comments": "",
+    "x": 957.7142944335938,
+    "y": 312,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "fdca37a9.e0d4a8",
+    "type": "comment",
+    "name": "validate-network-input - CHANGELOG",
+    "info": "12/8: Initial release 1.0.0",
+    "comments": "",
+    "x": 458,
+    "y": 68,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "763368b.8211298",
+    "type": "switchNode",
+    "name": "switch svc-action",
+    "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 560,
+    "y": 399,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "edb163d0.0d9bd",
+        "3d4debed.fa8d24",
+        "5911863a.931558",
+        "f57cf7c2.b3c108",
+        "7be255c0.a124ec"
+      ]
+    ]
+  },
+  {
+    "id": "edb163d0.0d9bd",
+    "type": "other",
+    "name": "assign",
+    "xml": "<outcome value='assign'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 792.71435546875,
+    "y": 404.5714111328125,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "b6d654b8.2b85d8"
+      ]
+    ]
+  },
+  {
+    "id": "3d4debed.fa8d24",
+    "type": "other",
+    "name": "activate",
+    "xml": "<outcome value='activate'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 784.0000267028809,
+    "y": 554.0000276565552,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "5e9ccb62.4b0f94"
+      ]
+    ]
+  },
+  {
+    "id": "5911863a.931558",
+    "type": "other",
+    "name": "deactivate",
+    "xml": "<outcome value='deactivate'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 778.0001068115234,
+    "y": 807.0000438690186,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "c06357f6.b66898"
+      ]
+    ]
+  },
+  {
+    "id": "b6d654b8.2b85d8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 955,
+    "y": 404,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "cc667ce6.4817a"
+      ]
+    ]
+  },
+  {
+    "id": "cc667ce6.4817a",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1175,
+    "y": 404,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "7fcba633.e86008",
+        "e47a83a1.2fbbf"
+      ]
+    ]
+  },
+  {
+    "id": "7fcba633.e86008",
+    "type": "other",
+    "name": "CreateNetworkInstance",
+    "xml": "<outcome value='CreateNetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1455,
+    "y": 369,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "90c22def.e3658"
+      ]
+    ]
+  },
+  {
+    "id": "e47a83a1.2fbbf",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1404,
+    "y": 413,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "11259f2c.2c5851"
+      ]
+    ]
+  },
+  {
+    "id": "11259f2c.2c5851",
+    "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=\"request-information.request-action is required to be CreateNetworkInstance for svc-action=assign\" />\n",
+    "comments": "",
+    "x": 1573,
+    "y": 413,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "5e9ccb62.4b0f94",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 958.0000267028809,
+    "y": 554.0000276565552,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "f4d087e.9b7c778"
+      ]
+    ]
+  },
+  {
+    "id": "f4d087e.9b7c778",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1175.0000267028809,
+    "y": 554.0000276565552,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "8b9f91c2.ef8f",
+        "e76466ea.614998",
+        "e3f71705.e890b8",
+        "3339894b.fbd566"
+      ]
+    ]
+  },
+  {
+    "id": "8b9f91c2.ef8f",
+    "type": "other",
+    "name": "CreateNetworkInstance",
+    "xml": "<outcome value='CreateNetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1456.0000267028809,
+    "y": 555.0000276565552,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "a593db30.0056b8"
+      ]
+    ]
+  },
+  {
+    "id": "e76466ea.614998",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1399.0000267028809,
+    "y": 595.0000276565552,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "e0028710.cdce68"
+      ]
+    ]
+  },
+  {
+    "id": "e0028710.cdce68",
+    "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=\"request-information.request-action is required to be CreateNetworkInstance for svc-action=activate\" />\n",
+    "comments": "",
+    "x": 1557.8573265075684,
+    "y": 594.4286479949951,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "c06357f6.b66898",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 960.0001068115234,
+    "y": 806.0000438690186,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "2c559a74.f14f66"
+      ]
+    ]
+  },
+  {
+    "id": "2c559a74.f14f66",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1177.0001068115234,
+    "y": 806.0000438690186,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "e1815270.e3769",
+        "8e7d53d0.51ae3",
+        "f6ea82e8.fb9a3",
+        "6f734fad.294d7"
+      ]
+    ]
+  },
+  {
+    "id": "e1815270.e3769",
+    "type": "other",
+    "name": "DeleteNetworkInstance",
+    "xml": "<outcome value='DeleteNetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1458.0001068115234,
+    "y": 807.0000438690186,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "936b8b06.a15328"
+      ]
+    ]
+  },
+  {
+    "id": "8e7d53d0.51ae3",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1401.0001068115234,
+    "y": 847.0000438690186,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "a2922810.d680c8"
+      ]
+    ]
+  },
+  {
+    "id": "a2922810.d680c8",
+    "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=\"request-information.request-action is required to be DeleteNetworkInstance for svc-action=deactivate\" />\n",
+    "comments": "",
+    "x": 1570.000171661377,
+    "y": 849.8572053909302,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "f57cf7c2.b3c108",
+    "type": "other",
+    "name": "unassign",
+    "xml": "<outcome value='unassign'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 774.0000762939453,
+    "y": 901.000020980835,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "e78f3cba.10d64"
+      ]
+    ]
+  },
+  {
+    "id": "e78f3cba.10d64",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 956.0001068115234,
+    "y": 897.0000438690186,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "7511951a.0ec48c"
+      ]
+    ]
+  },
+  {
+    "id": "7511951a.0ec48c",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1173.0001068115234,
+    "y": 897.0000438690186,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "f3c5d913.c4c948",
+        "42b53453.819ecc"
+      ]
+    ]
+  },
+  {
+    "id": "f3c5d913.c4c948",
+    "type": "other",
+    "name": "DeleteNetworkInstance",
+    "xml": "<outcome value='DeleteNetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1454.0001068115234,
+    "y": 898.0000438690186,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "aee90b8e.b2e688"
+      ]
+    ]
+  },
+  {
+    "id": "42b53453.819ecc",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1397.0001068115234,
+    "y": 938.0000438690186,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "ee18c342.b25c6"
+      ]
+    ]
+  },
+  {
+    "id": "ee18c342.b25c6",
+    "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=\"request-information.request-action is required to be DeleteNetworkInstance for svc-action=unassign\" />\n",
+    "comments": "",
+    "x": 1566.0001068115234,
+    "y": 938.0000438690186,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "90c22def.e3658",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1691,
+    "y": 368,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "85de231.44f83e",
+        "126ed261.6d016e",
+        "b947049a.5131d8",
+        "670aca33.70fd54",
+        "11f179e3.c70cd6",
+        "2fc8fc6.5a9a904",
+        "7f804ef3.5d76a",
+        "ba42444e.d99888"
+      ]
+    ]
+  },
+  {
+    "id": "a593db30.0056b8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1681.0000267028809,
+    "y": 555.0000276565552,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "1b080f63.6e5091",
+        "85de231.44f83e",
+        "126ed261.6d016e",
+        "b947049a.5131d8",
+        "670aca33.70fd54",
+        "2fc8fc6.5a9a904",
+        "7f804ef3.5d76a"
+      ]
+    ]
+  },
+  {
+    "id": "936b8b06.a15328",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1714.0001068115234,
+    "y": 808.0000438690186,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "1b080f63.6e5091"
+      ]
+    ]
+  },
+  {
+    "id": "aee90b8e.b2e688",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1713.0001068115234,
+    "y": 899.0000438690186,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "1b080f63.6e5091"
+      ]
+    ]
+  },
+  {
+    "id": "7f804ef3.5d76a",
+    "type": "switchNode",
+    "name": "switch onap-model-information.model-uuid",
+    "xml": "<switch test='`$network-topology-operation-input.service-information.onap-model-information.model-uuid`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2280.166816711426,
+    "y": 1175.7499980926514,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "9aa6f4b4.608f88",
+        "d32879df.ba1d98"
+      ]
+    ]
+  },
+  {
+    "id": "1b080f63.6e5091",
+    "type": "switchNode",
+    "name": "switch network-information.network-id",
+    "xml": "<switch test='`$network-topology-operation-input.network-information.network-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2291.6665954589844,
+    "y": 342.666729927063,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "9fba2200.51e6c"
+      ]
+    ]
+  },
+  {
+    "id": "9fba2200.51e6c",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2522.380714416504,
+    "y": 342.6667537689209,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "22a9013d.6fbafe"
+      ]
+    ]
+  },
+  {
+    "id": "22a9013d.6fbafe",
+    "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=\"service-information.network-information.network-id is a required input\" />\n",
+    "comments": "",
+    "x": 2683.8095474243164,
+    "y": 344.66674613952637,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "1c9e653c.7c448b",
+    "type": "comment",
+    "name": "validations - required for all",
+    "info": "",
+    "comments": "",
+    "x": 591,
+    "y": 142,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "d7960cc9.37033",
+    "type": "comment",
+    "name": "validations specific per svc-action",
+    "info": "",
+    "comments": "",
+    "x": 603,
+    "y": 357,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "87ae65e.0ad4198",
+    "type": "comment",
+    "name": "network-request-information block validations",
+    "info": "",
+    "comments": "",
+    "x": 2283.5001525878906,
+    "y": 1027.7500467300415,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "85de231.44f83e",
+    "type": "switchNode",
+    "name": "switch network-request-information.tenant",
+    "xml": "<switch test='`$network-topology-operation-input.network-request-input.tenant`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2280.5001525878906,
+    "y": 1077.7500467300415,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "9e25a0c.b03396"
+      ]
+    ]
+  },
+  {
+    "id": "9e25a0c.b03396",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2522.2145080566406,
+    "y": 1079.7500467300415,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "e6e63c4d.e8316"
+      ]
+    ]
+  },
+  {
+    "id": "e6e63c4d.e8316",
+    "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-request-input.tenant is a required input\" />\n",
+    "comments": "",
+    "x": 2673.643096923828,
+    "y": 1077.7500467300415,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "126ed261.6d016e",
+    "type": "switchNode",
+    "name": "switch network-request-information.aic-cloud-region",
+    "xml": "<switch test='`$network-topology-operation-input.network-request-input.aic-cloud-region`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2309.5001525878906,
+    "y": 1120.7500467300415,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "a58f9313.2cb"
+      ]
+    ]
+  },
+  {
+    "id": "a58f9313.2cb",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2571.2145080566406,
+    "y": 1120.7500467300415,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "8fa39600.8eb028"
+      ]
+    ]
+  },
+  {
+    "id": "8fa39600.8eb028",
+    "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=\"service-information.network-request-information.aic-cloud-region is a required input\" />\n",
+    "comments": "",
+    "x": 2735.6429748535156,
+    "y": 1119.7500467300415,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "b947049a.5131d8",
+    "type": "switchNode",
+    "name": "switch onap-model-information.model-invariant-uuid",
+    "xml": "<switch test='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2322.0001220703125,
+    "y": 851.750057220459,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "db1531a3.b01d4"
+      ]
+    ]
+  },
+  {
+    "id": "db1531a3.b01d4",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2607.0001831054688,
+    "y": 850.7500514984131,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "227885fb.36f5fa"
+      ]
+    ]
+  },
+  {
+    "id": "227885fb.36f5fa",
+    "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-information.onap-model-information.model-invariant-uuid is a required input\" />\n",
+    "comments": "",
+    "x": 2758.4286499023438,
+    "y": 849.7500514984131,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "670aca33.70fd54",
+    "type": "switchNode",
+    "name": "switch onap-model-information.model-uuid",
+    "xml": "<switch test='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2294.1429138183594,
+    "y": 927.6072015762329,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "8cf55b72.906388"
+      ]
+    ]
+  },
+  {
+    "id": "8cf55b72.906388",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2535.1430053710938,
+    "y": 928.6071376800537,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "db7c5eac.4b11f"
+      ]
+    ]
+  },
+  {
+    "id": "db7c5eac.4b11f",
+    "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-information.onap-model-information.model-uuid is a required input\" />\n",
+    "comments": "",
+    "x": 2700.5714721679688,
+    "y": 926.6071071624756,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "c03efce7.798d8",
+    "type": "comment",
+    "name": "network-information.onap-model-information block validations",
+    "info": "",
+    "comments": "",
+    "x": 2341.1432495117188,
+    "y": 811.6071996688843,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "2fc8fc6.5a9a904",
+    "type": "switchNode",
+    "name": "switch onap-model-information.model-customization-uuid",
+    "xml": "<switch test='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2340.0000610351562,
+    "y": 886.750020980835,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "4023c1f8.6bfd8"
+      ]
+    ]
+  },
+  {
+    "id": "4023c1f8.6bfd8",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2636.0000610351562,
+    "y": 887.750020980835,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "533bebda.091e34"
+      ]
+    ]
+  },
+  {
+    "id": "533bebda.091e34",
+    "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-information.onap-model-information.model-customization-uuid is a required input\" />\n",
+    "comments": "",
+    "x": 2783.4285278320312,
+    "y": 887.750020980835,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "72fc5045.064b6",
+    "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": 565.3570747375488,
+    "y": 720.6428346633911,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "11f179e3.c70cd6",
+    "type": "switchNode",
+    "name": "switch network-information.network-instance-group-id",
+    "xml": "<switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2324.5001220703125,
+    "y": 648.5835075378418,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "cdd839e9.ec2698",
+        "1d9acc4e.eabbc4"
+      ]
+    ]
+  },
+  {
+    "id": "cdd839e9.ec2698",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2614.250011444092,
+    "y": 678.7501907348633,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "c8168426.fb2778"
+      ]
+    ]
+  },
+  {
+    "id": "1d9acc4e.eabbc4",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2611.91690826416,
+    "y": 645.7500648498535,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "743b2b33.a39434"
+      ]
+    ]
+  },
+  {
+    "id": "743b2b33.a39434",
+    "type": "returnSuccess",
+    "name": "return success",
+    "xml": "<return status='success'>\n<parameter name='' value='' />\n",
+    "comments": "",
+    "x": 2772.2501373291016,
+    "y": 642.7501220703125,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "3dca2e54.ce69e2",
+    "type": "get-resource",
+    "name": "get-resource NETWORK_MODEL",
+    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid\n  and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'\n  pfx='network-model'>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2988.183319091797,
+    "y": 1423.4285793304443,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "d78da022.8cc75",
+        "f68bd615.bb51f8"
+      ]
+    ]
+  },
+  {
+    "id": "eab4a5c5.4ed798",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No network model found for customization UUID ' \n    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +\n    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
+    "comments": "",
+    "x": 3482.6474609375,
+    "y": 1420.7260434627533,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "d78da022.8cc75",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3283.897472381592,
+    "y": 1414.0832498073578,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "eab4a5c5.4ed798"
+      ]
+    ]
+  },
+  {
+    "id": "f68bd615.bb51f8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3277.647472381592,
+    "y": 1446.5832498073578,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "eab4a5c5.4ed798"
+      ]
+    ]
+  },
+  {
+    "id": "3ae0b22b.798afe",
+    "type": "for",
+    "name": "for ngidx..service-data.network-instance-groups.network-instance-group[]",
+    "xml": "<for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4011.611541748047,
+    "y": 715.9445762634277,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "4c0b1766.0a1718"
+      ]
+    ]
+  },
+  {
+    "id": "bbac62ee.a9073",
+    "type": "switchNode",
+    "name": "service-data.network-instance-groups.network-instance-group_length",
+    "xml": "<switch test='`$service-data.network-instance-groups.network-instance-group_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3098.3256912231445,
+    "y": 677.0159721374512,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "89b19017.0f661",
+        "93771b0c.2e9b98"
+      ]
+    ]
+  },
+  {
+    "id": "89b19017.0f661",
+    "type": "other",
+    "name": "outcome Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3463.575469970703,
+    "y": 679.0159454345703,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "54cf4a3b.259ea4"
+      ]
+    ]
+  },
+  {
+    "id": "93771b0c.2e9b98",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3443.575469970703,
+    "y": 714.0159454345703,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "e72fab17.7fdb88"
+      ]
+    ]
+  },
+  {
+    "id": "4c0b1766.0a1718",
+    "type": "switchNode",
+    "name": "switch network-instance-group-id found",
+    "xml": "<switch test=\"`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4459.54020690918,
+    "y": 715.6947593688965,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "3ff64f2b.a623f"
+      ]
+    ]
+  },
+  {
+    "id": "3ff64f2b.a623f",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4705.99324798584,
+    "y": 716.5876178741455,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "d394cc8b.d995"
+      ]
+    ]
+  },
+  {
+    "id": "4e382840.fb0f58",
+    "type": "set",
+    "name": "set tmp.ngidx and ctx.network-instance-group-data",
+    "xml": "<set>\n<parameter name='tmp.ngidx' value='`$ngidx`' />\n<parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />\n",
+    "comments": "",
+    "x": 5148.525215148926,
+    "y": 716.3376426696777,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "e72fab17.7fdb88",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3644.845489501953,
+    "y": 715.5705108642578,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "3ae0b22b.798afe"
+      ]
+    ]
+  },
+  {
+    "id": "c8168426.fb2778",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2748.3612670898438,
+    "y": 679.1945953369141,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "bbac62ee.a9073"
+      ]
+    ]
+  },
+  {
+    "id": "54cf4a3b.259ea4",
+    "type": "record",
+    "name": "record",
+    "xml": "<record plugin=\"com.att.sdnctl.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API.validate-network-input\"/>\n<parameter name=\"field3\" value=\"`$network-topology-operation-input.sdnc-request-header.svc-request-id`\"/>\n<parameter name=\"field4\" value=\"Network instance group id proveded but no network instance group exists that matches\"/>\n<parameter name=\"field5\" value=\"`$network-topology-operation-input.network-information.network-instance-group-id`\"/>\n\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3624.861358642578,
+    "y": 678.4445343017578,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "d394cc8b.d995",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4854.611686706543,
+    "y": 716.444803237915,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "4e382840.fb0f58"
+      ]
+    ]
+  },
+  {
+    "id": "9aa6f4b4.608f88",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2545.314895629883,
+    "y": 1175.3426370620728,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "8c6fbcac.fa3a8"
+      ]
+    ]
+  },
+  {
+    "id": "d32879df.ba1d98",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2544.064929962158,
+    "y": 1347.009298324585,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "2edd7ef0.7bc5a2"
+      ]
+    ]
+  },
+  {
+    "id": "29d015af.6147aa",
+    "type": "get-resource",
+    "name": "get-resource SERVICE_MODEL",
+    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'\n  pfx='service-model'>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2990.683303833008,
+    "y": 1346.4933519363403,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "c56537db.4b5cd8",
+        "f56013eb.5f3c2"
+      ]
+    ]
+  },
+  {
+    "id": "e084071b.6ae128",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
+    "comments": "",
+    "x": 3472.7666091918945,
+    "y": 1352.74343085289,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "c56537db.4b5cd8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3274.016689300537,
+    "y": 1348.1006467342377,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "e084071b.6ae128"
+      ]
+    ]
+  },
+  {
+    "id": "f56013eb.5f3c2",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3267.766689300537,
+    "y": 1380.6006467342377,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "e084071b.6ae128"
+      ]
+    ]
+  },
+  {
+    "id": "74e13aa.554f9c4",
+    "type": "get-resource",
+    "name": "get-resource NETWORK_MODEL",
+    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid\n  and service_uuid = $service-data.service-information.onap-model-information.model-uuid'\n  pfx='network-model'>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2990.8693084716797,
+    "y": 1248.1509647369385,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "3dd73bf.e9feec4",
+        "f85f11b9.2d393"
+      ]
+    ]
+  },
+  {
+    "id": "2b174be8.841db4",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No network model found for customization UUID ' \n    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +\n    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
+    "comments": "",
+    "x": 3486.3335494995117,
+    "y": 1247.4483096599579,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "3dd73bf.e9feec4",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3287.5835609436035,
+    "y": 1240.8055160045624,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "2b174be8.841db4"
+      ]
+    ]
+  },
+  {
+    "id": "f85f11b9.2d393",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3282.58353805542,
+    "y": 1272.055515050888,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "2b174be8.841db4"
+      ]
+    ]
+  },
+  {
+    "id": "1ce195c2.d12dca",
+    "type": "get-resource",
+    "name": "get-resource SERVICE_MODEL",
+    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'\n  pfx='service-model'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2989.369338989258,
+    "y": 1174.4655179977417,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "56a0a71d.c5d7c8",
+        "7583b82.c0af148"
+      ]
+    ]
+  },
+  {
+    "id": "c02f1c0.741dde8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
+    "comments": "",
+    "x": 3476.4526977539062,
+    "y": 1179.4656970500946,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "56a0a71d.c5d7c8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3277.702777862549,
+    "y": 1174.8229129314423,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "c02f1c0.741dde8"
+      ]
+    ]
+  },
+  {
+    "id": "7583b82.c0af148",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3271.452777862549,
+    "y": 1207.3229129314423,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "c02f1c0.741dde8"
+      ]
+    ]
+  },
+  {
+    "id": "8c6fbcac.fa3a8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2720.639144897461,
+    "y": 1174.555465221405,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "1ce195c2.d12dca",
+        "74e13aa.554f9c4"
+      ]
+    ]
+  },
+  {
+    "id": "2edd7ef0.7bc5a2",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2705.63924407959,
+    "y": 1345.8055248260498,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "29d015af.6147aa",
+        "3dca2e54.ce69e2"
+      ]
+    ]
+  },
+  {
+    "id": "7be255c0.a124ec",
+    "type": "other",
+    "name": "changeassign",
+    "xml": "<outcome value='changeassign'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 799.0000877380371,
+    "y": 675.0000276565552,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "42435c10.d44464"
+      ]
+    ]
+  },
+  {
+    "id": "42435c10.d44464",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 984.2857322692871,
+    "y": 674.4286317825317,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "713d719b.e94ab"
+      ]
+    ]
+  },
+  {
+    "id": "713d719b.e94ab",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1176.2856712341309,
+    "y": 674.4286165237427,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "de2bfa5c.7f8a68",
+        "489c8cd.789c574"
+      ]
+    ]
+  },
+  {
+    "id": "de2bfa5c.7f8a68",
+    "type": "other",
+    "name": "CreateNetworkInstance",
+    "xml": "<outcome value='CreateNetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1456.2856712341309,
+    "y": 639.4286165237427,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "ad275510.779568"
+      ]
+    ]
+  },
+  {
+    "id": "489c8cd.789c574",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1405.2856712341309,
+    "y": 683.4286165237427,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "49edc7a6.37b578"
+      ]
+    ]
+  },
+  {
+    "id": "49edc7a6.37b578",
+    "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=\"request-information.request-action is required to be CreateNetworkInstance for svc-action=changeassign\" />\n",
+    "comments": "",
+    "x": 1574.2856712341309,
+    "y": 683.4286165237427,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "ad275510.779568",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1692.2856712341309,
+    "y": 638.4286165237427,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "1b080f63.6e5091",
+        "ceb7d63d.306be8",
+        "b947049a.5131d8",
+        "2fc8fc6.5a9a904",
+        "670aca33.70fd54",
+        "85de231.44f83e",
+        "126ed261.6d016e"
+      ]
+    ]
+  },
+  {
+    "id": "ceb7d63d.306be8",
+    "type": "switchNode",
+    "name": "switch network-information.from-preload",
+    "xml": "<switch test='`$network-topology-operation-input.network-information.from-preload`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2297.91650390625,
+    "y": 393.0000352859497,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "d2c0576b.e847f8"
+      ]
+    ]
+  },
+  {
+    "id": "d2c0576b.e847f8",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2533.630813598633,
+    "y": 393.0000352859497,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "ae1d6561.2c5238"
+      ]
+    ]
+  },
+  {
+    "id": "ae1d6561.2c5238",
+    "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-information.from-preload is a required input\" />\n",
+    "comments": "",
+    "x": 2698.0594329833984,
+    "y": 391.0000352859497,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "3626c406.ab791c",
+    "type": "comment",
+    "name": "If service model uuid not passed in input, use from service-data",
+    "info": "",
+    "comments": "",
+    "x": 3086.7462768554688,
+    "y": 1135.2461557388306,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "aec34f7.d0bc6b",
+    "type": "comment",
+    "name": "get network and service model using input",
+    "info": "",
+    "comments": "",
+    "x": 3014.246292114258,
+    "y": 1308.9961595535278,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "ba42444e.d99888",
+    "type": "switchNode",
+    "name": "switch network-information.network-id",
+    "xml": "<switch test='`$network-topology-operation-input.network-information.network-id`'>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2301.3358001708984,
+    "y": 446.6692581176758,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "c0f78c23.79ac9",
+        "317f60b4.ace11"
+      ]
+    ]
+  },
+  {
+    "id": "c0f78c23.79ac9",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2597.335750579834,
+    "y": 479.33596992492676,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "a36353c9.ec25f"
+      ]
+    ]
+  },
+  {
+    "id": "317f60b4.ace11",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2595.0026473999023,
+    "y": 446.335844039917,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "4284928.5f7026c"
+      ]
+    ]
+  },
+  {
+    "id": "4284928.5f7026c",
+    "type": "returnSuccess",
+    "name": "return success",
+    "xml": "<return status='success'>\n<parameter name='' value='' />\n",
+    "comments": "",
+    "x": 2755.3358764648438,
+    "y": 443.335901260376,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "2d884755.29b488",
+    "type": "for",
+    "name": "for nidx..service-data.networks.network[]",
+    "xml": "<for index='nidx' start='0' end='`$service-data.networks.network_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3745.4471740722656,
+    "y": 518.780366897583,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "727643c7.801efc"
+      ]
+    ]
+  },
+  {
+    "id": "5d18ed5a.0f2ca4",
+    "type": "switchNode",
+    "name": "switch service-data.networks.network_length",
+    "xml": "<switch test='`$service-data.networks.network_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3005.161117553711,
+    "y": 481.3517246246338,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "2dd4f60.cfe780a",
+        "5256a6bb.4d3648"
+      ]
+    ]
+  },
+  {
+    "id": "2dd4f60.cfe780a",
+    "type": "other",
+    "name": "outcome Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3294.161117553711,
+    "y": 483.35178565979004,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "b413fbec.d3cf38"
+      ]
+    ]
+  },
+  {
+    "id": "5256a6bb.4d3648",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3265.411331176758,
+    "y": 518.8518409729004,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "d0b9665f.bb1998"
+      ]
+    ]
+  },
+  {
+    "id": "727643c7.801efc",
+    "type": "switchNode",
+    "name": "switch networkid found",
+    "xml": "<switch test=\"`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4035.8757247924805,
+    "y": 518.0304508209229,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "629bda8a.bbb3d4"
+      ]
+    ]
+  },
+  {
+    "id": "629bda8a.bbb3d4",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4224.828079223633,
+    "y": 518.923189163208,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "9044c700.05da08"
+      ]
+    ]
+  },
+  {
+    "id": "e1d58d9f.f500f",
+    "type": "set",
+    "name": "set tmp.nidx and ctx.network-data",
+    "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />\n",
+    "comments": "",
+    "x": 4667.360046386719,
+    "y": 518.6732139587402,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "d0b9665f.bb1998",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3466.681350708008,
+    "y": 520.4064064025879,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "2d884755.29b488"
+      ]
+    ]
+  },
+  {
+    "id": "312a328b.ffe99e",
+    "type": "switchNode",
+    "name": "switch tmp.nidx ",
+    "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3663.748748779297,
+    "y": 594.7635736465454,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "e7171c98.50a26"
+      ]
+    ]
+  },
+  {
+    "id": "62544a06.27e584",
+    "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-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
+    "comments": "",
+    "x": 4018.606025695801,
+    "y": 594.4778385162354,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "e7171c98.50a26",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3835.1772842407227,
+    "y": 593.3349590301514,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "62544a06.27e584"
+      ]
+    ]
+  },
+  {
+    "id": "a36353c9.ec25f",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2731.447006225586,
+    "y": 479.78037452697754,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "5d18ed5a.0f2ca4"
+      ]
+    ]
+  },
+  {
+    "id": "b413fbec.d3cf38",
+    "type": "record",
+    "name": "record",
+    "xml": "<record plugin=\"com.att.sdnctl.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API.validate-network-input\"/>\n<parameter name=\"field3\" value=\"`$network-topology-operation-input.sdnc-request-header.svc-request-id`\"/>\n<parameter name=\"field4\" value=\"Network id proveded but no network exists that matches\"/>\n<parameter name=\"field5\" value=\"`$network-topology-operation-input.network-information.network-id`\"/>\n\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3455.447006225586,
+    "y": 482.78037452697754,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "9044c700.05da08",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4373.446517944336,
+    "y": 518.7803745269775,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "e1d58d9f.f500f"
+      ]
+    ]
+  },
+  {
+    "id": "5596cb1d.c25184",
+    "type": "comment",
+    "name": "1806: Removed logic that requires service data to have network if network id is passed from mso on assign",
+    "info": "",
+    "comments": "",
+    "x": 3943.3360900878906,
+    "y": 556.3359460830688,
+    "z": "e63010f0.f0847",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "e3f71705.e890b8",
+    "type": "outcome",
+    "name": "ActivateSOTNConnectivityInstance",
+    "xml": "<outcome value='ActivateSOTNConnectivityInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1483.3333740234375,
+    "y": 482.0000648498535,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "37eb4d84.5c8452"
+      ]
+    ]
+  },
+  {
+    "id": "37eb4d84.5c8452",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1709.3333435058594,
+    "y": 482.0001106262207,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "3339894b.fbd566",
+    "type": "outcome",
+    "name": "ActivateDCINetworkInstance",
+    "xml": "<outcome value='ActivateDCINetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1471.2497787475586,
+    "y": 517.9960944652557,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "e0539f6e.35405"
+      ]
+    ]
+  },
+  {
+    "id": "e0539f6e.35405",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1684.556007385254,
+    "y": 517.0000286102295,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "f6ea82e8.fb9a3",
+    "type": "outcome",
+    "name": "DeactivateSOTNConnectivityInstance",
+    "xml": "<outcome value='DeactivateSOTNConnectivityInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1498.333381652832,
+    "y": 731.0000801086426,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "3d5611d2.6ac69e"
+      ]
+    ]
+  },
+  {
+    "id": "3d5611d2.6ac69e",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1735.333351135254,
+    "y": 731.0001258850098,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "6f734fad.294d7",
+    "type": "outcome",
+    "name": "DeActivateDCINetworkInstance",
+    "xml": "<outcome value='DeActivateDCINetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1480.5832138061523,
+    "y": 768.9960925579071,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        "8c8034c3.c3e088"
+      ]
+    ]
+  },
+  {
+    "id": "8c8034c3.c3e088",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1723.5832977294922,
+    "y": 767.0273606777191,
+    "z": "e63010f0.f0847",
+    "wires": [
+      [
+        
+      ]
+    ]
+  }
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json
index ff9108cf..f1dbe061 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json
@@ -1 +1,539 @@
-[{"id":"a6e21877.f24ac8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":182.85714721679688,"y":411.0714306150164,"z":"14473ee0.27eed1","wires":[["aeb3dd3d.b60f3","d78281b3.03ace","8ba9d563.4eefa8","44171a5c.864c24","dce8504e.ce7ca","290cb660.49e1da"]]},{"id":"aeb3dd3d.b60f3","type":"switchNode","name":"switch svc-request-id","xml":"<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`'>\n","comments":"","outputs":1,"x":465.61905670166016,"y":294.1517686843872,"z":"14473ee0.27eed1","wires":[["2b73d7ab.798568"]]},{"id":"2b73d7ab.798568","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":691.3333511352539,"y":294.1517724990845,"z":"14473ee0.27eed1","wires":[["5d6b453e.85037c"]]},{"id":"5d6b453e.85037c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-request-id is a required input\" />\n","comments":"","x":842.7619171142578,"y":294.15177059173584,"z":"14473ee0.27eed1","wires":[]},{"id":"d78281b3.03ace","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":454.1904198782786,"y":252.72320025307795,"z":"14473ee0.27eed1","wires":[["d9e6cac0.2ec958"]]},{"id":"d9e6cac0.2ec958","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":689.9047715323313,"y":251.29459803445002,"z":"14473ee0.27eed1","wires":[["30d30e25.d90862"]]},{"id":"30d30e25.d90862","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-action is a required input\" />\n","comments":"","x":839.9047448294505,"y":251.29460757119318,"z":"14473ee0.27eed1","wires":[]},{"id":"8ba9d563.4eefa8","type":"switchNode","name":"switch request-action","xml":"<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":464.1904732840403,"y":337.00891535622736,"z":"14473ee0.27eed1","wires":[["9a589f79.458aa"]]},{"id":"9a589f79.458aa","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":691.3333467756001,"y":337.00892625536244,"z":"14473ee0.27eed1","wires":[["fae9bdce.d8a23"]]},{"id":"fae9bdce.d8a23","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=\"request-information.request-action is a required input\" />\n","comments":"","x":842.761912754604,"y":337.0089243480138,"z":"14473ee0.27eed1","wires":[]},{"id":"bc0bcdb.07e573","type":"switchNode","name":"switch model-customization-id","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`'>\n","comments":"","outputs":1,"x":1053.6549949645996,"y":483.43768882751465,"z":"14473ee0.27eed1","wires":[["6ced274a.6cedf8"]]},{"id":"6ced274a.6cedf8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1258.6549949645996,"y":483.43767166137695,"z":"14473ee0.27eed1","wires":[["cf00fbbb.48a0c8"]]},{"id":"cf00fbbb.48a0c8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-information.onap-model-information.model-customization-uuid is a required input\" />\n","comments":"","x":1410.0835609436035,"y":483.4376697540283,"z":"14473ee0.27eed1","wires":[]},{"id":"4404604a.477ff","type":"switchNode","name":"switch tenant","xml":"<switch test='`$vnf-topology-operation-input.vnf-request-input.tenant`'>\n","comments":"","outputs":1,"x":999.5120735168457,"y":524.8661994934082,"z":"14473ee0.27eed1","wires":[["c08a1860.0abee8"]]},{"id":"c08a1860.0abee8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1257.226390838623,"y":524.8662338256836,"z":"14473ee0.27eed1","wires":[["a40e39ad.d4fe48"]]},{"id":"a40e39ad.d4fe48","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-information.vnf-request-input.tenant is a required input\" />\n","comments":"","x":1408.654956817627,"y":524.866231918335,"z":"14473ee0.27eed1","wires":[]},{"id":"4f2ed47.c00882c","type":"comment","name":"Validation of required fields","info":"","comments":"","x":614.1904296875,"y":208.4374828338623,"z":"14473ee0.27eed1","wires":[]},{"id":"44171a5c.864c24","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":454.4285430908203,"y":572.3661937713623,"z":"14473ee0.27eed1","wires":[["5966d5ca.06859c","5a143e3d.19f99"]]},{"id":"5966d5ca.06859c","type":"outcome","name":"assign","xml":"<outcome value='assign'>\n","comments":"","outputs":1,"x":625.2618865966797,"y":525.6995143890381,"z":"14473ee0.27eed1","wires":[["b40f533e.2834c"]]},{"id":"b40f533e.2834c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":821.9284973144531,"y":525.6995143890381,"z":"14473ee0.27eed1","wires":[["bc0bcdb.07e573","4404604a.477ff","7b51befc.a5484"]]},{"id":"5b5a81f9.83502","type":"dgstart","name":"DGSTART","outputs":1,"x":126.60715702601829,"y":80.98508262634277,"z":"14473ee0.27eed1","wires":[["e6d98786.2bba18"]]},{"id":"e6d98786.2bba18","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":239.89286259242454,"y":121.22319412231445,"z":"14473ee0.27eed1","wires":[["6d52d7c9.6618f8"]]},{"id":"6d52d7c9.6618f8","type":"method","name":"method validate-vnf-input","xml":"<method rpc='validate-vnf-input' mode='sync'>\n","comments":"","outputs":1,"x":175.28578404017844,"y":162.2350788116455,"z":"14473ee0.27eed1","wires":[["a6e21877.f24ac8"]]},{"id":"8fac3dd2.9dade","type":"comment","name":"validate-vnf-input","info":"","comments":"","x":520.9520132882253,"y":28.571426391601562,"z":"14473ee0.27eed1","wires":[]},{"id":"dce8504e.ce7ca","type":"switchNode","name":"switch service-instance-id","xml":"<switch test='`$vnf-topology-operation-input.service-information.service-instance-id`'>\n","comments":"","outputs":1,"x":477.21430424281516,"y":381.0714416503906,"z":"14473ee0.27eed1","wires":[["eedc833c.05049"]]},{"id":"eedc833c.05049","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":689.6428854806081,"y":381.07143783569336,"z":"14473ee0.27eed1","wires":[["6a84c752.bbe938"]]},{"id":"6a84c752.bbe938","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=\"service-information.service-instance-id is a required input\" />\n","comments":"","x":841.071451459612,"y":381.0714359283447,"z":"14473ee0.27eed1","wires":[]},{"id":"290cb660.49e1da","type":"switchNode","name":"switch vnf-id","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id`'>\n","comments":"","outputs":1,"x":434.7143135070801,"y":424.57143211364746,"z":"14473ee0.27eed1","wires":[["1c3dc135.7d2ccf"]]},{"id":"1c3dc135.7d2ccf","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":690.0000228881836,"y":423.1428642272949,"z":"14473ee0.27eed1","wires":[["19ddea38.2da986"]]},{"id":"19ddea38.2da986","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-information.vnf-id is a required input\" />\n","comments":"","x":841.4285888671875,"y":423.1428623199463,"z":"14473ee0.27eed1","wires":[]},{"id":"7b51befc.a5484","type":"switchNode","name":"switch aic-cloud-region","xml":"<switch test='`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`'>\n","comments":"","outputs":1,"x":1028.8571548461914,"y":567.1428565979004,"z":"14473ee0.27eed1","wires":[["99192072.8ebe6"]]},{"id":"99192072.8ebe6","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1255.5714721679688,"y":567.1428909301758,"z":"14473ee0.27eed1","wires":[["ef7e0e9e.be1a3"]]},{"id":"ef7e0e9e.be1a3","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-request-input.aic-cloud-region is a required input\" />\n","comments":"","x":1407.0000381469727,"y":567.1428890228271,"z":"14473ee0.27eed1","wires":[]},{"id":"689b51e6.78eef","type":"switchNode","name":"switch model-customization-id","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`'>\n","comments":"","outputs":1,"x":1053.3332824707031,"y":613.3333206176758,"z":"14473ee0.27eed1","wires":[["8812a9fd.905ab8"]]},{"id":"8812a9fd.905ab8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1258.3332824707031,"y":613.3333034515381,"z":"14473ee0.27eed1","wires":[["8dfbf84d.04b1c8"]]},{"id":"8dfbf84d.04b1c8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-information.onap-model-information.model-customization-uuid is a required input\" />\n","comments":"","x":1409.761848449707,"y":613.3333015441895,"z":"14473ee0.27eed1","wires":[]},{"id":"5a143e3d.19f99","type":"outcome","name":"changeassign","xml":"<outcome value='changeassign'>\n","comments":"","outputs":1,"x":643.2735023498535,"y":613.2618799209595,"z":"14473ee0.27eed1","wires":[["c2728998.ae3ef8"]]},{"id":"c2728998.ae3ef8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":823.2734909057617,"y":613.2618465423584,"z":"14473ee0.27eed1","wires":[["689b51e6.78eef"]]}]
-\ No newline at end of file
+[
+  {
+    "id": "4d9dbde4.447a44",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 201,
+    "y": 454.50000422341486,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "3551e870.dc3378",
+        "d59a7a0.dd15288",
+        "412f00f8.42659",
+        "ad77ccd2.f78fd",
+        "1d62a81d.049808"
+      ]
+    ]
+  },
+  {
+    "id": "3551e870.dc3378",
+    "type": "switchNode",
+    "name": "switch svc-request-id",
+    "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 483.7619094848633,
+    "y": 337.58034229278564,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "3219fe8b.8416b2"
+      ]
+    ]
+  },
+  {
+    "id": "3219fe8b.8416b2",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 709.476203918457,
+    "y": 337.5803461074829,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "c609015.faf"
+      ]
+    ]
+  },
+  {
+    "id": "c609015.faf",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-request-id is a required input\" />\n",
+    "comments": "",
+    "x": 860.9047698974609,
+    "y": 337.5803442001343,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "d59a7a0.dd15288",
+    "type": "switchNode",
+    "name": "switch svc-action",
+    "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 472.3332726614817,
+    "y": 296.1517738614764,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "fd07c834.04e118"
+      ]
+    ]
+  },
+  {
+    "id": "fd07c834.04e118",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 708.0476243155344,
+    "y": 294.72317164284846,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "bb67988a.7a4878"
+      ]
+    ]
+  },
+  {
+    "id": "bb67988a.7a4878",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-action is a required input\" />\n",
+    "comments": "",
+    "x": 858.0475976126536,
+    "y": 294.7231811795916,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "412f00f8.42659",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 482.33332606724343,
+    "y": 380.4374889646258,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "57d0c765.6697d8"
+      ]
+    ]
+  },
+  {
+    "id": "57d0c765.6697d8",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 709.4761995588033,
+    "y": 380.4374998637609,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "17e90205.19889e"
+      ]
+    ]
+  },
+  {
+    "id": "17e90205.19889e",
+    "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=\"request-information.request-action is a required input\" />\n",
+    "comments": "",
+    "x": 860.9047655378072,
+    "y": 380.43749795641224,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "e4e9da07.86ee68",
+    "type": "switchNode",
+    "name": "switch model-customization-id",
+    "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1071.7978477478027,
+    "y": 482.8662624359131,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "358dc8c9.934178"
+      ]
+    ]
+  },
+  {
+    "id": "358dc8c9.934178",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1276.7978477478027,
+    "y": 482.8662452697754,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "37f4df0b.c43d6"
+      ]
+    ]
+  },
+  {
+    "id": "37f4df0b.c43d6",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-information.onap-model-information.model-customization-uuid is a required input\" />\n",
+    "comments": "",
+    "x": 1428.2264137268066,
+    "y": 482.86624336242676,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "4c722c64.354684",
+    "type": "switchNode",
+    "name": "switch tenant",
+    "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.tenant`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1017.6549263000488,
+    "y": 524.2947731018066,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "d918b63c.d3c5b8"
+      ]
+    ]
+  },
+  {
+    "id": "d918b63c.d3c5b8",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1275.3692436218262,
+    "y": 524.294807434082,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "de9de378.d9dcb"
+      ]
+    ]
+  },
+  {
+    "id": "de9de378.d9dcb",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-information.vnf-request-input.tenant is a required input\" />\n",
+    "comments": "",
+    "x": 1426.79780960083,
+    "y": 524.2948055267334,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "113afb8b.5ba534",
+    "type": "comment",
+    "name": "Validation of required fields",
+    "info": "",
+    "comments": "",
+    "x": 632.3332824707031,
+    "y": 251.86605644226074,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "ad77ccd2.f78fd",
+    "type": "switchNode",
+    "name": "switch svc-action",
+    "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 472.57139587402344,
+    "y": 571.7947673797607,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "831a3f94.d6468",
+        "5be38d11.63b4f4"
+      ]
+    ]
+  },
+  {
+    "id": "831a3f94.d6468",
+    "type": "outcome",
+    "name": "assign",
+    "xml": "<outcome value='assign'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 643.4047393798828,
+    "y": 525.1280879974365,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "dd8a1fea.b5bd6"
+      ]
+    ]
+  },
+  {
+    "id": "dd8a1fea.b5bd6",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 840.0713500976562,
+    "y": 525.1280879974365,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "e4e9da07.86ee68",
+        "4c722c64.354684",
+        "3a3018b1.645408"
+      ]
+    ]
+  },
+  {
+    "id": "3ccd71b7.e4583e",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 144.7500098092214,
+    "y": 124.41365623474121,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "871c79a8.0f3e48"
+      ]
+    ]
+  },
+  {
+    "id": "871c79a8.0f3e48",
+    "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": 258.03571537562766,
+    "y": 164.6517677307129,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "4b0e51f7.20b38"
+      ]
+    ]
+  },
+  {
+    "id": "4b0e51f7.20b38",
+    "type": "method",
+    "name": "method validate-vnf-input",
+    "xml": "<method rpc='validate-vnf-input' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 193.42863682338157,
+    "y": 205.66365242004395,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "4d9dbde4.447a44"
+      ]
+    ]
+  },
+  {
+    "id": "79e58f6f.3ef1e",
+    "type": "comment",
+    "name": "validate-vnf-input",
+    "info": "",
+    "comments": "",
+    "x": 539.0948660714284,
+    "y": 72,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "1d62a81d.049808",
+    "type": "switchNode",
+    "name": "switch service-instance-id",
+    "xml": "<switch test='`$vnf-topology-operation-input.service-information.service-instance-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 495.3571570260183,
+    "y": 424.50001525878906,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "6a29ec68.3b9074"
+      ]
+    ]
+  },
+  {
+    "id": "6a29ec68.3b9074",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 707.7857382638113,
+    "y": 424.5000114440918,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "8d2c582.ae31aa8"
+      ]
+    ]
+  },
+  {
+    "id": "8d2c582.ae31aa8",
+    "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=\"service-information.service-instance-id is a required input\" />\n",
+    "comments": "",
+    "x": 859.2143042428152,
+    "y": 424.50000953674316,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "3a3018b1.645408",
+    "type": "switchNode",
+    "name": "switch aic-cloud-region",
+    "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1047.0000076293945,
+    "y": 566.5714302062988,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "6edfb4d4.a66b5c"
+      ]
+    ]
+  },
+  {
+    "id": "6edfb4d4.a66b5c",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1273.7143249511719,
+    "y": 566.5714645385742,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "e6cdd965.41bc18"
+      ]
+    ]
+  },
+  {
+    "id": "e6cdd965.41bc18",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-request-input.aic-cloud-region is a required input\" />\n",
+    "comments": "",
+    "x": 1425.1428909301758,
+    "y": 566.5714626312256,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "87424be6.6788e8",
+    "type": "switchNode",
+    "name": "switch model-customization-id",
+    "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1071.4761352539062,
+    "y": 612.7618942260742,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "8d44461a.f88fd8"
+      ]
+    ]
+  },
+  {
+    "id": "8d44461a.f88fd8",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1276.4761352539062,
+    "y": 612.7618770599365,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "50f4ef71.66b2d"
+      ]
+    ]
+  },
+  {
+    "id": "50f4ef71.66b2d",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-information.onap-model-information.model-customization-uuid is a required input\" />\n",
+    "comments": "",
+    "x": 1427.9047012329102,
+    "y": 612.7618751525879,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "5be38d11.63b4f4",
+    "type": "outcome",
+    "name": "changeassign",
+    "xml": "<outcome value='changeassign'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 661.4163551330566,
+    "y": 612.6904535293579,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "a7282aba.0b4bc8"
+      ]
+    ]
+  },
+  {
+    "id": "a7282aba.0b4bc8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 841.4163436889648,
+    "y": 612.6904201507568,
+    "z": "3f03c20b.438afe",
+    "wires": [
+      [
+        "87424be6.6788e8"
+      ]
+    ]
+  }
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
index 503525d5..4c3b2c45 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
@@ -1 +1,648 @@
-[{"id":"6ec6172c.2bcbd8","type":"dgstart","name":"DGSTART","outputs":1,"x":132.85714721679688,"y":85.71428680419922,"z":"fb3a2b3.b3cc7d8","wires":[["bfc710c7.92834"]]},{"id":"bfc710c7.92834","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":247.14285278320312,"y":125.9523983001709,"z":"fb3a2b3.b3cc7d8","wires":[["4209672b.254cc8"]]},{"id":"4209672b.254cc8","type":"method","name":"method vnf-topology-operation","xml":"<method rpc='vnf-topology-operation' mode='sync'>\n","comments":"","outputs":1,"x":199.28577423095703,"y":165.71428108215332,"z":"fb3a2b3.b3cc7d8","wires":[["d712fd97.5e8a2"]]},{"id":"682ae133.218ae","type":"comment","name":"vnf-topology-operation","info":"","comments":"","x":527.2020034790039,"y":33.30063056945801,"z":"fb3a2b3.b3cc7d8","wires":[]},{"id":"d712fd97.5e8a2","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":215.45242309570312,"y":371.9792375564575,"z":"fb3a2b3.b3cc7d8","wires":[["a487fe62.3eadf","a54dd4d9.4cd188","d8c5f774.e0b058"]]},{"id":"a487fe62.3eadf","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":500.8095245361328,"y":526.4289283752441,"z":"fb3a2b3.b3cc7d8","wires":[]},{"id":"a54dd4d9.4cd188","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":510.85709381103516,"y":370.1904811859131,"z":"fb3a2b3.b3cc7d8","wires":[["3e63698e.bd48b6","28819d17.6e1742","73ed8794.2b9c38","c822cbe5.979408","bed20936.060648","81c3ff0e.10641"]]},{"id":"3e63698e.bd48b6","type":"outcome","name":"assign","xml":"<outcome value='assign'>\n","comments":"","outputs":1,"x":708.238037109375,"y":264.23818588256836,"z":"fb3a2b3.b3cc7d8","wires":[["cf31f583.5aa0b8"]]},{"id":"28819d17.6e1742","type":"outcome","name":"unassign","xml":"<outcome value='unassign'>\n","comments":"","outputs":1,"x":712.2856597900391,"y":394.4289093017578,"z":"fb3a2b3.b3cc7d8","wires":[["3e478ce0.78e214"]]},{"id":"c822cbe5.979408","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":705.5712947845459,"y":480.0475597381592,"z":"fb3a2b3.b3cc7d8","wires":[["ca11a8cd.7cc228"]]},{"id":"ca11a8cd.7cc228","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n","comments":"","x":891.761739730835,"y":480.0476245880127,"z":"fb3a2b3.b3cc7d8","wires":[]},{"id":"d8c5f774.e0b058","type":"call","name":"call GENERIC-RESOURCE-API:validate-vnf-input","xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-vnf-input' mode='sync' >\n","comments":"","outputs":1,"x":615.2737808227539,"y":223.0953254699707,"z":"fb3a2b3.b3cc7d8","wires":[[]]},{"id":"cf31f583.5aa0b8","type":"call","name":"call GENERIC-RESOURCE-API:vnf-topology-operation-assign","xml":"<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign' mode='sync' >\n","comments":"","outputs":1,"x":1050.3808898925781,"y":263.8096466064453,"z":"fb3a2b3.b3cc7d8","wires":[[]]},{"id":"7ee102ee.2772cc","type":"call","name":"call GENERIC-RESOURCE-API:vnf-topology-operation-deactivate","xml":"<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-deactivate' mode='sync' >\n","comments":"","outputs":1,"x":1061.7141571044922,"y":348.14299488067627,"z":"fb3a2b3.b3cc7d8","wires":[[]]},{"id":"3e478ce0.78e214","type":"call","name":"call GENERIC-RESOURCE-API:vnf-topology-operation-unassign","xml":"<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-unassign' mode='sync' >\n","comments":"","outputs":1,"x":1057.3807563781738,"y":394.14304065704346,"z":"fb3a2b3.b3cc7d8","wires":[[]]},{"id":"73ed8794.2b9c38","type":"outcome","name":"deactivate","xml":"<outcome value='deactivate'>\n","comments":"","outputs":1,"x":717.3807983398438,"y":348.8096704483032,"z":"fb3a2b3.b3cc7d8","wires":[["7ee102ee.2772cc"]]},{"id":"b07bf339.3f796","type":"call","name":"call GENERIC-RESOURCE-API:vnf-topology-operation-activate","xml":"<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' >\n","comments":"","outputs":1,"x":1054.5237350463867,"y":305.71427822113037,"z":"fb3a2b3.b3cc7d8","wires":[[]]},{"id":"bed20936.060648","type":"outcome","name":"activate","xml":"<outcome value='activate'>\n","comments":"","outputs":1,"x":711.1903762817383,"y":306.3809537887573,"z":"fb3a2b3.b3cc7d8","wires":[["b07bf339.3f796"]]},{"id":"81c3ff0e.10641","type":"outcome","name":"changeassign","xml":"<outcome value='changeassign'>\n","comments":"","outputs":1,"x":727.1428871154785,"y":437.1428413391113,"z":"fb3a2b3.b3cc7d8","wires":[["2ca55154.1a129e"]]},{"id":"2ca55154.1a129e","type":"call","name":"call GENERIC-RESOURCE-API:vnf-topology-operation-changeassign","xml":"<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-changeassign' mode='sync' >\n","comments":"","outputs":1,"x":1067.9522552490234,"y":436.8570079803467,"z":"fb3a2b3.b3cc7d8","wires":[[]]}]
-\ No newline at end of file
+[
+  {
+    "id": "61f768ce.a1c1b8",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 127,
+    "y": 96.41365623474121,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "58ccea78.3d9004"
+      ]
+    ]
+  },
+  {
+    "id": "58ccea78.3d9004",
+    "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": 241.28570556640625,
+    "y": 136.6517677307129,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "13d4c1ee.0b3fde"
+      ]
+    ]
+  },
+  {
+    "id": "13d4c1ee.0b3fde",
+    "type": "method",
+    "name": "method vnf-topology-operation",
+    "xml": "<method rpc='vnf-topology-operation' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 193.42862701416016,
+    "y": 176.4136505126953,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "bd2b5862.92ecf8"
+      ]
+    ]
+  },
+  {
+    "id": "b240dafd.5a3558",
+    "type": "comment",
+    "name": "vnf-topology-operation",
+    "info": "",
+    "comments": "",
+    "x": 521.344856262207,
+    "y": 44,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "bd2b5862.92ecf8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 209.59527587890625,
+    "y": 382.6786069869995,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "5967f821.700468",
+        "baed1c3a.1e989",
+        "c06aa47c.85b178"
+      ]
+    ]
+  },
+  {
+    "id": "5967f821.700468",
+    "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": 494.95237731933594,
+    "y": 537.1282978057861,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "baed1c3a.1e989",
+    "type": "switchNode",
+    "name": "switch svc-action",
+    "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 504.9999465942383,
+    "y": 380.8898506164551,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "978f0c9b.1176d",
+        "62c9370e.8bad98",
+        "b577f516.b87bb8",
+        "c5263003.c4036",
+        "e9cebc1e.d2457",
+        "31b7bba9.7bea94",
+        "c33806c8.aa4d18",
+        "725fe95a.c30bf8"
+      ]
+    ]
+  },
+  {
+    "id": "978f0c9b.1176d",
+    "type": "outcome",
+    "name": "assign",
+    "xml": "<outcome value='assign'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 873.3810729980469,
+    "y": 94.93759727478027,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "a22dae69.80ef5"
+      ]
+    ]
+  },
+  {
+    "id": "62c9370e.8bad98",
+    "type": "outcome",
+    "name": "unassign",
+    "xml": "<outcome value='unassign'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 873.4286041259766,
+    "y": 430.1283016204834,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "463cb634.e904a8"
+      ]
+    ]
+  },
+  {
+    "id": "c5263003.c4036",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 874.7142448425293,
+    "y": 780.7469511032104,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "49dd7e11.20bc1"
+      ]
+    ]
+  },
+  {
+    "id": "49dd7e11.20bc1",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
+    "comments": "",
+    "x": 1060.9046897888184,
+    "y": 780.747015953064,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "c06aa47c.85b178",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:validate-vnf-input",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vnf-input' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 609.416633605957,
+    "y": 233.7946949005127,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "a22dae69.80ef5",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-assign",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1215.52392578125,
+    "y": 94.50905799865723,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "463cb634.e904a8",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-unassign",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-unassign' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1218.5237007141113,
+    "y": 429.84243297576904,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "b577f516.b87bb8",
+    "type": "outcome",
+    "name": "deactivate",
+    "xml": "<outcome value='deactivate'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 878.5238189697266,
+    "y": 315.5090947151184,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "bd95d506.9d29c8"
+      ]
+    ]
+  },
+  {
+    "id": "e9cebc1e.d2457",
+    "type": "outcome",
+    "name": "activate",
+    "xml": "<outcome value='activate'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 875.3333892822266,
+    "y": 155.08038139343262,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "9adca977.6fdd38"
+      ]
+    ]
+  },
+  {
+    "id": "31b7bba9.7bea94",
+    "type": "outcome",
+    "name": "changeassign",
+    "xml": "<outcome value='changeassign'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 888.285831451416,
+    "y": 472.8422336578369,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "88556c83.1395f"
+      ]
+    ]
+  },
+  {
+    "id": "88556c83.1395f",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-changeassign",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-changeassign' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1229.095199584961,
+    "y": 472.55640029907227,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "9adca977.6fdd38",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1064.0001411437988,
+    "y": 154.00003051757812,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "cc2bad6b.4598a",
+        "60d3ac48.b936d4"
+      ]
+    ]
+  },
+  {
+    "id": "60d3ac48.b936d4",
+    "type": "outcome",
+    "name": "ActivateSiteInstance",
+    "xml": "<outcome value='ActivateSiteInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1277.476276397705,
+    "y": 145.4792356491089,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "57cdb54d.2f9f3c"
+      ]
+    ]
+  },
+  {
+    "id": "57cdb54d.2f9f3c",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-activate",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-activate' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1651.0000801086426,
+    "y": 144.000018119812,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "cc2bad6b.4598a",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1244.3810939788818,
+    "y": 226.85723209381104,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "10dbd8d4.75e477"
+      ]
+    ]
+  },
+  {
+    "id": "10dbd8d4.75e477",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-activate",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1582.666669845581,
+    "y": 226.9136552810669,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "bd95d506.9d29c8",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1073,
+    "y": 346,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "b8195b3d.cc9f78",
+        "b97b745.9c9ca88"
+      ]
+    ]
+  },
+  {
+    "id": "b97b745.9c9ca88",
+    "type": "outcome",
+    "name": "DeActivateSiteInstance",
+    "xml": "<outcome value='DeActivateSiteInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1286.4761962890625,
+    "y": 277.4792175292969,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "f5aac374.2e2d4"
+      ]
+    ]
+  },
+  {
+    "id": "f5aac374.2e2d4",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-deactivate",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-deactivate' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1656,
+    "y": 275,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "504dc14c.1b4a",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-deactivate",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-deactivate' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1610.8570556640625,
+    "y": 370.34234619140625,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "b8195b3d.cc9f78",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1255.3809280395508,
+    "y": 368.8572120666504,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "504dc14c.1b4a"
+      ]
+    ]
+  },
+  {
+    "id": "c33806c8.aa4d18",
+    "type": "outcome",
+    "name": "create",
+    "xml": "<outcome value='create'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 871,
+    "y": 534,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "18cbc95d.535697"
+      ]
+    ]
+  },
+  {
+    "id": "725fe95a.c30bf8",
+    "type": "outcome",
+    "name": "delete",
+    "xml": "<outcome value='delete'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 868.9999885559082,
+    "y": 677.000002861023,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "86c5aa37.0d5088"
+      ]
+    ]
+  },
+  {
+    "id": "18cbc95d.535697",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1098.3335647583008,
+    "y": 564.5863790512085,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "33af8fa8.cb18f",
+        "6468b583.fa7cec"
+      ]
+    ]
+  },
+  {
+    "id": "6468b583.fa7cec",
+    "type": "outcome",
+    "name": "CreateSiteInstance",
+    "xml": "<outcome value='CreateSiteInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1327.8096809387207,
+    "y": 518.0655851364136,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "93206f47.4db71"
+      ]
+    ]
+  },
+  {
+    "id": "33af8fa8.cb18f",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1296.714412689209,
+    "y": 609.4435796737671,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "3bcc0d9a.e0d3b2"
+      ]
+    ]
+  },
+  {
+    "id": "93206f47.4db71",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-create",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-create' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1701.3334846496582,
+    "y": 516.5863676071167,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "3bcc0d9a.e0d3b2",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1436.9999885559082,
+    "y": 610.500002861023,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "86c5aa37.0d5088",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1088.000228881836,
+    "y": 685.5001239776611,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "fc244f76.ceda2",
+        "bd7ae6f3.16da48"
+      ]
+    ]
+  },
+  {
+    "id": "bd7ae6f3.16da48",
+    "type": "outcome",
+    "name": "DeleteSiteInstance",
+    "xml": "<outcome value='DeleteSiteInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1328.4761848449707,
+    "y": 660.9792203903198,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "bad4d35c.1ebd6"
+      ]
+    ]
+  },
+  {
+    "id": "fc244f76.ceda2",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1297.380916595459,
+    "y": 752.3572149276733,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        "fc430959.324e98"
+      ]
+    ]
+  },
+  {
+    "id": "bad4d35c.1ebd6",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-delete",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-delete' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1701.9999885559082,
+    "y": 659.500002861023,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "fc430959.324e98",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1437.6664924621582,
+    "y": 753.4136381149292,
+    "z": "57051de1.b81bb4",
+    "wires": [
+      [
+        
+      ]
+    ]
+  }
+]
diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions
index 34507306..93e1703e 100755
--- a/platform-logic/generic-resource-api/src/main/resources/graph.versions
+++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions
@@ -183,11 +183,4 @@ GENERIC-RESOURCE-API vnf-topology-operation-deactivate ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation-unassign ${project.version} sync
 GENERIC-RESOURCE-API vnf-topology-operation ${project.version} sync
 SUBNET-API managed-network-notification ${project.version} sync
-SUBNET-API subnet-allocated-notification ${project.version} sync
-GENERIC-RESOURCE-API connection-attachment-topology-operation ${project.version} sync
-GENERIC-RESOURCE-API sotn-network-topology-operation-create ${project.version} sync
-GENERIC-RESOURCE-API sotn-network-topology-operation-delete ${project.version} sync
-GENERIC-RESOURCE-API sotn-network-topology-operation-activate ${project.version} sync
-GENERIC-RESOURCE-API sotn-network-topology-operation-deactivate ${project.version} sync
-GENERIC-RESOURCE-API validate-connection-attachment-input ${project.version} sync
-GENERIC-RESOURCE-API sotn-get-saved-ar-param ${project.version} sync
+SUBNET-API subnet-allocated-notification ${project.version} sync
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
index 7623a91f..fbd3775a 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
@@ -36,93 +36,103 @@
                     </block>
                 </outcome>
                 <outcome value='activate'>
-                    <block atomic="true">
-                        <switch test='`$service-data.networks.network_length`'>
-                            <outcome value=''>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
-                                </return>
-                            </outcome>
-                            <outcome value='Other'>
-                                <block atomic="true">
-                                    <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
-                                        <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
-                                            <outcome value='true'>
-                                                <set>
-                                                    <parameter name='tmp.nidx' value='`$nidx`' />
-                                                    <parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
-                                                </set>
-                                            </outcome>
-                                        </switch>
-                                    </for>
-                                    <switch test="`$tmp.nidx`">
-                                        <outcome value=''>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
-                                            </return>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <set>
-                                                <parameter name='nidx' value='`$tmp.nidx`' />
-                                            </set>
-                                        </outcome>
-                                    </switch>
-                                </block>
-                            </outcome>
-                        </switch>
-                        <switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>
-                            <outcome value=''>
-                                <return status='success'>
-                                    <parameter name='' value='' />
-                                </return>
-                            </outcome>
-                            <outcome value='Other'>
-                                <block>
-                                    <switch test='`$service-data.network-instance-groups.network-instance-group_length`'>
-                                        <outcome value=''>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data" />
-                                            </return>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <block atomic="true">
-                                                <for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >
-                                                    <switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`">
-                                                        <outcome value='true'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name='tmp.ngidx' value='`$ngidx`' />
-                                                                    <parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                    </switch>
-                                                </for>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </block>
-                            </outcome>
-                        </switch>
-                        <switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
-                            <outcome value='PendingCreate'>
-                                <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-activate' mode='sync' ></call>
-                            </outcome>
-                            <outcome value='Other'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="`'Network is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
-                                </return>
-                            </outcome>
-                        </switch>
-                    </block>
+                    <switch test='`$network-topology-operation-input.request-information.request-action`'>
+                        <outcome value='ActivateSOTNConnectivityInstance'>
+                            <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-activate' mode='sync' ></call>
+                        </outcome>
+                        <outcome value='ActivateDCINetworkInstance'>
+                            <call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-activate' mode='sync' ></call>
+                        </outcome>
+                        <outcome value='other'>
+                            <block atomic="true">
+                                <switch test='`$service-data.networks.network_length`'>
+                                    <outcome value=''>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+                                        </return>
+                                    </outcome>
+                                    <outcome value='Other'>
+                                        <block atomic="true">
+                                            <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
+                                                <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
+                                                    <outcome value='true'>
+                                                        <set>
+                                                            <parameter name='tmp.nidx' value='`$nidx`' />
+                                                            <parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
+                                                        </set>
+                                                    </outcome>
+                                                </switch>
+                                            </for>
+                                            <switch test="`$tmp.nidx`">
+                                                <outcome value=''>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <set>
+                                                        <parameter name='nidx' value='`$tmp.nidx`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                                <switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>
+                                    <outcome value=''>
+                                        <return status='success'>
+                                            <parameter name='' value='' />
+                                        </return>
+                                    </outcome>
+                                    <outcome value='Other'>
+                                        <block>
+                                            <switch test='`$service-data.network-instance-groups.network-instance-group_length`'>
+                                                <outcome value=''>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <block atomic="true">
+                                                        <for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >
+                                                            <switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`">
+                                                                <outcome value='true'>
+                                                                    <block atomic="true">
+                                                                        <set>
+                                                                            <parameter name='tmp.ngidx' value='`$ngidx`' />
+                                                                            <parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />
+                                                                        </set>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
+                                                        </for>
+                                                    </block>
+                                                </outcome>
+                                            </switch>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                                <switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
+                                    <outcome value='PendingCreate'>
+                                        <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-activate' mode='sync' ></call>
+                                    </outcome>
+                                    <outcome value='Other'>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`'Network is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />
+                                        </return>
+                                    </outcome>
+                                </switch>
+                            </block>
+                        </outcome>
+                    </switch>
                 </outcome>
                 <outcome value='changeassign'>
                     <block atomic="true">
@@ -167,82 +177,92 @@
                     </block>
                 </outcome>
                 <outcome value='deactivate'>
-                    <block atomic="true">
-                        <switch test='`$service-data.networks.network_length`'>
-                            <outcome value=''>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
-                                </return>
-                            </outcome>
-                            <outcome value='Other'>
-                                <block atomic="true">
-                                    <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
-                                        <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
-                                            <outcome value='true'>
-                                                <set>
-                                                    <parameter name='tmp.nidx' value='`$nidx`' />
-                                                    <parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
-                                                </set>
-                                            </outcome>
-                                        </switch>
-                                    </for>
-                                    <switch test="`$tmp.nidx`">
-                                        <outcome value=''>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
-                                            </return>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <set>
-                                                <parameter name='nidx' value='`$tmp.nidx`' />
-                                            </set>
-                                        </outcome>
-                                    </switch>
-                                </block>
-                            </outcome>
-                        </switch>
-                        <switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>
-                            <outcome value=''>
-                                <return status='success'>
-                                    <parameter name='' value='' />
-                                </return>
-                            </outcome>
-                            <outcome value='Other'>
-                                <block>
-                                    <switch test='`$service-data.network-instance-groups.network-instance-group_length`'>
-                                        <outcome value=''>
-                                            <return status='failure'>
-                                                <parameter name='ack-final' value='Y'/>
-                                                <parameter name="error-code" value="500" />
-                                                <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data" />
-                                            </return>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <block atomic="true">
-                                                <for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >
-                                                    <switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`">
-                                                        <outcome value='true'>
-                                                            <block atomic="true">
-                                                                <set>
-                                                                    <parameter name='tmp.ngidx' value='`$ngidx`' />
-                                                                    <parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
-                                                    </switch>
-                                                </for>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </block>
-                            </outcome>
-                        </switch>
-                        <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-deactivate' mode='sync' ></call>
-                    </block>
+                    <switch test='`$network-topology-operation-input.request-information.request-action`'>
+                        <outcome value='DeactivateSOTNConnectivityInstance'>
+                            <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-deactivate' mode='sync' ></call>
+                        </outcome>
+                        <outcome value='DeActivateDCINetworkInstance'>
+                            <call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-deactivate' mode='sync' ></call>
+                        </outcome>
+                        <outcome value='Other'>
+                            <block atomic="true">
+                                <switch test='`$service-data.networks.network_length`'>
+                                    <outcome value=''>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+                                        </return>
+                                    </outcome>
+                                    <outcome value='Other'>
+                                        <block atomic="true">
+                                            <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
+                                                <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
+                                                    <outcome value='true'>
+                                                        <set>
+                                                            <parameter name='tmp.nidx' value='`$nidx`' />
+                                                            <parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
+                                                        </set>
+                                                    </outcome>
+                                                </switch>
+                                            </for>
+                                            <switch test="`$tmp.nidx`">
+                                                <outcome value=''>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <set>
+                                                        <parameter name='nidx' value='`$tmp.nidx`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                                <switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>
+                                    <outcome value=''>
+                                        <return status='success'>
+                                            <parameter name='' value='' />
+                                        </return>
+                                    </outcome>
+                                    <outcome value='Other'>
+                                        <block>
+                                            <switch test='`$service-data.network-instance-groups.network-instance-group_length`'>
+                                                <outcome value=''>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <block atomic="true">
+                                                        <for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >
+                                                            <switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`">
+                                                                <outcome value='true'>
+                                                                    <block atomic="true">
+                                                                        <set>
+                                                                            <parameter name='tmp.ngidx' value='`$ngidx`' />
+                                                                            <parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />
+                                                                        </set>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
+                                                        </for>
+                                                    </block>
+                                                </outcome>
+                                            </switch>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                                <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-deactivate' mode='sync' ></call>
+                            </block>
+                        </outcome>
+                    </switch>
                 </outcome>
                 <outcome value='unassign'>
                     <block atomic="true">
@@ -336,6 +356,30 @@
                         </switch>
                     </block>
                 </outcome>
+                <outcome value='create'>
+                    <switch test='`$network-topology-operation-input.request-information.request-action`'>
+                        <outcome value='CreateSOTNConnectivityInstance'>
+                            <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-create' mode='sync' ></call>
+                        </outcome>
+                        <outcome value='other'>
+                            <block atomic="true">
+                                <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-create' mode='sync' ></call>
+                            </block>
+                        </outcome>
+                    </switch>
+                </outcome>
+                <outcome value='delete'>
+                    <switch test='`$network-topology-operation-input.request-information.request-action`'>
+                        <outcome value='DeleteSOTNConnectivityInstance'>
+                            <call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-delete' mode='sync' ></call>
+                        </outcome>
+                        <outcome value='other'>
+                            <block atomic="true">
+                                <call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-delete' mode='sync' ></call>
+                            </block>
+                        </outcome>
+                    </switch>
+                </outcome>
                 <outcome value='Other'>
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
index 3b300943..c24fadbb 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
@@ -172,8 +172,8 @@
                                         <outcome value=''>
                                             <block atomic="true">
                                                 <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'
-  pfx='service-model'>
+                                                    key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'
+                                                    pfx='service-model'>
                                                     <outcome value='not-found'>
                                                         <return status='failure'>
                                                             <parameter name='ack-final' value='Y'/>
@@ -190,14 +190,14 @@
                                                     </outcome>
                                                 </get-resource>
                                                 <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+                                                    key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
   and service_uuid = $service-data.service-information.onap-model-information.model-uuid'
-  pfx='network-model'>
+                                                    pfx='network-model'>
                                                     <outcome value='not-found'>
                                                         <return status='failure'>
                                                             <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID '
     + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
@@ -206,7 +206,7 @@
                                                         <return status='failure'>
                                                             <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID '
     + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
@@ -217,8 +217,8 @@
                                         <outcome value='Other'>
                                             <block atomic="true">
                                                 <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
-  pfx='service-model'>
+                                                    key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
+                                                    pfx='service-model'>
                                                     <outcome value='not-found'>
                                                         <return status='failure'>
                                                             <parameter name='ack-final' value='Y'/>
@@ -235,14 +235,14 @@
                                                     </outcome>
                                                 </get-resource>
                                                 <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+                                                    key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
   and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
-  pfx='network-model'>
+                                                    pfx='network-model'>
                                                     <outcome value='not-found'>
                                                         <return status='failure'>
                                                             <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID '
     + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
@@ -251,7 +251,7 @@
                                                         <return status='failure'>
                                                             <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID '
     + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
@@ -275,6 +275,12 @@
                 <outcome value='activate'>
                     <block atomic="true">
                         <switch test='`$network-topology-operation-input.request-information.request-action`'>
+                            <outcome value='ActivateSOTNConnectivityInstance'>
+                                <block atomic="true"></block>
+                            </outcome>
+                            <outcome value='ActivateDCINetworkInstance'>
+                                <block atomic="true"></block>
+                            </outcome>
                             <outcome value='CreateNetworkInstance'>
                                 <block atomic="true">
                                     <switch test='`$network-topology-operation-input.network-information.network-id`'>
@@ -335,8 +341,8 @@
                                         <outcome value=''>
                                             <block atomic="true">
                                                 <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'
-  pfx='service-model'>
+                                                    key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'
+                                                    pfx='service-model'>
                                                     <outcome value='not-found'>
                                                         <return status='failure'>
                                                             <parameter name='ack-final' value='Y'/>
@@ -353,14 +359,14 @@
                                                     </outcome>
                                                 </get-resource>
                                                 <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+                                                    key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
   and service_uuid = $service-data.service-information.onap-model-information.model-uuid'
-  pfx='network-model'>
+                                                    pfx='network-model'>
                                                     <outcome value='not-found'>
                                                         <return status='failure'>
                                                             <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID '
     + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
@@ -369,7 +375,7 @@
                                                         <return status='failure'>
                                                             <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID '
     + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
@@ -380,8 +386,8 @@
                                         <outcome value='Other'>
                                             <block atomic="true">
                                                 <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
-  pfx='service-model'>
+                                                    key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
+                                                    pfx='service-model'>
                                                     <outcome value='not-found'>
                                                         <return status='failure'>
                                                             <parameter name='ack-final' value='Y'/>
@@ -398,14 +404,14 @@
                                                     </outcome>
                                                 </get-resource>
                                                 <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+                                                    key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
   and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
-  pfx='network-model'>
+                                                    pfx='network-model'>
                                                     <outcome value='not-found'>
                                                         <return status='failure'>
                                                             <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID '
     + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
@@ -414,7 +420,7 @@
                                                         <return status='failure'>
                                                             <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID '
     + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
@@ -518,6 +524,12 @@
                 <outcome value='deactivate'>
                     <block atomic="true">
                         <switch test='`$network-topology-operation-input.request-information.request-action`'>
+                            <outcome value='DeactivateSOTNConnectivityInstance'>
+                                <block atomic="true"></block>
+                            </outcome>
+                            <outcome value='DeActivateDCINetworkInstance'>
+                                <block atomic="true"></block>
+                            </outcome>
                             <outcome value='DeleteNetworkInstance'>
                                 <block atomic="true">
                                     <switch test='`$network-topology-operation-input.network-information.network-id`'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml
index 12d891d0..1c8c64c5 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml
@@ -39,15 +39,6 @@
                     </return>
                 </outcome>
             </switch>
-            <switch test='`$vnf-topology-operation-input.vnf-information.vnf-id`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="vnf-information.vnf-id is a required input" />
-                    </return>
-                </outcome>
-            </switch>
             <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>
                 <outcome value='assign'>
                     <block atomic="true">
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
index 15b31e13..481a7a89 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
@@ -9,10 +9,24 @@
                     <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign' mode='sync' ></call>
                 </outcome>
                 <outcome value='activate'>
-                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' ></call>
+                    <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                        <outcome value='ActivateSiteInstance'>
+                            <call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-activate' mode='sync' ></call>
+                        </outcome>
+                        <outcome value='Other'>
+                            <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' ></call>
+                        </outcome>
+                    </switch>
                 </outcome>
                 <outcome value='deactivate'>
-                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-deactivate' mode='sync' ></call>
+                    <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                        <outcome value='DeActivateSiteInstance'>
+                            <call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-deactivate' mode='sync' ></call>
+                        </outcome>
+                        <outcome value='Other'>
+                            <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-deactivate' mode='sync' ></call>
+                        </outcome>
+                    </switch>
                 </outcome>
                 <outcome value='unassign'>
                     <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-unassign' mode='sync' ></call>
@@ -20,6 +34,26 @@
                 <outcome value='changeassign'>
                     <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-changeassign' mode='sync' ></call>
                 </outcome>
+                <outcome value='create'>
+                    <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                        <outcome value='CreateSiteInstance'>
+                            <call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-create' mode='sync' ></call>
+                        </outcome>
+                        <outcome value='Other'>
+                            <block></block>
+                        </outcome>
+                    </switch>
+                </outcome>
+                <outcome value='delete'>
+                    <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                        <outcome value='DeleteSiteInstance'>
+                            <call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-delete' mode='sync' ></call>
+                        </outcome>
+                        <outcome value='Other'>
+                            <block></block>
+                        </outcome>
+                    </switch>
+                </outcome>
                 <outcome value='Other'>
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
author	gaurav <gaurav.agrawal@huawei.com>	2018-07-31 16:06:52 +0530
committer	gaurav <gaurav.agrawal@huawei.com>	2018-07-31 16:06:52 +0530
commit	7f6d320ccf47539d9baaaf177b0650d41bd12230 (patch)
tree	109fa3746d14c9d834303f6cd2c09ae31e2c8579
parent	b08903f327f974cacb6a97737f9f3911d779eaa9 (diff)