Fix BRG DGs

Fix cut/paste errors in BRG allotted resource directed
graphs and add missing restapi template.

Change-Id: Ie5dcea412b79f10e5c3651a0f2177120210cc136
Issue-ID: SDNC-140
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: e8cf6822f4c60748e6cebe548d1c2ecae973e515

29 files changed, 214 insertions, 309 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json
index ab71cd7f..3aa8ecb8 100755
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json
@@ -1 +1 @@
-[{"id":"f4d06dda.30316","type":"dgstart","name":"DGSTART","outputs":1,"x":167.14285278320312,"y":61.42856979370117,"z":"d029d2a.974963","wires":[["7f7c6af3.215f74"]]},{"id":"7f7c6af3.215f74","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":263.38093185424805,"y":122.38096046447754,"z":"d029d2a.974963","wires":[["5a1c2468.67872c"]]},{"id":"5a1c2468.67872c","type":"method","name":"brg-topology-operation-activate","xml":"<method rpc='brg-topology-operation-activate' mode='sync'>\n","comments":"","outputs":1,"x":309.2977104187012,"y":157.61901569366455,"z":"d029d2a.974963","wires":[["dfe1dc14.5964"]]},{"id":"dfe1dc14.5964","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":217.61904525756836,"y":300.95235776901245,"z":"d029d2a.974963","wires":[["3dde4199.1c9e2e","d411dae1.fde8d8","30cc1a1b.8e88e6","6861327d.73bc7c","add0f6b0.d7fa28","b3f7a9f5.747648","5c57b0ca.b25a6","b6f5439f.b0624","fc0c4385.ee3a5","66ef7002.abb7e","56345297.bc34dc","62744ec2.dbf8"]]},{"id":"d411dae1.fde8d8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","x":484.1429634094238,"y":970.6430778503418,"z":"d029d2a.974963","wires":[]},{"id":"3dde4199.1c9e2e","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":512.8968772888184,"y":934.7656240463257,"z":"d029d2a.974963","wires":[]},{"id":"66ef7002.abb7e","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":523.8970718383789,"y":681.4799699783325,"z":"d029d2a.974963","wires":[]},{"id":"6861327d.73bc7c","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n","comments":"","x":479.880916595459,"y":274.76189517974854,"z":"d029d2a.974963","wires":[]},{"id":"30cc1a1b.8e88e6","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.sz-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />\n\n\n","comments":"","x":527.1401786804199,"y":241.02116107940674,"z":"d029d2a.974963","wires":[]},{"id":"add0f6b0.d7fa28","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":486.1362724304199,"y":310.66009426116943,"z":"d029d2a.974963","wires":[[]]},{"id":"5c57b0ca.b25a6","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":548.6616058349609,"y":471.8880615234375,"z":"d029d2a.974963","wires":[["bcc2124f.d53a2","f31fdf96.9d6cc"]]},{"id":"b3f7a9f5.747648","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.sz-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":514.207706451416,"y":370.44579887390137,"z":"d029d2a.974963","wires":[[]]},{"id":"bcc2124f.d53a2","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":805.9577445983887,"y":470.69582200050354,"z":"d029d2a.974963","wires":[["f78da3bd.a0afd"]]},{"id":"b6f5439f.b0624","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":556.6721649169922,"y":824.8627014160156,"z":"d029d2a.974963","wires":[["f821a3fb.c285e","f757d471.7dc7d8","49853f9a.93d68"]]},{"id":"f821a3fb.c285e","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":826.9801826477051,"y":877.8609022125602,"z":"d029d2a.974963","wires":[["630debdb.168f04"]]},{"id":"f757d471.7dc7d8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":817.9802322387695,"y":846.3609279617667,"z":"d029d2a.974963","wires":[["630debdb.168f04"]]},{"id":"49853f9a.93d68","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":821.7302703857422,"y":816.7180328369141,"z":"d029d2a.974963","wires":[["fb95f526.14ff08"]]},{"id":"630debdb.168f04","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for brg-allotted-resource\" />\n","comments":"","x":987.7302703857422,"y":847.1109518036246,"z":"d029d2a.974963","wires":[]},{"id":"f78da3bd.a0afd","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":986.9576988220215,"y":471.19577145576477,"z":"d029d2a.974963","wires":[["a88d57e7.ea7b68","874276d9.71a568"]]},{"id":"a88d57e7.ea7b68","type":"switchNode","name":"switch sz length","xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1232.8149452209473,"y":505.48153471946716,"z":"d029d2a.974963","wires":[["b5653c05.23ac6"]]},{"id":"b5653c05.23ac6","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1423.8149490356445,"y":505.4815323352814,"z":"d029d2a.974963","wires":[["750425c0.df6c0c"]]},{"id":"803be05.23d262","type":"set","name":"set sz-ar from get","xml":"<set>\n<parameter name='sz-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />\n","comments":"","x":1823.6720848083496,"y":506.0529565811157,"z":"d029d2a.974963","wires":[]},{"id":"750425c0.df6c0c","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1594.671932220459,"y":506.0530014038086,"z":"d029d2a.974963","wires":[["803be05.23d262","86d2d032.ec9c7","1fd599c8.bea286"]]},{"id":"86d2d032.ec9c7","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1821.6723289489746,"y":573.481520652771,"z":"d029d2a.974963","wires":[]},{"id":"ae3be0c3.a3ad4","type":"comment","name":"GET brg-allotted-resource from mdsal","info":"","comments":"","x":573.9576683044434,"y":435.19576239585876,"z":"d029d2a.974963","wires":[]},{"id":"1fd599c8.bea286","type":"switchNode","name":"switch order-status","xml":"<switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1831.6721076965332,"y":539.0529546737671,"z":"d029d2a.974963","wires":[["ea7abf8a.d6c0e","88378d84.e1337"]]},{"id":"ea7abf8a.d6c0e","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2043.2720642089844,"y":500.0529546737671,"z":"d029d2a.974963","wires":[["c95729c.38426d8"]]},{"id":"88378d84.e1337","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2068.9864387512207,"y":535.4815454483032,"z":"d029d2a.974963","wires":[["c95729c.38426d8"]]},{"id":"81dbbc42.6cf3b","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":529.4814910888672,"y":525.7672157287598,"z":"d029d2a.974963","wires":[]},{"id":"874276d9.71a568","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-sz-ar' value='$mdsal-ar.' />\n","comments":"","x":1312.5292778015137,"y":471.1958634853363,"z":"d029d2a.974963","wires":[]},{"id":"ef3a6e4c.51d76","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":485.10051345825195,"y":340.0529260635376,"z":"d029d2a.974963","wires":[]},{"id":"fb95f526.14ff08","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":963.3862380981445,"y":812.9102020263672,"z":"d029d2a.974963","wires":[[]]},{"id":"369a0f6a.c9ad8","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":487.38623046875,"y":713.5767650604248,"z":"d029d2a.974963","wires":[]},{"id":"fc0c4385.ee3a5","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":471.38623428344727,"y":642.9101247787476,"z":"d029d2a.974963","wires":[[]]},{"id":"f31fdf96.9d6cc","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":805.719539642334,"y":506.90999484062195,"z":"d029d2a.974963","wires":[["19da75c4.bf509a"]]},{"id":"19da75c4.bf509a","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":985.7194900512695,"y":507.57654547691345,"z":"d029d2a.974963","wires":[[]]},{"id":"56345297.bc34dc","type":"set","name":"set id","xml":"<set>\n<parameter name='sz-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='sz-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='sz-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='sz-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />","comments":"","x":454.3862762451172,"y":562.5767364501953,"z":"d029d2a.974963","wires":[]},{"id":"c95729c.38426d8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2257.7425804138184,"y":501.4285888671875,"z":"d029d2a.974963","wires":[[]]},{"id":"62744ec2.dbf8","type":"update","name":"update AAI allotted-resource","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"operational-status\" value=\"in-service-path\" />\n","comments":"","outputs":1,"x":515.0000152587891,"y":746.6666326522827,"z":"d029d2a.974963","wires":[["5211695c.bb63d8","6077137b.90cddc"]]},{"id":"5211695c.bb63d8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":770.7619094848633,"y":729.6191296577454,"z":"d029d2a.974963","wires":[["fa37c9f8.eb9288"]]},{"id":"fa37c9f8.eb9288","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"AAI failed\" />\n","comments":"","x":937.2857894897461,"y":741.2382006645203,"z":"d029d2a.974963","wires":[]},{"id":"6077137b.90cddc","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":777.8571968078613,"y":762.381097316742,"z":"d029d2a.974963","wires":[["fa37c9f8.eb9288"]]}]
+[{"id":"f4d06dda.30316","type":"dgstart","name":"DGSTART","outputs":1,"x":167.14285278320312,"y":61.42856979370117,"z":"d029d2a.974963","wires":[["7f7c6af3.215f74"]]},{"id":"7f7c6af3.215f74","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":263.38093185424805,"y":122.38096046447754,"z":"d029d2a.974963","wires":[["5a1c2468.67872c"]]},{"id":"5a1c2468.67872c","type":"method","name":"brg-topology-operation-activate","xml":"<method rpc='brg-topology-operation-activate' mode='sync'>\n","comments":"","outputs":1,"x":309.2977104187012,"y":157.61901569366455,"z":"d029d2a.974963","wires":[["dfe1dc14.5964"]]},{"id":"dfe1dc14.5964","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":217.61904525756836,"y":300.95235776901245,"z":"d029d2a.974963","wires":[["3dde4199.1c9e2e","d411dae1.fde8d8","30cc1a1b.8e88e6","6861327d.73bc7c","add0f6b0.d7fa28","b3f7a9f5.747648","5c57b0ca.b25a6","b6f5439f.b0624","fc0c4385.ee3a5","66ef7002.abb7e","56345297.bc34dc","62744ec2.dbf8"]]},{"id":"d411dae1.fde8d8","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","x":484.1429634094238,"y":970.6430778503418,"z":"d029d2a.974963","wires":[]},{"id":"3dde4199.1c9e2e","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":512.8968772888184,"y":934.7656240463257,"z":"d029d2a.974963","wires":[]},{"id":"66ef7002.abb7e","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":523.8970718383789,"y":681.4799699783325,"z":"d029d2a.974963","wires":[]},{"id":"6861327d.73bc7c","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n","comments":"","x":479.880916595459,"y":274.76189517974854,"z":"d029d2a.974963","wires":[]},{"id":"30cc1a1b.8e88e6","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />\n\n\n","comments":"","x":527.1401786804199,"y":241.02116107940674,"z":"d029d2a.974963","wires":[]},{"id":"add0f6b0.d7fa28","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":486.1362724304199,"y":310.66009426116943,"z":"d029d2a.974963","wires":[[]]},{"id":"5c57b0ca.b25a6","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":548.6616058349609,"y":471.8880615234375,"z":"d029d2a.974963","wires":[["bcc2124f.d53a2","f31fdf96.9d6cc"]]},{"id":"b3f7a9f5.747648","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.brg-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":514.207706451416,"y":370.44579887390137,"z":"d029d2a.974963","wires":[[]]},{"id":"bcc2124f.d53a2","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":805.9577445983887,"y":470.69582200050354,"z":"d029d2a.974963","wires":[["f78da3bd.a0afd"]]},{"id":"b6f5439f.b0624","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":556.6721649169922,"y":824.8627014160156,"z":"d029d2a.974963","wires":[["f821a3fb.c285e","f757d471.7dc7d8","49853f9a.93d68"]]},{"id":"f821a3fb.c285e","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":826.9801826477051,"y":877.8609022125602,"z":"d029d2a.974963","wires":[["630debdb.168f04"]]},{"id":"f757d471.7dc7d8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":817.9802322387695,"y":846.3609279617667,"z":"d029d2a.974963","wires":[["630debdb.168f04"]]},{"id":"49853f9a.93d68","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":821.7302703857422,"y":816.7180328369141,"z":"d029d2a.974963","wires":[["fb95f526.14ff08"]]},{"id":"630debdb.168f04","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for brg-allotted-resource\" />\n","comments":"","x":987.7302703857422,"y":847.1109518036246,"z":"d029d2a.974963","wires":[]},{"id":"f78da3bd.a0afd","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":986.9576988220215,"y":471.19577145576477,"z":"d029d2a.974963","wires":[["a88d57e7.ea7b68","874276d9.71a568"]]},{"id":"a88d57e7.ea7b68","type":"switchNode","name":"switch brg length","xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1232.8149452209473,"y":505.48153471946716,"z":"d029d2a.974963","wires":[["b5653c05.23ac6"]]},{"id":"b5653c05.23ac6","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1423.8149490356445,"y":505.4815323352814,"z":"d029d2a.974963","wires":[["750425c0.df6c0c"]]},{"id":"803be05.23d262","type":"set","name":"set brg-ar from get","xml":"<set>\n<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />\n","comments":"","x":1823.6720848083496,"y":506.0529565811157,"z":"d029d2a.974963","wires":[]},{"id":"750425c0.df6c0c","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1594.671932220459,"y":506.0530014038086,"z":"d029d2a.974963","wires":[["803be05.23d262","86d2d032.ec9c7","1fd599c8.bea286"]]},{"id":"86d2d032.ec9c7","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1821.6723289489746,"y":573.481520652771,"z":"d029d2a.974963","wires":[]},{"id":"ae3be0c3.a3ad4","type":"comment","name":"GET brg-allotted-resource from mdsal","info":"","comments":"","x":573.9576683044434,"y":435.19576239585876,"z":"d029d2a.974963","wires":[]},{"id":"1fd599c8.bea286","type":"switchNode","name":"switch order-status","xml":"<switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1831.6721076965332,"y":539.0529546737671,"z":"d029d2a.974963","wires":[["ea7abf8a.d6c0e","88378d84.e1337"]]},{"id":"ea7abf8a.d6c0e","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2043.2720642089844,"y":500.0529546737671,"z":"d029d2a.974963","wires":[["c95729c.38426d8"]]},{"id":"88378d84.e1337","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2068.9864387512207,"y":535.4815454483032,"z":"d029d2a.974963","wires":[["c95729c.38426d8"]]},{"id":"81dbbc42.6cf3b","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":529.4814910888672,"y":525.7672157287598,"z":"d029d2a.974963","wires":[]},{"id":"874276d9.71a568","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-brg-ar' value='$mdsal-ar.' />\n","comments":"","x":1312.5292778015137,"y":471.1958634853363,"z":"d029d2a.974963","wires":[]},{"id":"ef3a6e4c.51d76","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":485.10051345825195,"y":340.0529260635376,"z":"d029d2a.974963","wires":[]},{"id":"fb95f526.14ff08","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":963.3862380981445,"y":812.9102020263672,"z":"d029d2a.974963","wires":[[]]},{"id":"369a0f6a.c9ad8","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":487.38623046875,"y":713.5767650604248,"z":"d029d2a.974963","wires":[]},{"id":"fc0c4385.ee3a5","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":471.38623428344727,"y":642.9101247787476,"z":"d029d2a.974963","wires":[[]]},{"id":"f31fdf96.9d6cc","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":805.719539642334,"y":506.90999484062195,"z":"d029d2a.974963","wires":[["19da75c4.bf509a"]]},{"id":"19da75c4.bf509a","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":985.7194900512695,"y":507.57654547691345,"z":"d029d2a.974963","wires":[[]]},{"id":"56345297.bc34dc","type":"set","name":"set id","xml":"<set>\n<parameter name='brg-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='brg-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='brg-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='brg-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />","comments":"","x":454.3862762451172,"y":562.5767364501953,"z":"d029d2a.974963","wires":[]},{"id":"c95729c.38426d8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2257.7425804138184,"y":501.4285888671875,"z":"d029d2a.974963","wires":[[]]},{"id":"62744ec2.dbf8","type":"update","name":"update AAI allotted-resource","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"operational-status\" value=\"in-service-path\" />\n","comments":"","outputs":1,"x":515.0000152587891,"y":746.6666326522827,"z":"d029d2a.974963","wires":[["5211695c.bb63d8","6077137b.90cddc"]]},{"id":"5211695c.bb63d8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":770.7619094848633,"y":729.6191296577454,"z":"d029d2a.974963","wires":[["fa37c9f8.eb9288"]]},{"id":"fa37c9f8.eb9288","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"AAI failed\" />\n","comments":"","x":937.2857894897461,"y":741.2382006645203,"z":"d029d2a.974963","wires":[]},{"id":"6077137b.90cddc","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":777.8571968078613,"y":762.381097316742,"z":"d029d2a.974963","wires":[["fa37c9f8.eb9288"]]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-assign.json
index 1b414791..69da89d3 100755..100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-assign.json
@@ -1 +1 @@
-[{"id":"3aa7dd53.c23282","type":"dgstart","name":"DGSTART","outputs":1,"x":113.75662612915039,"y":48.518513679504395,"z":"d9f8bc54.6ca48","wires":[["d95c10eb.dc1d4"]]},{"id":"d95c10eb.dc1d4","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":209.9947052001953,"y":109.47090435028076,"z":"d9f8bc54.6ca48","wires":[["9ec57dff.79a3e"]]},{"id":"9ec57dff.79a3e","type":"method","name":"brg-topology-operation-assign","xml":"<method rpc='brg-topology-operation-assign' mode='sync'>\n","comments":"","outputs":1,"x":255.91148376464844,"y":144.70895957946777,"z":"d9f8bc54.6ca48","wires":[["b469237.21f31e"]]},{"id":"b469237.21f31e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":164.23281860351562,"y":288.0423016548157,"z":"d9f8bc54.6ca48","wires":[["da8bc6b3.f36008","dd46184f.c5ad68","19bd4a95.82d635","7ff7d11f.c2ff8","5082e4fd.fb398c","44a8ff0c.4ea4","3f7399d.1a38166","df2b47bc.dad938","29f6546e.b6ab2c","cd2238ce.a361f8","f37960af.a307","676f8458.1ceddc","41c3e1d7.688b9","bf0c5aa1.d23018","bb728435.7fabc8","db115202.e2393","773fe048.c730b","995418ca.5fe778","422fade5.4f8814","83f71044.bcea7","4f2b0053.cbdf5","14e2f5f2.92d2fa","121f5121.c5ff2f","a4891e73.c917","a62f34b1.dd5738","87ceb4de.ec7128","c025c3c9.338f6"]]},{"id":"dd46184f.c5ad68","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":380.75672149658203,"y":2301.73295211792,"z":"d9f8bc54.6ca48","wires":[]},{"id":"da8bc6b3.f36008","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":409.51063537597656,"y":2265.855498313904,"z":"d9f8bc54.6ca48","wires":[]},{"id":"a62f34b1.dd5738","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":469.0821876525879,"y":1642.569899559021,"z":"d9f8bc54.6ca48","wires":[]},{"id":"7ff7d11f.c2ff8","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n","comments":"","x":426.49468994140625,"y":261.85183906555176,"z":"d9f8bc54.6ca48","wires":[]},{"id":"19bd4a95.82d635","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.sz-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />\n\n\n","comments":"","x":473.7539520263672,"y":228.11110496520996,"z":"d9f8bc54.6ca48","wires":[]},{"id":"5082e4fd.fb398c","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":432.7500457763672,"y":297.75003814697266,"z":"d9f8bc54.6ca48","wires":[[]]},{"id":"3f7399d.1a38166","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":513.2753753662109,"y":520.9779777526855,"z":"d9f8bc54.6ca48","wires":[["5afe88e8.32e0a8","4a737d1.caa4e84"]]},{"id":"44a8ff0c.4ea4","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.sz-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":460.8214797973633,"y":357.5357427597046,"z":"d9f8bc54.6ca48","wires":[[]]},{"id":"5afe88e8.32e0a8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":758.5715179443359,"y":523.7857661247253,"z":"d9f8bc54.6ca48","wires":[["b6853767.ffe678"]]},{"id":"14e2f5f2.92d2fa","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":487.61922454833984,"y":1847.2859721183777,"z":"d9f8bc54.6ca48","wires":[["975af54b.31fe88","615e377.16035c8","3777cc93.f26b94"]]},{"id":"975af54b.31fe88","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":756.2606010437012,"y":1898.6173838600516,"z":"d9f8bc54.6ca48","wires":[["a456aa59.071ed8"]]},{"id":"615e377.16035c8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":747.2606506347656,"y":1867.1174096092582,"z":"d9f8bc54.6ca48","wires":[["a456aa59.071ed8"]]},{"id":"3777cc93.f26b94","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":751.0106887817383,"y":1837.4745144844055,"z":"d9f8bc54.6ca48","wires":[["4593956d.d1f3ec"]]},{"id":"a456aa59.071ed8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for brg-allotted-resource\" />\n","comments":"","x":917.0106887817383,"y":1867.867433451116,"z":"d9f8bc54.6ca48","wires":[]},{"id":"b6853767.ffe678","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":939.5714721679688,"y":524.2857155799866,"z":"d9f8bc54.6ca48","wires":[["f8ae24aa.f00bb8","a0673b92.f4f7c8"]]},{"id":"f8ae24aa.f00bb8","type":"switchNode","name":"switch sz length","xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1185.4287185668945,"y":558.571478843689,"z":"d9f8bc54.6ca48","wires":[["b691cae6.eefd08"]]},{"id":"b691cae6.eefd08","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1376.4287223815918,"y":558.5714764595032,"z":"d9f8bc54.6ca48","wires":[["c71c7fc0.fb074"]]},{"id":"9e2ca7ca.004578","type":"set","name":"set sz-ar from get","xml":"<set>\n<parameter name='sz-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />\n","comments":"","x":1770.286018371582,"y":493.14292335510254,"z":"d9f8bc54.6ca48","wires":[]},{"id":"c71c7fc0.fb074","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1563.2858505249023,"y":527.1428961753845,"z":"d9f8bc54.6ca48","wires":[["9e2ca7ca.004578","577032f2.5c728c","f6f446f7.eb6e38"]]},{"id":"577032f2.5c728c","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1770.286018371582,"y":572.5714111328125,"z":"d9f8bc54.6ca48","wires":[]},{"id":"b73d4268.63b59","type":"comment","name":"Save consumed-allotted-resources to mdsal","info":"","comments":"","x":491.0000915527344,"y":1490.238136291504,"z":"d9f8bc54.6ca48","wires":[]},{"id":"9c87c693.6b7aa8","type":"comment","name":"GET brg-allotted-resource from mdsal","info":"","comments":"","x":526.5714416503906,"y":488.28570652008057,"z":"d9f8bc54.6ca48","wires":[]},{"id":"f6f446f7.eb6e38","type":"switchNode","name":"switch order-status","xml":"<switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1778.2858810424805,"y":526.1428985595703,"z":"d9f8bc54.6ca48","wires":[["1ba18b9c.c66c64","e561c273.b01c"]]},{"id":"1ba18b9c.c66c64","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":1989.8858375549316,"y":487.1428985595703,"z":"d9f8bc54.6ca48","wires":[["ace0f78a.8c4198"]]},{"id":"e561c273.b01c","type":"outcome","name":"outcome PendingDelete","xml":"<outcome value='PendingDelete'>\n","comments":"","outputs":1,"x":2015.600212097168,"y":522.5714893341064,"z":"d9f8bc54.6ca48","wires":[["ace0f78a.8c4198"]]},{"id":"ace0f78a.8c4198","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" \n    value=\"`'Existing brg-allotted-resource with order status of ' + $sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n","comments":"","x":2277.885810852051,"y":495.14288544654846,"z":"d9f8bc54.6ca48","wires":[]},{"id":"df2b47bc.dad938","type":"set","name":"set sz-ar-identifiers","xml":"<set>\n<parameter name='sz-ar-identifiers.consuming-service-instance-id' value=\"`$brg-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='sz-ar-identifiers.parent-service-instance-id' value=\"`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='sz-ar-identifiers.allotted-resource-type' value=\"`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='sz-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n","comments":"","x":437.1429138183594,"y":677.1428809165955,"z":"d9f8bc54.6ca48","wires":[]},{"id":"c09b6648.7720b8","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":478.0952682495117,"y":622.8571615219116,"z":"d9f8bc54.6ca48","wires":[]},{"id":"29f6546e.b6ab2c","type":"set","name":"set identifiers in overal structure","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.' \nvalue=\"`$sz-ar-identifiers.`\" />\n\n\n","comments":"","x":474.1428756713867,"y":951.428858757019,"z":"d9f8bc54.6ca48","wires":[]},{"id":"cd2238ce.a361f8","type":"set","name":"set ecomp model information from input","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.brg-topology.onap-model-information.' \nvalue=\"`$brg-topology-operation-input.allotted-resource-information.onap-model-information.`\" />\n\n\n","comments":"","x":505.7143325805664,"y":711.4285831451416,"z":"d9f8bc54.6ca48","wires":[]},{"id":"f37960af.a307","type":"switchNode","name":"switch model-invariant-uuid is null","xml":"<switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>\n","comments":"","outputs":1,"x":488.5714416503906,"y":745.714301109314,"z":"d9f8bc54.6ca48","wires":[["cdaca375.86687"]]},{"id":"cdaca375.86687","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":715.7143211364746,"y":747.1428184509277,"z":"d9f8bc54.6ca48","wires":[["ca95e15f.7a282"]]},{"id":"ca95e15f.7a282","type":"set","name":"set model-invariant-uuid","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.brg-topology.onap-model-information.model-invariant-uuid' \nvalue=\"`$ar-model.invariant-uuid`\" />\n\n\n","comments":"","x":917.142894744873,"y":746.5713710784912,"z":"d9f8bc54.6ca48","wires":[]},{"id":"676f8458.1ceddc","type":"switchNode","name":"switch model-uuid is null","xml":"<switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>\n","comments":"","outputs":1,"x":460.00003814697266,"y":780.0000019073486,"z":"d9f8bc54.6ca48","wires":[["c051003f.4d255"]]},{"id":"c051003f.4d255","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":661.4286041259766,"y":780.5714235305786,"z":"d9f8bc54.6ca48","wires":[["17a9ad79.daf043"]]},{"id":"17a9ad79.daf043","type":"set","name":"set model-uuid","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.brg-topology.onap-model-information.model-uuid' \nvalue=\"`$ar-model.uuid`\" />\n\n\n","comments":"","x":854.2857627868652,"y":780.5713453292847,"z":"d9f8bc54.6ca48","wires":[]},{"id":"41c3e1d7.688b9","type":"switchNode","name":"switch model-version is null","xml":"<switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>\n","comments":"","outputs":1,"x":468.5714416503906,"y":812.8571290969849,"z":"d9f8bc54.6ca48","wires":[["834cdb5d.a611a8"]]},{"id":"834cdb5d.a611a8","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":718.5714225769043,"y":812.8571138381958,"z":"d9f8bc54.6ca48","wires":[["6df03ba1.da4d84"]]},{"id":"6df03ba1.da4d84","type":"set","name":"set model-version","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.brg-topology.onap-model-information.model-version' \nvalue=\"`$ar-model.version`\" />\n\n\n","comments":"","x":911.428581237793,"y":812.8570356369019,"z":"d9f8bc54.6ca48","wires":[]},{"id":"bf0c5aa1.d23018","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.ecomp-generated-naming`'>\n","comments":"","outputs":1,"x":507.1428413391113,"y":914.2858047485352,"z":"d9f8bc54.6ca48","wires":[["8263bea9.21776","31dce175.8172ce"]]},{"id":"8263bea9.21776","type":"other","name":"outcome Y","xml":"<outcome value='Y'>\n","comments":"","outputs":1,"x":857.1429061889648,"y":913.7143549919128,"z":"d9f8bc54.6ca48","wires":[["6d3862a4.def2cc"]]},{"id":"6d3862a4.def2cc","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":1025.8929481506348,"y":914.214343547821,"z":"d9f8bc54.6ca48","wires":[["340cfc26.1a1d64"]]},{"id":"31dce175.8172ce","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":848.3651962280273,"y":946.7143549919128,"z":"d9f8bc54.6ca48","wires":[["79411f72.37cc4"]]},{"id":"79411f72.37cc4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error in allotted-resource-model data.  Ecomp-generated-naming should be true\" />\n\n","comments":"","x":1026.3651962280273,"y":945.7143549919128,"z":"d9f8bc54.6ca48","wires":[]},{"id":"340cfc26.1a1d64","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.naming-policy`'>\n","comments":"","outputs":1,"x":1327.1428527832031,"y":914.2858171463013,"z":"d9f8bc54.6ca48","wires":[["c60923e3.e3226","5fb6c973.79b708"]]},{"id":"c60923e3.e3226","type":"other","name":"outcome oam_security_zone_name","xml":"<outcome value='oam_security_zone_name'>\n","comments":"","outputs":1,"x":1668.000617980957,"y":914.8638672828674,"z":"d9f8bc54.6ca48","wires":[["64919905.bc8708"]]},{"id":"5fb6c973.79b708","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1579.4285507202148,"y":945.714367389679,"z":"d9f8bc54.6ca48","wires":[["64919905.bc8708"]]},{"id":"47d880dc.e5c98","type":"set","name":"set ar_name","xml":"<set>\n<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />\n","comments":"","x":2108.8573417663574,"y":914.2857584953308,"z":"d9f8bc54.6ca48","wires":[]},{"id":"e616a9fb.2ba0a8","type":"execute","name":"execute SliStringUtils - replace TenantOAMNetworkRole","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ar-name`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-name\"/>\n    <parameter name=\"target\" value=\"$TenantOAMNetworkRole\"/>\n    <parameter name=\"replacement\" value=\"`$brg-topology-operation-input.brg-request-input.untrusted-network-role`\"/>\n\n","comments":"","outputs":1,"x":2246.0004119873047,"y":947.1429333686829,"z":"d9f8bc54.6ca48","wires":[[]]},{"id":"c3a0064f.e2bfc8","type":"execute","name":"execute SliStringUtils - replace LandingNetworkRole","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ar-name`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-name\"/>\n    <parameter name=\"target\" value=\"$LandingNetworkRole\"/>\n    <parameter name=\"replacement\" value=\"`$brg-topology-operation-input.brg-request-input.trusted-network-role`\"/>\n\n","comments":"","outputs":1,"x":2229.0004272460938,"y":979.2858099937439,"z":"d9f8bc54.6ca48","wires":[[]]},{"id":"64919905.bc8708","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1910.2858276367188,"y":942.8572659492493,"z":"d9f8bc54.6ca48","wires":[["47d880dc.e5c98","e616a9fb.2ba0a8","c3a0064f.e2bfc8","3ea93d43.94b532"]]},{"id":"3ea93d43.94b532","type":"set","name":"set identifiers.allotted-resource-name","xml":"<set>\n<parameter name='sz-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />\n","comments":"","x":2178.8573150634766,"y":1008.571485042572,"z":"d9f8bc54.6ca48","wires":[]},{"id":"db115202.e2393","type":"set","name":"set assignments in overal structure","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.brg-topology.brg-assignments.' \nvalue=\"`$sz-ar-assignments.`\" />\n\n\n","comments":"","x":482.61910247802734,"y":1117.1431503295898,"z":"d9f8bc54.6ca48","wires":[]},{"id":"bb728435.7fabc8","type":"set","name":"set sz-ar-assignments","xml":"<set>\n<parameter name='sz-ar-assignments.vlan-tag' value=\"`$brg-topology-operation-input.brg-request-input.vlan-tag` \" />\n<parameter name='sz-ar-assignments.trusted-network-role' value=\"`$brg-topology-operation-input.brg-request-input.trusted-network-role` \" />\n<parameter name='sz-ar-assignments.untrusted-network-role' value=\"`$brg-topology-operation-input.brg-request-input.untrusted-network-role` \" />\n<parameter name='sz-ar-assignments.brg-service-instance-id' value=\"`$tmp.ar.parent-service-instance-id` \" />\n\n","comments":"","x":444.28570556640625,"y":988.5715227127075,"z":"d9f8bc54.6ca48","wires":[]},{"id":"cae22b42.18c468","type":"for","name":"for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]","xml":"<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n","comments":"","outputs":1,"x":1360.572135925293,"y":1564.8096537590027,"z":"d9f8bc54.6ca48","wires":[["7553ad4e.ad7d94"]]},{"id":"773fe048.c730b","type":"switchNode","name":"switch service-data.consumed-allotted-resources_length","xml":"<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n","comments":"","outputs":1,"x":534.5714721679688,"y":1524.5236463546753,"z":"d9f8bc54.6ca48","wires":[["38c33f23.a99c8","61a487f.6f30978"]]},{"id":"38c33f23.a99c8","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":840.7143859863281,"y":1529.3809938430786,"z":"d9f8bc54.6ca48","wires":[["3413dfa5.ea0b8"]]},{"id":"61a487f.6f30978","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":820.7143859863281,"y":1564.3809938430786,"z":"d9f8bc54.6ca48","wires":[["a9ef602f.19524"]]},{"id":"7553ad4e.ad7d94","type":"switchNode","name":"switch allotted-resource-id","xml":"<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n","comments":"","outputs":1,"x":1812.6673278808594,"y":1562.869366645813,"z":"d9f8bc54.6ca48","wires":[["2bfef68b.19fdca"]]},{"id":"2bfef68b.19fdca","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2004.4769649505615,"y":1562.3335065841675,"z":"d9f8bc54.6ca48","wires":[["2e1ed2f6.15d1fe"]]},{"id":"a9ef602f.19524","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":974.8415298461914,"y":1564.5069856643677,"z":"d9f8bc54.6ca48","wires":[["cae22b42.18c468","91a87775.758588"]]},{"id":"2e1ed2f6.15d1fe","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2160.238296508789,"y":1562.1907081604004,"z":"d9f8bc54.6ca48","wires":[["e679b033.de33f","4d5ec78f.74ab88"]]},{"id":"3413dfa5.ea0b8","type":"set","name":"set cidx","xml":"<set>\n<parameter name='tmp.cidx' value=\"`0`\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value=\"1\" />\n\n\n","comments":"","x":999.5713996887207,"y":1529.0952253341675,"z":"d9f8bc54.6ca48","wires":[]},{"id":"e679b033.de33f","type":"set","name":"set tmp.cidx and ctx.consumed-ar","xml":"<set>\n<parameter name='tmp.cidx' value='`$cidx`' />\n<parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />\n<parameter name='tmp.found-cidx' value='true' />","comments":"","x":2406.0957565307617,"y":1556.7621870040894,"z":"d9f8bc54.6ca48","wires":[]},{"id":"995418ca.5fe778","type":"set","name":"set consumed allotted resources","xml":"<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n","comments":"","x":462.42862701416016,"y":1565.0951986312866,"z":"d9f8bc54.6ca48","wires":[]},{"id":"59610fb0.0a244","type":"execute","name":"execute RestApiCallNode - PUT SZ VNF Provided Allotted Resource","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.vnf-p-ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-prov-ar\" />\n\n","comments":"","outputs":1,"x":575.9049606323242,"y":2049.0955414772034,"z":"d9f8bc54.6ca48","wires":[["ae04f7b.eed3208","5027b5f7.e37cbc"]]},{"id":"a0673b92.f4f7c8","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-sz-ar' value='$mdsal-ar.' />\n","comments":"","x":1265.143051147461,"y":524.2858076095581,"z":"d9f8bc54.6ca48","wires":[]},{"id":"422fade5.4f8814","type":"execute","name":"generate vnf provided ar url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.vnf-provided-allottedresource`\" />\n    <parameter name=\"outputPath\" value=\"tmp.vnf-p-ar-url\" />\n    <parameter name=\"target\" value=\"{service-instance-id}\" />\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\" />\n","comments":"","outputs":1,"x":452.8571472167969,"y":388.57141876220703,"z":"d9f8bc54.6ca48","wires":[[]]},{"id":"83f71044.bcea7","type":"execute","name":"execute SliStringUtils","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.vnf-p-ar-url`\" />\n    <parameter name=\"outputPath\" value=\"tmp.vnf-p-ar-url\" />\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.sz-vnf-id`\"/>\n","comments":"","outputs":1,"x":443.1428985595703,"y":419.99999809265137,"z":"d9f8bc54.6ca48","wires":[[]]},{"id":"ec9be6aa.494588","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":431.7142868041992,"y":327.1428699493408,"z":"d9f8bc54.6ca48","wires":[]},{"id":"ae04f7b.eed3208","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":934.4763298034668,"y":2049.666941165924,"z":"d9f8bc54.6ca48","wires":[["f9fdf5f9.8e4668"]]},{"id":"f9fdf5f9.8e4668","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1144.047706604004,"y":2048.738305568695,"z":"d9f8bc54.6ca48","wires":[["3eccb358.12c2dc","968252db.ccc84"]]},{"id":"3eccb358.12c2dc","type":"switchNode","name":"switch sz length","xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1389.9049530029297,"y":2083.0240688323975,"z":"d9f8bc54.6ca48","wires":[["452ba5e6.956fcc"]]},{"id":"452ba5e6.956fcc","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1580.904956817627,"y":2083.0240664482117,"z":"d9f8bc54.6ca48","wires":[[]]},{"id":"968252db.ccc84","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-sz-ar' value='$mdsal-ar.' />\n","comments":"","x":1469.619285583496,"y":2048.7383975982666,"z":"d9f8bc54.6ca48","wires":[]},{"id":"5027b5f7.e37cbc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":933.047721862793,"y":2139.6668133735657,"z":"d9f8bc54.6ca48","wires":[["ce01090.f9b9af8"]]},{"id":"f1ea7873.944388","type":"comment","name":"Need to rollback?","info":"","comments":"","x":935.9049758911133,"y":2088.238205432892,"z":"d9f8bc54.6ca48","wires":[]},{"id":"e06b36.87ea84c8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for brg-allotted-resource\" />\n","comments":"","x":1310.1905517578125,"y":2181.0956473350525,"z":"d9f8bc54.6ca48","wires":[]},{"id":"eeb0dfbd.307f7","type":"execute","name":"execute RestApiCallNode - DELETE AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":1411.6191864013672,"y":2142.5242981910706,"z":"d9f8bc54.6ca48","wires":[[]]},{"id":"ce01090.f9b9af8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1107.3334274291992,"y":2142.523895740509,"z":"d9f8bc54.6ca48","wires":[["eeb0dfbd.307f7","e06b36.87ea84c8"]]},{"id":"bde153f5.6a65","type":"comment","name":"Generate Security zone Panorama names","info":"","comments":"","x":494.8095932006836,"y":1016.1907386779785,"z":"d9f8bc54.6ca48","wires":[]},{"id":"4f2b0053.cbdf5","type":"set","name":"set sz-ar-assignments","xml":"<set>\n<parameter name='sz-ar-assignments.brg-name-untrusted' value=\"`$tmp.untrust-sz` \" />\n<parameter name='sz-ar-assignments.brg-name-trusted' value=\"`$tmp.trust-sz` \" />\n\n\n","comments":"","x":444.0953140258789,"y":1080.7148094177246,"z":"d9f8bc54.6ca48","wires":[]},{"id":"c28eabf9.0410c8","type":"execute","name":"execute SliStringUtils","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.vnf-p-ar-url`\" />\n    <parameter name=\"outputPath\" value=\"tmp.vnf-p-ar-url\" />\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.sz-vnf-id`\"/>\n","comments":"","outputs":1,"x":444.28570556640625,"y":451.4285583496094,"z":"d9f8bc54.6ca48","wires":[[]]},{"id":"121f5121.c5ff2f","type":"call","name":"call generate-panorama-name","xml":"<call module='GENERIC-RESOURCE-API' rpc='generate-panorama-name' mode='sync' >\n","comments":"","outputs":1,"x":465.00001525878906,"y":1046.66672706604,"z":"d9f8bc54.6ca48","wires":[[]]},{"id":"4593956d.d1f3ec","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":892.6666564941406,"y":1833.6666836738586,"z":"d9f8bc54.6ca48","wires":[["297e2310.b99eec"]]},{"id":"a64508aa.c4e898","type":"comment","name":"Add SZ AR to mdsal","info":"","comments":"","x":416.9048080444336,"y":1808.3808569908142,"z":"d9f8bc54.6ca48","wires":[]},{"id":"a4891e73.c917","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":424.66665840148926,"y":1602.3333406448364,"z":"d9f8bc54.6ca48","wires":[[]]},{"id":"4a737d1.caa4e84","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":758.3333129882812,"y":559.9999389648438,"z":"d9f8bc54.6ca48","wires":[["f20f59c0.b02038"]]},{"id":"f20f59c0.b02038","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":938.3332633972168,"y":560.6664896011353,"z":"d9f8bc54.6ca48","wires":[[]]},{"id":"87ceb4de.ec7128","type":"set","name":"set id","xml":"<set>\n<parameter name='sz-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='sz-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='sz-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='sz-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />","comments":"","x":405.000057220459,"y":585.9523229598999,"z":"d9f8bc54.6ca48","wires":[]},{"id":"c025c3c9.338f6","type":"update","name":"update AAI allotted-resource","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$ar-model.invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$ar-model.uuid`\" />\n\t<parameter name=\"operational-status\" value=\"null\" />\n","comments":"","outputs":1,"x":446.66668701171875,"y":1730.238124847412,"z":"d9f8bc54.6ca48","wires":[["78f280c9.aa658","3206f266.94f28e"]]},{"id":"78f280c9.aa658","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":702.428596496582,"y":1713.190628528595,"z":"d9f8bc54.6ca48","wires":[["e21aa9c5.4ebb08"]]},{"id":"e21aa9c5.4ebb08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"AAI failed\" />\n","comments":"","x":868.9524765014648,"y":1724.8096995353699,"z":"d9f8bc54.6ca48","wires":[]},{"id":"3206f266.94f28e","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":709.5238838195801,"y":1745.9525961875916,"z":"d9f8bc54.6ca48","wires":[["e21aa9c5.4ebb08"]]},{"id":"91a87775.758588","type":"switchNode","name":"switch tmp.found-cidx","xml":"<switch test='`$tmp.found-cidx`'>\n","comments":"","outputs":1,"x":1177.999984741211,"y":1596.0000410079956,"z":"d9f8bc54.6ca48","wires":[["f9327230.fb919"]]},{"id":"f9327230.fb919","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1367.9999389648438,"y":1595.9999780654907,"z":"d9f8bc54.6ca48","wires":[["fde4a6ad.8b8798"]]},{"id":"fde4a6ad.8b8798","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1533.9999389648438,"y":1595.9999780654907,"z":"d9f8bc54.6ca48","wires":[["f243be1.0d9664"]]},{"id":"f243be1.0d9664","type":"set","name":"set tmp.cidx ","xml":"<set>\n<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\n","comments":"","x":1779.8572673797607,"y":1596.571452140808,"z":"d9f8bc54.6ca48","wires":[]},{"id":"4d5ec78f.74ab88","type":"break","name":"break","xml":"<break>\n","comments":"","x":2324.000057220459,"y":1588.0000791549683,"z":"d9f8bc54.6ca48","wires":[]},{"id":"297e2310.b99eec","type":"execute","name":"execute RestApiCallNode - Update parent provided service AR","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"parent\" />\n\n","comments":"","outputs":1,"x":1243.708797454834,"y":1833.3755688667297,"z":"d9f8bc54.6ca48","wires":[["90eb7941.4e6d28","529b5fcc.fe782","5dd2303d.8c34d"]]},{"id":"c07fd6c.a7d3c28","type":"comment","name":"Rollback parent","info":"","comments":"","x":1087.708724975586,"y":1803.0421993732452,"z":"d9f8bc54.6ca48","wires":[]},{"id":"90eb7941.4e6d28","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1615.016845703125,"y":1894.040535211563,"z":"d9f8bc54.6ca48","wires":[["f889d017.68c21"]]},{"id":"529b5fcc.fe782","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1606.0168952941895,"y":1862.5405609607697,"z":"d9f8bc54.6ca48","wires":[["f889d017.68c21"]]},{"id":"5dd2303d.8c34d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1609.766933441162,"y":1832.897665835917,"z":"d9f8bc54.6ca48","wires":[["f889d017.68c21"]]},{"id":"f889d017.68c21","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1751.4229011535645,"y":1829.0898350253701,"z":"d9f8bc54.6ca48","wires":[[]]},{"id":"d41e8d9f.684df","type":"comment","name":"Generate naming","info":"","comments":"","x":438.00001525878906,"y":876.0000257492065,"z":"d9f8bc54.6ca48","wires":[]}]
+[{"id":"1a9e9fdb.f14c98","type":"dgstart","name":"DGSTART","outputs":1,"x":142,"y":73,"z":"c29cef13.e3d5d8","wires":[["1feecfbb.b6bd08"]]},{"id":"1feecfbb.b6bd08","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":238.23807907104492,"y":133.95239067077637,"z":"c29cef13.e3d5d8","wires":[["7d03abf3.8482a4"]]},{"id":"7d03abf3.8482a4","type":"method","name":"brg-topology-operation-assign","xml":"<method rpc='brg-topology-operation-assign' mode='sync'>\n","comments":"","outputs":1,"x":284.15485763549805,"y":169.19044589996338,"z":"c29cef13.e3d5d8","wires":[["d5a51879.bee068"]]},{"id":"d5a51879.bee068","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":192.47619247436523,"y":312.5237879753113,"z":"c29cef13.e3d5d8","wires":[["7efbee27.8c249","635c64fe.15e31c","4eefe296.7bebbc","2e8ac5c1.b9bbfa","4684c0aa.3dde3"]]},{"id":"53291df6.9ddfb4","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":1035.6666564941406,"y":2239.5477046966553,"z":"c29cef13.e3d5d8","wires":[]},{"id":"39990b91.9af8dc","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":1072.7540550231934,"y":2118.432439804077,"z":"c29cef13.e3d5d8","wires":[]},{"id":"f567c426.8d891","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":1144.468376159668,"y":1535.6228160858154,"z":"c29cef13.e3d5d8","wires":[]},{"id":"635c64fe.15e31c","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n","comments":"","x":622.7380676269531,"y":204.33331298828125,"z":"c29cef13.e3d5d8","wires":[]},{"id":"7efbee27.8c249","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n","comments":"","x":675.997314453125,"y":166.59259033203125,"z":"c29cef13.e3d5d8","wires":[]},{"id":"9a0daa46.107f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":825.8148803710938,"y":352.26727294921875,"z":"c29cef13.e3d5d8","wires":[["ff1ebed0.644eb"]]},{"id":"e6d60f2.c65a0f","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":1165.8626251220703,"y":1760.1008231639862,"z":"c29cef13.e3d5d8","wires":[["4ec8b7a6.16c2d","e4cab2c4.276ff8","a753b6df.52a578"]]},{"id":"4ec8b7a6.16c2d","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1434.5040016174316,"y":1811.4322349056602,"z":"c29cef13.e3d5d8","wires":[["25fc91ec.35c546"]]},{"id":"e4cab2c4.276ff8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1425.504051208496,"y":1779.9322606548667,"z":"c29cef13.e3d5d8","wires":[["25fc91ec.35c546"]]},{"id":"a753b6df.52a578","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1429.2540893554688,"y":1750.289365530014,"z":"c29cef13.e3d5d8","wires":[["bfac6da0.ad031"]]},{"id":"25fc91ec.35c546","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n","comments":"","x":1595.2540893554688,"y":1780.6822844967246,"z":"c29cef13.e3d5d8","wires":[]},{"id":"37b45496.104104","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1175.5294189453125,"y":453.05291748046875,"z":"c29cef13.e3d5d8","wires":[]},{"id":"5cd97725.c0723","type":"comment","name":"Save consumed-allotted-resources to mdsal","info":"","comments":"","x":1243.2434692382812,"y":1134.7196044921875,"z":"c29cef13.e3d5d8","wires":[]},{"id":"b12e4e28.0a5df8","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":548.8148193359375,"y":322.7672119140625,"z":"c29cef13.e3d5d8","wires":[]},{"id":"ff1ebed0.644eb","type":"returnFailure","name":"return failure - tunnelxconn already exists","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" \n    value=\"`'Existing brg-allotted-resource with order status of ' + $mdsal-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n","comments":"","x":1135.129150390625,"y":348.6243896484375,"z":"c29cef13.e3d5d8","wires":[]},{"id":"8c2d795e.9f5a88","type":"set","name":"set brg-ar-identifiers","xml":"<set>\n<parameter name='brg-ar-identifiers.consuming-service-instance-id' value=\"`$brg-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='brg-ar-identifiers.parent-service-instance-id' value=\"`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='brg-ar-identifiers.allotted-resource-type' value=\"`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='brg-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n","comments":"","x":1185.38623046875,"y":546.6243896484375,"z":"c29cef13.e3d5d8","wires":[]},{"id":"f6bafeac.462b98","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":1212.338623046875,"y":505.338623046875,"z":"c29cef13.e3d5d8","wires":[]},{"id":"1a0f3a2c.0a3de6","type":"set","name":"set identifiers in overall structure","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.' \nvalue=\"`$brg-ar-identifiers.`\" />\n\n\n","comments":"","x":1202.38623046875,"y":854.910400390625,"z":"c29cef13.e3d5d8","wires":[]},{"id":"3d181765.fbccf","type":"set","name":"set onap model information from input","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.brg-topology.onap-model-information.' \nvalue=\"`$brg-topology-operation-input.allotted-resource-information.onap-model-information.`\" />\n\n\n","comments":"","x":1230.957763671875,"y":589.9100952148438,"z":"c29cef13.e3d5d8","wires":[]},{"id":"d2df734a.c38c08","type":"switchNode","name":"switch model-invariant-uuid is null","xml":"<switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>\n","comments":"","outputs":1,"x":1210.8148193359375,"y":629.19580078125,"z":"c29cef13.e3d5d8","wires":[["da6db434.ac4448"]]},{"id":"da6db434.ac4448","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1438.9576988220215,"y":630.6243271827698,"z":"c29cef13.e3d5d8","wires":[["eb8c65a7.0d7d38"]]},{"id":"eb8c65a7.0d7d38","type":"set","name":"set model-invariant-uuid","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-invariant-uuid' \nvalue=\"`$ar-model.invariant-uuid`\" />\n\n\n","comments":"","x":1640.38627243042,"y":630.0528798103333,"z":"c29cef13.e3d5d8","wires":[]},{"id":"bff5d451.212c3","type":"switchNode","name":"switch model-uuid is null","xml":"<switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>\n","comments":"","outputs":1,"x":1183.2434158325195,"y":663.4815106391907,"z":"c29cef13.e3d5d8","wires":[["3c5106bf.1bfc5a"]]},{"id":"3c5106bf.1bfc5a","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1384.6719818115234,"y":664.0529322624207,"z":"c29cef13.e3d5d8","wires":[["25cec0f1.eb3838"]]},{"id":"25cec0f1.eb3838","type":"set","name":"set model-uuid","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-uuid' \nvalue=\"`$ar-model.uuid`\" />\n\n\n","comments":"","x":1577.529140472412,"y":664.0528540611267,"z":"c29cef13.e3d5d8","wires":[]},{"id":"a9cd943.ce163e8","type":"switchNode","name":"switch model-version is null","xml":"<switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>\n","comments":"","outputs":1,"x":1191.8148193359375,"y":696.3386378288269,"z":"c29cef13.e3d5d8","wires":[["1543121f.333836"]]},{"id":"1543121f.333836","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1441.8148002624512,"y":696.3386225700378,"z":"c29cef13.e3d5d8","wires":[["3d10d727.63e288"]]},{"id":"3d10d727.63e288","type":"set","name":"set model-version","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version' \nvalue=\"`$ar-model.version`\" />\n\n\n","comments":"","x":1634.6719589233398,"y":696.3385443687439,"z":"c29cef13.e3d5d8","wires":[]},{"id":"bb4550d6.319aa8","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.ecomp-generated-naming`'>\n","comments":"","outputs":1,"x":1255.38623046875,"y":798.7672729492188,"z":"c29cef13.e3d5d8","wires":[["cade400.4162ac","545a814a.c84b6"]]},{"id":"cade400.4162ac","type":"other","name":"outcome Y","xml":"<outcome value='Y'>\n","comments":"","outputs":1,"x":1541.3862915039062,"y":798.1958618164062,"z":"c29cef13.e3d5d8","wires":[["bb122ced.1a0cd"]]},{"id":"bb122ced.1a0cd","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":1695.1363525390625,"y":800.69580078125,"z":"c29cef13.e3d5d8","wires":[["d8196485.7c217"]]},{"id":"545a814a.c84b6","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1560.608642578125,"y":887.1958618164062,"z":"c29cef13.e3d5d8","wires":[["46c2ee0d.c84ff8"]]},{"id":"46c2ee0d.c84ff8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error in allotted-resource-model data.  Ecomp-generated-naming should be true\" />\n\n","comments":"","x":1743.608642578125,"y":892.1958618164062,"z":"c29cef13.e3d5d8","wires":[]},{"id":"d8196485.7c217","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.naming-policy`'>\n","comments":"","outputs":1,"x":1831.38623046875,"y":849.767333984375,"z":"c29cef13.e3d5d8","wires":[["bb4e2b9c.4086d8","2356c985.0b0286"]]},{"id":"bb4e2b9c.4086d8","type":"other","name":"outcome oam_network_policy","xml":"<outcome value='oam_network_policy'>\n","comments":"","outputs":1,"x":2206.244140625,"y":853.3453369140625,"z":"c29cef13.e3d5d8","wires":[["3046bafa.3c2d3e"]]},{"id":"2356c985.0b0286","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2120.671875,"y":930.1958618164062,"z":"c29cef13.e3d5d8","wires":[["3046bafa.3c2d3e"]]},{"id":"22c35190.15250e","type":"set","name":"set ar_name","xml":"<set>\n<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />\n","comments":"","x":2512.100830078125,"y":888.7672729492188,"z":"c29cef13.e3d5d8","wires":[]},{"id":"c47ddc23.426f8","type":"execute","name":"execute SliStringUtils - replace TenantOAMNetworkRole","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ar-name`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-name\"/>\n    <parameter name=\"target\" value=\"$TenantOAMNetworkRole\"/>\n    <parameter name=\"replacement\" value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`\"/>\n\n","comments":"","outputs":1,"x":2656.2437858581543,"y":932.6244196891785,"z":"c29cef13.e3d5d8","wires":[[]]},{"id":"5a14842f.e92664","type":"execute","name":"execute SliStringUtils - replace LandingNetworkRole","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ar-name`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-name\"/>\n    <parameter name=\"target\" value=\"$LandingNetworkRole\"/>\n    <parameter name=\"replacement\" value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`\"/>\n\n","comments":"","outputs":1,"x":2643.243896484375,"y":972.7672729492188,"z":"c29cef13.e3d5d8","wires":[[]]},{"id":"3046bafa.3c2d3e","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":2320.5292015075684,"y":928.3387522697449,"z":"c29cef13.e3d5d8","wires":[["22c35190.15250e","c47ddc23.426f8","5a14842f.e92664","cd147cf7.76b88"]]},{"id":"cd147cf7.76b88","type":"set","name":"set identifiers.allotted-resource-name","xml":"<set>\n<parameter name='brg-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />\n","comments":"","x":2601.1005859375,"y":1023.052978515625,"z":"c29cef13.e3d5d8","wires":[]},{"id":"1fcaf821.382a2","type":"set","name":"set assignments in overall structure","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.' \nvalue=\"`$brg-ar-assignments.`\" />\n\n\n","comments":"","x":1210.8624572753906,"y":1059.6246919631958,"z":"c29cef13.e3d5d8","wires":[]},{"id":"60d9bd3e.6cd364","type":"set","name":"Handle brg-ar-assignments","xml":"<set>\n<parameter name='brg-ar-assignments.vbrg-wan-ip' value='`$brg-topology-operation-input.brg-request-input.brg-wan-ip-address`'/>\n","comments":"","x":1190.529052734375,"y":956.0530395507812,"z":"c29cef13.e3d5d8","wires":[]},{"id":"30d3c1ee.7fc976","type":"for","name":"for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]","xml":"<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n","comments":"","outputs":1,"x":2228.8155822753906,"y":1333.0411586761475,"z":"c29cef13.e3d5d8","wires":[["f53d6c15.b050f"]]},{"id":"2f884a7a.6e8196","type":"switchNode","name":"switch service-data.consumed-allotted-resources_length","xml":"<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1259.8148193359375,"y":1220.505126953125,"z":"c29cef13.e3d5d8","wires":[["89048b56.100478","1b67b275.9169de"]]},{"id":"89048b56.100478","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1635.2077865600586,"y":1225.1124458312988,"z":"c29cef13.e3d5d8","wires":[["a53bed24.5d56e"]]},{"id":"1b67b275.9169de","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1633.9577865600586,"y":1315.1124477386475,"z":"c29cef13.e3d5d8","wires":[["56be06c6.c6dfa"]]},{"id":"f53d6c15.b050f","type":"switchNode","name":"switch allotted-resource-id","xml":"<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n","comments":"","outputs":1,"x":2663.4106826782227,"y":1334.85085105896,"z":"c29cef13.e3d5d8","wires":[["a09d88e1.dd4188"]]},{"id":"a09d88e1.dd4188","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2870.220375061035,"y":1338.064962387085,"z":"c29cef13.e3d5d8","wires":[["5b40e24d.eda55c"]]},{"id":"56be06c6.c6dfa","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1791.834976196289,"y":1321.4885501861572,"z":"c29cef13.e3d5d8","wires":[["30d3c1ee.7fc976","115a39a6.10a9ae"]]},{"id":"5b40e24d.eda55c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":3038.4817276000977,"y":1342.9222631454468,"z":"c29cef13.e3d5d8","wires":[["a500a6c4.dec128","cc977440.a0001"]]},{"id":"a53bed24.5d56e","type":"set","name":"set cidx","xml":"<set>\n<parameter name='tmp.cidx' value=\"`0`\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value=\"1\" />\n\n\n","comments":"","x":1814.0647735595703,"y":1227.3266830444336,"z":"c29cef13.e3d5d8","wires":[]},{"id":"a500a6c4.dec128","type":"set","name":"set tmp.cidx and ctx.consumed-ar","xml":"<set>\n<parameter name='tmp.cidx' value='`$cidx`' />\n<parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />\n<parameter name='tmp.found-cidx' value='true' />","comments":"","x":3284.3391876220703,"y":1337.4937419891357,"z":"c29cef13.e3d5d8","wires":[]},{"id":"4d4fdc3f.aa162c","type":"set","name":"set consumed allotted resources","xml":"<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n","comments":"","x":1170.6720123291016,"y":1385.826681137085,"z":"c29cef13.e3d5d8","wires":[]},{"id":"bfac6da0.ad031","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1570.910057067871,"y":1746.4815347194672,"z":"c29cef13.e3d5d8","wires":[["c4384e16.f7f12"]]},{"id":"a6c52c98.1144c","type":"comment","name":"Add BRG AR to mdsal","info":"","comments":"","x":1095.148208618164,"y":1721.1957080364227,"z":"c29cef13.e3d5d8","wires":[]},{"id":"db326488.0fad18","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":1111.4814224243164,"y":1459.671986579895,"z":"c29cef13.e3d5d8","wires":[[]]},{"id":"b09b29f3.055d78","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":831.57666015625,"y":403.4814453125,"z":"c29cef13.e3d5d8","wires":[["6e964e83.04343"]]},{"id":"6e964e83.04343","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":779.57666015625,"y":899.2908325195312,"z":"c29cef13.e3d5d8","wires":[["e4f03c25.262bc8","8c2d795e.9f5a88","3d181765.fbccf","d2df734a.c38c08","bff5d451.212c3","a9cd943.ce163e8","37b45496.104104","bb4550d6.319aa8","1a0f3a2c.0a3de6","60d9bd3e.6cd364","1fcaf821.382a2","2f884a7a.6e8196","4d4fdc3f.aa162c","db326488.0fad18","f567c426.8d891","3991bc2a.dbb1ac","e6d60f2.c65a0f","39990b91.9af8dc","53291df6.9ddfb4"]]},{"id":"e4f03c25.262bc8","type":"set","name":"set id","xml":"<set>\n<parameter name='brg-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='brg-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='brg-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='brg-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />","comments":"","x":1150.2434387207031,"y":409.433837890625,"z":"c29cef13.e3d5d8","wires":[]},{"id":"3991bc2a.dbb1ac","type":"update","name":"update AAI allotted-resource","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$ar-model.invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$ar-model.uuid`\" />\n\t<parameter name=\"operational-status\" value=\"null\" />\n","comments":"","outputs":1,"x":1132.0529327392578,"y":1627.5767517089844,"z":"c29cef13.e3d5d8","wires":[["1f98a234.aa314e","69037bb6.41c44c"]]},{"id":"1f98a234.aa314e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1387.814842224121,"y":1610.5292553901672,"z":"c29cef13.e3d5d8","wires":[["aa261c9b.918ae8"]]},{"id":"aa261c9b.918ae8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"AAI failed\" />\n","comments":"","x":1554.338722229004,"y":1622.1483263969421,"z":"c29cef13.e3d5d8","wires":[]},{"id":"69037bb6.41c44c","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1394.9101295471191,"y":1643.2912230491638,"z":"c29cef13.e3d5d8","wires":[["aa261c9b.918ae8"]]},{"id":"115a39a6.10a9ae","type":"switchNode","name":"switch tmp.found-cidx","xml":"<switch test='`$tmp.found-cidx`'>\n","comments":"","outputs":1,"x":2043.743423461914,"y":1579.2315921783447,"z":"c29cef13.e3d5d8","wires":[["6457c8b0.7c96f8"]]},{"id":"6457c8b0.7c96f8","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2233.743377685547,"y":1579.2315292358398,"z":"c29cef13.e3d5d8","wires":[["a4cf2172.8fb0a8"]]},{"id":"a4cf2172.8fb0a8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2399.743377685547,"y":1579.2315292358398,"z":"c29cef13.e3d5d8","wires":[["deb41530.608d4"]]},{"id":"deb41530.608d4","type":"set","name":"set tmp.cidx ","xml":"<set>\n<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\n","comments":"","x":2645.600706100464,"y":1579.8030033111572,"z":"c29cef13.e3d5d8","wires":[]},{"id":"cc977440.a0001","type":"break","name":"break","xml":"<break>\n","comments":"","x":3203.243408203125,"y":1382.731689453125,"z":"c29cef13.e3d5d8","wires":[]},{"id":"c4384e16.f7f12","type":"execute","name":"execute RestApiCallNode - Update parent provided service AR","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"parent\" />\n\n","comments":"","outputs":1,"x":1921.9521980285645,"y":1746.1904199123383,"z":"c29cef13.e3d5d8","wires":[["50cfb05d.e0eac","9f2cf4be.9ad798","4e3a88c6.282ed"]]},{"id":"182bfccb.4d5023","type":"comment","name":"Rollback parent","info":"","comments":"","x":1765.9521255493164,"y":1715.8570504188538,"z":"c29cef13.e3d5d8","wires":[]},{"id":"50cfb05d.e0eac","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2293.2602462768555,"y":1806.8553862571716,"z":"c29cef13.e3d5d8","wires":[["a36dd9.bb2b1228"]]},{"id":"9f2cf4be.9ad798","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2284.26029586792,"y":1775.3554120063782,"z":"c29cef13.e3d5d8","wires":[["a36dd9.bb2b1228"]]},{"id":"4e3a88c6.282ed","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2288.0103340148926,"y":1745.7125168815255,"z":"c29cef13.e3d5d8","wires":[["a36dd9.bb2b1228"]]},{"id":"a36dd9.bb2b1228","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2429.666301727295,"y":1741.9046860709786,"z":"c29cef13.e3d5d8","wires":[[]]},{"id":"14caf14a.dde917","type":"comment","name":"Generate naming","info":"","comments":"","x":1186.3862762451172,"y":756.7672252655029,"z":"c29cef13.e3d5d8","wires":[]},{"id":"4eefe296.7bebbc","type":"get-resource","name":"get-resource tunnelxconn-allotted-resource","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='brg-allotted-resources/brg-allotted-resource/$brg-topology-operation-input.alloted-resource-information.allotted-resource-id' pfx='mdsal-ar' >\n","comments":"","outputs":1,"x":531,"y":357,"z":"c29cef13.e3d5d8","wires":[["9a0daa46.107f","b09b29f3.055d78"]]},{"id":"2e8ac5c1.b9bbfa","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":607,"y":246,"z":"c29cef13.e3d5d8","wires":[[]]},{"id":"4684c0aa.3dde3","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.brg-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":614,"y":286,"z":"c29cef13.e3d5d8","wires":[[]]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-create.json
index b38560d4..2b5eff82 100755
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-create.json
@@ -1 +1 @@
-[{"id":"b6f76cf0.bed9d","type":"dgstart","name":"DGSTART","outputs":1,"x":295,"y":190,"z":"1afa105.0a3f0f","wires":[["ff3a2e96.20279"]]},{"id":"ff3a2e96.20279","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":391.2380790710449,"y":250.95239067077637,"z":"1afa105.0a3f0f","wires":[["b753df27.1ee1e"]]},{"id":"b753df27.1ee1e","type":"method","name":"brg-topology-operation-create","xml":"<method rpc='brg-topology-operation-create' mode='sync'>\n","comments":"","outputs":1,"x":437.15485763549805,"y":286.1904458999634,"z":"1afa105.0a3f0f","wires":[["3d5f9815.bb72d8"]]},{"id":"3d5f9815.bb72d8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":345.47619247436523,"y":429.5237879753113,"z":"1afa105.0a3f0f","wires":[["bd924d4b.6ac3d","58426f57.d9671","87dd9628.4b8e08","24e1c2bf.f38e3e","56c65e21.0c536","42ea3bdc.05eb14","ad98be46.853ca","9549d5d.4d0ae28","7db0224a.ddf40c","c1426d52.6c3f3","8fad2375.b2e97"]]},{"id":"58426f57.d9671","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":612.0001106262207,"y":1099.2145080566406,"z":"1afa105.0a3f0f","wires":[]},{"id":"bd924d4b.6ac3d","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":640.7540245056152,"y":1063.3370542526245,"z":"1afa105.0a3f0f","wires":[]},{"id":"c1426d52.6c3f3","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":651.7542190551758,"y":810.0514001846313,"z":"1afa105.0a3f0f","wires":[]},{"id":"24e1c2bf.f38e3e","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n","comments":"","x":607.7380638122559,"y":403.33332538604736,"z":"1afa105.0a3f0f","wires":[]},{"id":"87dd9628.4b8e08","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.sz-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />\n\n\n","comments":"","x":654.9973258972168,"y":369.59259128570557,"z":"1afa105.0a3f0f","wires":[]},{"id":"56c65e21.0c536","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":613.9934196472168,"y":439.23152446746826,"z":"1afa105.0a3f0f","wires":[[]]},{"id":"ad98be46.853ca","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":676.5187530517578,"y":600.4594917297363,"z":"1afa105.0a3f0f","wires":[["26a7a122.8ca35e","eef0e4d0.faeba8"]]},{"id":"42ea3bdc.05eb14","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.sz-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":642.0648536682129,"y":499.0172290802002,"z":"1afa105.0a3f0f","wires":[[]]},{"id":"26a7a122.8ca35e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":933.8148918151855,"y":599.2672522068024,"z":"1afa105.0a3f0f","wires":[["ba2d298f.ee9da8"]]},{"id":"9549d5d.4d0ae28","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":684.5293121337891,"y":953.4341316223145,"z":"1afa105.0a3f0f","wires":[["c81ee454.030d28","6308f6ba.6c5ee8","f6e148d1.5bbbc8"]]},{"id":"c81ee454.030d28","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":954.837329864502,"y":1006.432332418859,"z":"1afa105.0a3f0f","wires":[["a2f954df.7d6a08"]]},{"id":"6308f6ba.6c5ee8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":945.8373794555664,"y":974.9323581680655,"z":"1afa105.0a3f0f","wires":[["a2f954df.7d6a08"]]},{"id":"f6e148d1.5bbbc8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":949.5874176025391,"y":945.2894630432129,"z":"1afa105.0a3f0f","wires":[["956bdde7.54a34"]]},{"id":"a2f954df.7d6a08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for brg-allotted-resource\" />\n","comments":"","x":1115.587417602539,"y":975.6823820099235,"z":"1afa105.0a3f0f","wires":[]},{"id":"ba2d298f.ee9da8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1114.8148460388184,"y":599.7672016620636,"z":"1afa105.0a3f0f","wires":[["f6b8a443.ce37c8","7f9a9607.9deb78"]]},{"id":"f6b8a443.ce37c8","type":"switchNode","name":"switch sz length","xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1360.6720924377441,"y":634.052964925766,"z":"1afa105.0a3f0f","wires":[["c19598d2.19bd88"]]},{"id":"c19598d2.19bd88","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1551.6720962524414,"y":634.0529625415802,"z":"1afa105.0a3f0f","wires":[["852776b8.720618"]]},{"id":"20c1fba5.738554","type":"set","name":"set sz-ar from get","xml":"<set>\n<parameter name='sz-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />\n","comments":"","x":1951.5292320251465,"y":634.6243867874146,"z":"1afa105.0a3f0f","wires":[]},{"id":"852776b8.720618","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1722.5290794372559,"y":634.6244316101074,"z":"1afa105.0a3f0f","wires":[["20c1fba5.738554","37c4ecf.ab37e14","b8ed9202.62a45"]]},{"id":"37c4ecf.ab37e14","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1949.5294761657715,"y":702.0529508590698,"z":"1afa105.0a3f0f","wires":[]},{"id":"a2659467.3372c8","type":"comment","name":"GET brg-allotted-resource from mdsal","info":"","comments":"","x":701.8148155212402,"y":563.7671926021576,"z":"1afa105.0a3f0f","wires":[]},{"id":"b8ed9202.62a45","type":"switchNode","name":"switch order-status","xml":"<switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1959.52925491333,"y":667.6243848800659,"z":"1afa105.0a3f0f","wires":[["994a7d02.f776","c6432d89.74604"]]},{"id":"994a7d02.f776","type":"outcome","name":"outcome PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":2171.1292114257812,"y":628.6243848800659,"z":"1afa105.0a3f0f","wires":[["edf3836c.7ac5a"]]},{"id":"c6432d89.74604","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2196.8435859680176,"y":664.052975654602,"z":"1afa105.0a3f0f","wires":[["edf3836c.7ac5a"]]},{"id":"242cf515.aebfea","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":657.3386383056641,"y":654.3386459350586,"z":"1afa105.0a3f0f","wires":[]},{"id":"7f9a9607.9deb78","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-sz-ar' value='$mdsal-ar.' />\n","comments":"","x":1440.3864250183105,"y":599.7672936916351,"z":"1afa105.0a3f0f","wires":[]},{"id":"1ab1e0dc.601f6f","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":612.9576606750488,"y":468.6243562698364,"z":"1afa105.0a3f0f","wires":[]},{"id":"956bdde7.54a34","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1091.2433853149414,"y":941.481632232666,"z":"1afa105.0a3f0f","wires":[[]]},{"id":"2ad43a51.cbb826","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":625.2433776855468,"y":875.4815540313718,"z":"1afa105.0a3f0f","wires":[]},{"id":"7db0224a.ddf40c","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":599.2433815002441,"y":771.4815549850464,"z":"1afa105.0a3f0f","wires":[[]]},{"id":"eef0e4d0.faeba8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":933.5766868591309,"y":635.4814250469208,"z":"1afa105.0a3f0f","wires":[["c1d6759.acebc88"]]},{"id":"c1d6759.acebc88","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1113.5766372680664,"y":636.1479756832123,"z":"1afa105.0a3f0f","wires":[[]]},{"id":"8fad2375.b2e97","type":"set","name":"set id","xml":"<set>\n<parameter name='sz-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='sz-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='sz-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='sz-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />","comments":"","x":582.2434234619141,"y":691.1481666564941,"z":"1afa105.0a3f0f","wires":[]},{"id":"edf3836c.7ac5a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2385.5997276306152,"y":630.0000190734863,"z":"1afa105.0a3f0f","wires":[[]]}]
+[{"id":"b6f76cf0.bed9d","type":"dgstart","name":"DGSTART","outputs":1,"x":295,"y":190,"z":"1afa105.0a3f0f","wires":[["ff3a2e96.20279"]]},{"id":"ff3a2e96.20279","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":391.2380790710449,"y":250.95239067077637,"z":"1afa105.0a3f0f","wires":[["b753df27.1ee1e"]]},{"id":"b753df27.1ee1e","type":"method","name":"brg-topology-operation-create","xml":"<method rpc='brg-topology-operation-create' mode='sync'>\n","comments":"","outputs":1,"x":437.15485763549805,"y":286.1904458999634,"z":"1afa105.0a3f0f","wires":[["3d5f9815.bb72d8"]]},{"id":"3d5f9815.bb72d8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":345.47619247436523,"y":429.5237879753113,"z":"1afa105.0a3f0f","wires":[["bd924d4b.6ac3d","58426f57.d9671","87dd9628.4b8e08","24e1c2bf.f38e3e","56c65e21.0c536","42ea3bdc.05eb14","ad98be46.853ca","9549d5d.4d0ae28","7db0224a.ddf40c","c1426d52.6c3f3","8fad2375.b2e97"]]},{"id":"58426f57.d9671","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":612.0001106262207,"y":1099.2145080566406,"z":"1afa105.0a3f0f","wires":[]},{"id":"bd924d4b.6ac3d","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":640.7540245056152,"y":1063.3370542526245,"z":"1afa105.0a3f0f","wires":[]},{"id":"c1426d52.6c3f3","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":651.7542190551758,"y":810.0514001846313,"z":"1afa105.0a3f0f","wires":[]},{"id":"24e1c2bf.f38e3e","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n","comments":"","x":607.7380638122559,"y":403.33332538604736,"z":"1afa105.0a3f0f","wires":[]},{"id":"87dd9628.4b8e08","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />\n\n\n","comments":"","x":654.9973258972168,"y":369.59259128570557,"z":"1afa105.0a3f0f","wires":[]},{"id":"56c65e21.0c536","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":613.9934196472168,"y":439.23152446746826,"z":"1afa105.0a3f0f","wires":[[]]},{"id":"ad98be46.853ca","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":676.5187530517578,"y":600.4594917297363,"z":"1afa105.0a3f0f","wires":[["26a7a122.8ca35e","eef0e4d0.faeba8"]]},{"id":"42ea3bdc.05eb14","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.brg-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":642.0648536682129,"y":499.0172290802002,"z":"1afa105.0a3f0f","wires":[[]]},{"id":"26a7a122.8ca35e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":933.8148918151855,"y":599.2672522068024,"z":"1afa105.0a3f0f","wires":[["ba2d298f.ee9da8"]]},{"id":"9549d5d.4d0ae28","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":684.5293121337891,"y":953.4341316223145,"z":"1afa105.0a3f0f","wires":[["c81ee454.030d28","6308f6ba.6c5ee8","f6e148d1.5bbbc8"]]},{"id":"c81ee454.030d28","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":954.837329864502,"y":1006.432332418859,"z":"1afa105.0a3f0f","wires":[["a2f954df.7d6a08"]]},{"id":"6308f6ba.6c5ee8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":945.8373794555664,"y":974.9323581680655,"z":"1afa105.0a3f0f","wires":[["a2f954df.7d6a08"]]},{"id":"f6e148d1.5bbbc8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":949.5874176025391,"y":945.2894630432129,"z":"1afa105.0a3f0f","wires":[["956bdde7.54a34"]]},{"id":"a2f954df.7d6a08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for brg-allotted-resource\" />\n","comments":"","x":1115.587417602539,"y":975.6823820099235,"z":"1afa105.0a3f0f","wires":[]},{"id":"ba2d298f.ee9da8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1114.8148460388184,"y":599.7672016620636,"z":"1afa105.0a3f0f","wires":[["f6b8a443.ce37c8","7f9a9607.9deb78"]]},{"id":"f6b8a443.ce37c8","type":"switchNode","name":"switch brg length","xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1360.6720924377441,"y":634.052964925766,"z":"1afa105.0a3f0f","wires":[["c19598d2.19bd88"]]},{"id":"c19598d2.19bd88","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1551.6720962524414,"y":634.0529625415802,"z":"1afa105.0a3f0f","wires":[["852776b8.720618"]]},{"id":"20c1fba5.738554","type":"set","name":"set brg-ar from get","xml":"<set>\n<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />\n","comments":"","x":1951.5292320251465,"y":634.6243867874146,"z":"1afa105.0a3f0f","wires":[]},{"id":"852776b8.720618","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1722.5290794372559,"y":634.6244316101074,"z":"1afa105.0a3f0f","wires":[["20c1fba5.738554","37c4ecf.ab37e14","b8ed9202.62a45"]]},{"id":"37c4ecf.ab37e14","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1949.5294761657715,"y":702.0529508590698,"z":"1afa105.0a3f0f","wires":[]},{"id":"a2659467.3372c8","type":"comment","name":"GET brg-allotted-resource from mdsal","info":"","comments":"","x":701.8148155212402,"y":563.7671926021576,"z":"1afa105.0a3f0f","wires":[]},{"id":"b8ed9202.62a45","type":"switchNode","name":"switch order-status","xml":"<switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1959.52925491333,"y":667.6243848800659,"z":"1afa105.0a3f0f","wires":[["994a7d02.f776","c6432d89.74604"]]},{"id":"994a7d02.f776","type":"outcome","name":"outcome PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":2171.1292114257812,"y":628.6243848800659,"z":"1afa105.0a3f0f","wires":[["edf3836c.7ac5a"]]},{"id":"c6432d89.74604","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2196.8435859680176,"y":664.052975654602,"z":"1afa105.0a3f0f","wires":[["edf3836c.7ac5a"]]},{"id":"242cf515.aebfea","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":657.3386383056641,"y":654.3386459350586,"z":"1afa105.0a3f0f","wires":[]},{"id":"7f9a9607.9deb78","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-brg-ar' value='$mdsal-ar.' />\n","comments":"","x":1440.3864250183105,"y":599.7672936916351,"z":"1afa105.0a3f0f","wires":[]},{"id":"1ab1e0dc.601f6f","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":612.9576606750488,"y":468.6243562698364,"z":"1afa105.0a3f0f","wires":[]},{"id":"956bdde7.54a34","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1091.2433853149414,"y":941.481632232666,"z":"1afa105.0a3f0f","wires":[[]]},{"id":"2ad43a51.cbb826","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":625.2433776855468,"y":875.4815540313718,"z":"1afa105.0a3f0f","wires":[]},{"id":"7db0224a.ddf40c","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":599.2433815002441,"y":771.4815549850464,"z":"1afa105.0a3f0f","wires":[[]]},{"id":"eef0e4d0.faeba8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":933.5766868591309,"y":635.4814250469208,"z":"1afa105.0a3f0f","wires":[["c1d6759.acebc88"]]},{"id":"c1d6759.acebc88","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1113.5766372680664,"y":636.1479756832123,"z":"1afa105.0a3f0f","wires":[[]]},{"id":"8fad2375.b2e97","type":"set","name":"set id","xml":"<set>\n<parameter name='brg-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='brg-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='brg-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='brg-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />","comments":"","x":582.2434234619141,"y":691.1481666564941,"z":"1afa105.0a3f0f","wires":[]},{"id":"edf3836c.7ac5a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2385.5997276306152,"y":630.0000190734863,"z":"1afa105.0a3f0f","wires":[[]]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.json
index 86accc42..ac466737 100755
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.json
@@ -1 +1 @@
-[{"id":"284e27db.b7e5d8","type":"dgstart","name":"DGSTART","outputs":1,"x":184.2857208251953,"y":55.71428680419922,"z":"65a9f6a1.13f7b8","wires":[["21dc623f.cc352e"]]},{"id":"21dc623f.cc352e","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":280.52379989624023,"y":116.66667747497559,"z":"65a9f6a1.13f7b8","wires":[["eacf77e9.837ad8"]]},{"id":"eacf77e9.837ad8","type":"method","name":"brg-topology-operation-deactivate","xml":"<method rpc='brg-topology-operation-deactivate' mode='sync'>\n","comments":"","outputs":1,"x":326.44057846069336,"y":151.9047327041626,"z":"65a9f6a1.13f7b8","wires":[["509784b4.18024c"]]},{"id":"509784b4.18024c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":234.76191329956055,"y":295.2380747795105,"z":"65a9f6a1.13f7b8","wires":[["e886f0a3.d1a26","29d9b6af.98a21a","8e5a9b8c.613e38","32c0247b.626e1c","de1f88fd.80fcb8","b9651040.0d909","36f9c9aa.1518a6","91736aaa.410ef8","fe89c5c7.b078a8","5c2248b0.cff7c8","f23600d4.282d8","3eb0bb84.9332a4"]]},{"id":"29d9b6af.98a21a","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":501.285831451416,"y":964.9287948608398,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"e886f0a3.d1a26","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":530.0397453308105,"y":929.0513410568237,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"5c2248b0.cff7c8","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":541.0399627685547,"y":675.7657089233398,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"32c0247b.626e1c","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n","comments":"","x":497.0237846374512,"y":269.0476121902466,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"8e5a9b8c.613e38","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.sz-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />\n\n\n","comments":"","x":544.2830467224121,"y":235.30687808990479,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"de1f88fd.80fcb8","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":503.2791404724121,"y":304.9458112716675,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"36f9c9aa.1518a6","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":565.8044738769531,"y":466.17377853393555,"z":"65a9f6a1.13f7b8","wires":[["e544ca46.98ecd8","e932d850.0e3608"]]},{"id":"b9651040.0d909","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.sz-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":531.3505744934082,"y":364.7315158843994,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"e544ca46.98ecd8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":823.1006126403809,"y":464.9815390110016,"z":"65a9f6a1.13f7b8","wires":[["4acc39b.9104dc8"]]},{"id":"91736aaa.410ef8","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":573.8150329589844,"y":819.1484184265137,"z":"65a9f6a1.13f7b8","wires":[["c7834590.fcdd68","7bc04e80.8eb95","a95d7c62.d143f"]]},{"id":"c7834590.fcdd68","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":844.1230506896973,"y":872.1466192230582,"z":"65a9f6a1.13f7b8","wires":[["7bf6e2d9.60f5ec"]]},{"id":"7bc04e80.8eb95","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":835.1231002807617,"y":840.6466449722648,"z":"65a9f6a1.13f7b8","wires":[["7bf6e2d9.60f5ec"]]},{"id":"a95d7c62.d143f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":838.8731384277344,"y":811.0037498474121,"z":"65a9f6a1.13f7b8","wires":[["50148bc2.55e4c4"]]},{"id":"7bf6e2d9.60f5ec","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for brg-allotted-resource\" />\n","comments":"","x":1004.8731384277344,"y":841.3966688141227,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"4acc39b.9104dc8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1004.1005668640137,"y":465.4814884662628,"z":"65a9f6a1.13f7b8","wires":[["524c404c.c6e87","712583b3.96568c"]]},{"id":"524c404c.c6e87","type":"switchNode","name":"switch sz length","xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1249.9578132629395,"y":499.7672517299652,"z":"65a9f6a1.13f7b8","wires":[["3ad43779.db66e8"]]},{"id":"3ad43779.db66e8","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1440.9578170776367,"y":499.7672493457794,"z":"65a9f6a1.13f7b8","wires":[["4a46e9c4.f9d128"]]},{"id":"a70a2794.6d9408","type":"set","name":"set sz-ar from get","xml":"<set>\n<parameter name='sz-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />\n","comments":"","x":1840.8149528503418,"y":500.33867359161377,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"4a46e9c4.f9d128","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1611.8148002624512,"y":500.33871841430664,"z":"65a9f6a1.13f7b8","wires":[["a70a2794.6d9408","b61c60b8.7a4ec","66e00065.03ca4"]]},{"id":"b61c60b8.7a4ec","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1838.8151969909668,"y":567.767237663269,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"ae8a5e82.01315","type":"comment","name":"GET brg-allotted-resource from mdsal","info":"","comments":"","x":591.1005363464355,"y":429.4814794063568,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"66e00065.03ca4","type":"switchNode","name":"switch order-status","xml":"<switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1848.8149757385254,"y":533.3386716842651,"z":"65a9f6a1.13f7b8","wires":[["65fba3ae.02978c","709a0f22.b2207"]]},{"id":"65fba3ae.02978c","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2060.4149322509766,"y":494.33867168426514,"z":"65a9f6a1.13f7b8","wires":[["389e0eec.32fdf2"]]},{"id":"709a0f22.b2207","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2086.129306793213,"y":529.7672624588013,"z":"65a9f6a1.13f7b8","wires":[["389e0eec.32fdf2"]]},{"id":"c232dfd.abca22","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":546.6243591308594,"y":520.0529327392578,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"712583b3.96568c","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-sz-ar' value='$mdsal-ar.' />\n","comments":"","x":1329.6721458435059,"y":465.48158049583435,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"dd477519.74e698","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":502.24338150024414,"y":334.33864307403564,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"50148bc2.55e4c4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":980.5291061401367,"y":807.1959190368652,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"f27feeff.247c1","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":508.81481170654297,"y":712.6244564056396,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"fe89c5c7.b078a8","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":488.52910232543945,"y":637.1958417892456,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"e932d850.0e3608","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":822.8624076843262,"y":501.19571185112,"z":"65a9f6a1.13f7b8","wires":[["44f65ab4.13daa4"]]},{"id":"44f65ab4.13daa4","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1002.8623580932617,"y":501.8622624874115,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"f23600d4.282d8","type":"set","name":"set id","xml":"<set>\n<parameter name='sz-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='sz-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='sz-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='sz-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />","comments":"","x":471.5291442871094,"y":556.8624534606934,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"389e0eec.32fdf2","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2274.8854484558105,"y":495.71430587768555,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"3eb0bb84.9332a4","type":"update","name":"update AAI allotted-resource","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"operational-status\" value=\"out-of-service-path\" />\n","comments":"","outputs":1,"x":535.7142944335938,"y":754.2857055664062,"z":"65a9f6a1.13f7b8","wires":[["a77d093e.701398","a0e58ee0.5d11b"]]},{"id":"a77d093e.701398","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":791.476203918457,"y":737.2382092475891,"z":"65a9f6a1.13f7b8","wires":[["dce668a3.1b94f8"]]},{"id":"dce668a3.1b94f8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"AAI failed\" />\n","comments":"","x":958.0000839233398,"y":748.857280254364,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"a0e58ee0.5d11b","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":798.5714912414551,"y":770.0001769065857,"z":"65a9f6a1.13f7b8","wires":[["dce668a3.1b94f8"]]}]
+[{"id":"284e27db.b7e5d8","type":"dgstart","name":"DGSTART","outputs":1,"x":184.2857208251953,"y":55.71428680419922,"z":"65a9f6a1.13f7b8","wires":[["21dc623f.cc352e"]]},{"id":"21dc623f.cc352e","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":280.52379989624023,"y":116.66667747497559,"z":"65a9f6a1.13f7b8","wires":[["eacf77e9.837ad8"]]},{"id":"eacf77e9.837ad8","type":"method","name":"brg-topology-operation-deactivate","xml":"<method rpc='brg-topology-operation-deactivate' mode='sync'>\n","comments":"","outputs":1,"x":326.44057846069336,"y":151.9047327041626,"z":"65a9f6a1.13f7b8","wires":[["509784b4.18024c"]]},{"id":"509784b4.18024c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":234.76191329956055,"y":295.2380747795105,"z":"65a9f6a1.13f7b8","wires":[["e886f0a3.d1a26","29d9b6af.98a21a","8e5a9b8c.613e38","32c0247b.626e1c","de1f88fd.80fcb8","b9651040.0d909","36f9c9aa.1518a6","91736aaa.410ef8","fe89c5c7.b078a8","5c2248b0.cff7c8","f23600d4.282d8","3eb0bb84.9332a4"]]},{"id":"29d9b6af.98a21a","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":501.285831451416,"y":964.9287948608398,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"e886f0a3.d1a26","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":530.0397453308105,"y":929.0513410568237,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"5c2248b0.cff7c8","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":541.0399627685547,"y":675.7657089233398,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"32c0247b.626e1c","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n","comments":"","x":497.0237846374512,"y":269.0476121902466,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"8e5a9b8c.613e38","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />\n\n\n","comments":"","x":544.2830467224121,"y":235.30687808990479,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"de1f88fd.80fcb8","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":503.2791404724121,"y":304.9458112716675,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"36f9c9aa.1518a6","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":565.8044738769531,"y":466.17377853393555,"z":"65a9f6a1.13f7b8","wires":[["e544ca46.98ecd8","e932d850.0e3608"]]},{"id":"b9651040.0d909","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.brg-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":531.3505744934082,"y":364.7315158843994,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"e544ca46.98ecd8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":823.1006126403809,"y":464.9815390110016,"z":"65a9f6a1.13f7b8","wires":[["4acc39b.9104dc8"]]},{"id":"91736aaa.410ef8","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":573.8150329589844,"y":819.1484184265137,"z":"65a9f6a1.13f7b8","wires":[["c7834590.fcdd68","7bc04e80.8eb95","a95d7c62.d143f"]]},{"id":"c7834590.fcdd68","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":844.1230506896973,"y":872.1466192230582,"z":"65a9f6a1.13f7b8","wires":[["7bf6e2d9.60f5ec"]]},{"id":"7bc04e80.8eb95","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":835.1231002807617,"y":840.6466449722648,"z":"65a9f6a1.13f7b8","wires":[["7bf6e2d9.60f5ec"]]},{"id":"a95d7c62.d143f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":838.8731384277344,"y":811.0037498474121,"z":"65a9f6a1.13f7b8","wires":[["50148bc2.55e4c4"]]},{"id":"7bf6e2d9.60f5ec","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for brg-allotted-resource\" />\n","comments":"","x":1004.8731384277344,"y":841.3966688141227,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"4acc39b.9104dc8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1004.1005668640137,"y":465.4814884662628,"z":"65a9f6a1.13f7b8","wires":[["524c404c.c6e87","712583b3.96568c"]]},{"id":"524c404c.c6e87","type":"switchNode","name":"switch brg length","xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1249.9578132629395,"y":499.7672517299652,"z":"65a9f6a1.13f7b8","wires":[["3ad43779.db66e8"]]},{"id":"3ad43779.db66e8","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1440.9578170776367,"y":499.7672493457794,"z":"65a9f6a1.13f7b8","wires":[["4a46e9c4.f9d128"]]},{"id":"a70a2794.6d9408","type":"set","name":"set brg-ar from get","xml":"<set>\n<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />\n","comments":"","x":1840.8149528503418,"y":500.33867359161377,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"4a46e9c4.f9d128","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1611.8148002624512,"y":500.33871841430664,"z":"65a9f6a1.13f7b8","wires":[["a70a2794.6d9408","b61c60b8.7a4ec","66e00065.03ca4"]]},{"id":"b61c60b8.7a4ec","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1838.8151969909668,"y":567.767237663269,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"ae8a5e82.01315","type":"comment","name":"GET brg-allotted-resource from mdsal","info":"","comments":"","x":591.1005363464355,"y":429.4814794063568,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"66e00065.03ca4","type":"switchNode","name":"switch order-status","xml":"<switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1848.8149757385254,"y":533.3386716842651,"z":"65a9f6a1.13f7b8","wires":[["65fba3ae.02978c","709a0f22.b2207"]]},{"id":"65fba3ae.02978c","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2060.4149322509766,"y":494.33867168426514,"z":"65a9f6a1.13f7b8","wires":[["389e0eec.32fdf2"]]},{"id":"709a0f22.b2207","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2086.129306793213,"y":529.7672624588013,"z":"65a9f6a1.13f7b8","wires":[["389e0eec.32fdf2"]]},{"id":"c232dfd.abca22","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":546.6243591308594,"y":520.0529327392578,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"712583b3.96568c","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-brg-ar' value='$mdsal-ar.' />\n","comments":"","x":1329.6721458435059,"y":465.48158049583435,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"dd477519.74e698","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":502.24338150024414,"y":334.33864307403564,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"50148bc2.55e4c4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":980.5291061401367,"y":807.1959190368652,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"f27feeff.247c1","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":508.81481170654297,"y":712.6244564056396,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"fe89c5c7.b078a8","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":488.52910232543945,"y":637.1958417892456,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"e932d850.0e3608","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":822.8624076843262,"y":501.19571185112,"z":"65a9f6a1.13f7b8","wires":[["44f65ab4.13daa4"]]},{"id":"44f65ab4.13daa4","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1002.8623580932617,"y":501.8622624874115,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"f23600d4.282d8","type":"set","name":"set id","xml":"<set>\n<parameter name='brg-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='brg-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='brg-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='brg-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />","comments":"","x":471.5291442871094,"y":556.8624534606934,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"389e0eec.32fdf2","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2274.8854484558105,"y":495.71430587768555,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"3eb0bb84.9332a4","type":"update","name":"update AAI allotted-resource","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"operational-status\" value=\"out-of-service-path\" />\n","comments":"","outputs":1,"x":535.7142944335938,"y":754.2857055664062,"z":"65a9f6a1.13f7b8","wires":[["a77d093e.701398","a0e58ee0.5d11b"]]},{"id":"a77d093e.701398","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":791.476203918457,"y":737.2382092475891,"z":"65a9f6a1.13f7b8","wires":[["dce668a3.1b94f8"]]},{"id":"dce668a3.1b94f8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"AAI failed\" />\n","comments":"","x":958.0000839233398,"y":748.857280254364,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"a0e58ee0.5d11b","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":798.5714912414551,"y":770.0001769065857,"z":"65a9f6a1.13f7b8","wires":[["dce668a3.1b94f8"]]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-delete.json
index 2106a7fe..01498024 100755
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-delete.json
@@ -1 +1 @@
-[{"id":"6b945847.1c8628","type":"dgstart","name":"DGSTART","outputs":1,"x":187,"y":84,"z":"cab86701.408c88","wires":[["46c9c550.08ddbc"]]},{"id":"46c9c550.08ddbc","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":283.2380790710449,"y":144.95239067077637,"z":"cab86701.408c88","wires":[["33033a6c.777e46"]]},{"id":"33033a6c.777e46","type":"method","name":"brg-topology-operation-delete","xml":"<method rpc='brg-topology-operation-delete' mode='sync'>\n","comments":"","outputs":1,"x":329.15485763549805,"y":180.19044589996338,"z":"cab86701.408c88","wires":[["71a136f2.4a6ae8"]]},{"id":"71a136f2.4a6ae8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":237.47619247436523,"y":323.5237879753113,"z":"cab86701.408c88","wires":[["d473982e.2073e8","21b535a4.6f3cfa","58735763.200388","67dca0c.5203f6","d4bebd02.2ac6","ed3aea18.ac56a8","ce33759f.7f8848","af4ea7a7.5e99e8","dd978c58.19189","a078b88c.279298","1469e91d.b421d7","4a2606ec.007d08"]]},{"id":"21b535a4.6f3cfa","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":504.0001106262207,"y":993.2145080566406,"z":"cab86701.408c88","wires":[]},{"id":"d473982e.2073e8","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":532.7540245056152,"y":957.3370542526245,"z":"cab86701.408c88","wires":[]},{"id":"dd978c58.19189","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":543.7542190551758,"y":704.0514001846313,"z":"cab86701.408c88","wires":[]},{"id":"67dca0c.5203f6","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n","comments":"","x":499.73806381225586,"y":297.33332538604736,"z":"cab86701.408c88","wires":[]},{"id":"58735763.200388","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.sz-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />\n\n\n","comments":"","x":546.9973258972168,"y":263.59259128570557,"z":"cab86701.408c88","wires":[]},{"id":"d4bebd02.2ac6","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":505.9934196472168,"y":333.23152446746826,"z":"cab86701.408c88","wires":[[]]},{"id":"ce33759f.7f8848","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":568.5187530517578,"y":494.4594917297363,"z":"cab86701.408c88","wires":[["3d6ff871.1b6728","c68f9183.6fe9"]]},{"id":"ed3aea18.ac56a8","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.sz-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":534.0648536682129,"y":393.0172290802002,"z":"cab86701.408c88","wires":[[]]},{"id":"3d6ff871.1b6728","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":825.8148918151855,"y":493.26725220680237,"z":"cab86701.408c88","wires":[["cae924d0.c91d68"]]},{"id":"e3d80d76.f38b6","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":846.837329864502,"y":900.432332418859,"z":"cab86701.408c88","wires":[["e5182ef1.2930a"]]},{"id":"408d7749.7bfef8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":837.8373794555664,"y":868.9323581680655,"z":"cab86701.408c88","wires":[["e5182ef1.2930a"]]},{"id":"a26d7c72.44fcc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":841.5874176025391,"y":839.2894630432129,"z":"cab86701.408c88","wires":[["e6e17eb6.e762c"]]},{"id":"e5182ef1.2930a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for brg-allotted-resource\" />\n","comments":"","x":1007.5874176025391,"y":869.6823820099235,"z":"cab86701.408c88","wires":[]},{"id":"cae924d0.c91d68","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1006.8148460388184,"y":493.7672016620636,"z":"cab86701.408c88","wires":[["a06def86.57a78","2d0ecbe9.d56c34"]]},{"id":"a06def86.57a78","type":"switchNode","name":"switch sz length","xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1252.6720924377441,"y":528.052964925766,"z":"cab86701.408c88","wires":[["ef02f832.92b468"]]},{"id":"ef02f832.92b468","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1443.6720962524414,"y":528.0529625415802,"z":"cab86701.408c88","wires":[["6ff8e752.374018"]]},{"id":"b7d42ce2.9a481","type":"set","name":"set sz-ar from get","xml":"<set>\n<parameter name='sz-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />\n","comments":"","x":1843.5292320251465,"y":528.6243867874146,"z":"cab86701.408c88","wires":[]},{"id":"6ff8e752.374018","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1614.5290794372559,"y":528.6244316101074,"z":"cab86701.408c88","wires":[["b7d42ce2.9a481","63e31730.e27918","d8d35b13.b628f8"]]},{"id":"63e31730.e27918","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1841.5294761657715,"y":596.0529508590698,"z":"cab86701.408c88","wires":[]},{"id":"bed5b961.bd6788","type":"comment","name":"GET brg-allotted-resource from mdsal","info":"","comments":"","x":593.8148155212402,"y":457.7671926021576,"z":"cab86701.408c88","wires":[]},{"id":"d8d35b13.b628f8","type":"switchNode","name":"switch order-status","xml":"<switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1851.52925491333,"y":561.6243848800659,"z":"cab86701.408c88","wires":[["55b36fbc.52943","19d63441.492dec"]]},{"id":"55b36fbc.52943","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2063.1292114257812,"y":522.6243848800659,"z":"cab86701.408c88","wires":[["27c47993.316bb6"]]},{"id":"19d63441.492dec","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2088.8435859680176,"y":558.052975654602,"z":"cab86701.408c88","wires":[["27c47993.316bb6"]]},{"id":"f3aeefda.cd911","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":549.3386383056641,"y":548.3386459350586,"z":"cab86701.408c88","wires":[]},{"id":"2d0ecbe9.d56c34","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-sz-ar' value='$mdsal-ar.' />\n","comments":"","x":1332.3864250183105,"y":493.76729369163513,"z":"cab86701.408c88","wires":[]},{"id":"33868ac7.abca26","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":504.9576606750488,"y":362.6243562698364,"z":"cab86701.408c88","wires":[]},{"id":"e6e17eb6.e762c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":983.2433853149414,"y":835.481632232666,"z":"cab86701.408c88","wires":[[]]},{"id":"2b3604ae.317ccc","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":517.2433776855468,"y":769.4815540313718,"z":"cab86701.408c88","wires":[]},{"id":"af4ea7a7.5e99e8","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":491.24338150024414,"y":665.4815549850464,"z":"cab86701.408c88","wires":[[]]},{"id":"c68f9183.6fe9","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":825.5766868591309,"y":529.4814250469208,"z":"cab86701.408c88","wires":[["336a662a.c1025a"]]},{"id":"336a662a.c1025a","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1005.5766372680664,"y":530.1479756832123,"z":"cab86701.408c88","wires":[[]]},{"id":"a078b88c.279298","type":"set","name":"set id","xml":"<set>\n<parameter name='sz-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='sz-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='sz-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='sz-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />","comments":"","x":474.24342346191406,"y":585.1481666564941,"z":"cab86701.408c88","wires":[]},{"id":"27c47993.316bb6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2277.5997276306152,"y":524.0000190734863,"z":"cab86701.408c88","wires":[[]]},{"id":"1469e91d.b421d7","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":574.0000152587891,"y":850.0000247955322,"z":"cab86701.408c88","wires":[["a26d7c72.44fcc","408d7749.7bfef8","e3d80d76.f38b6"]]},{"id":"4a2606ec.007d08","type":"set","name":"clear sz-ar-assignments","xml":"<set>\n<parameter name='sz-ar-assignments.' value=\"\" />\n\n\n\n","comments":"","x":518,"y":736,"z":"cab86701.408c88","wires":[]}]
+[{"id":"6b945847.1c8628","type":"dgstart","name":"DGSTART","outputs":1,"x":187,"y":84,"z":"cab86701.408c88","wires":[["46c9c550.08ddbc"]]},{"id":"46c9c550.08ddbc","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":283.2380790710449,"y":144.95239067077637,"z":"cab86701.408c88","wires":[["33033a6c.777e46"]]},{"id":"33033a6c.777e46","type":"method","name":"brg-topology-operation-delete","xml":"<method rpc='brg-topology-operation-delete' mode='sync'>\n","comments":"","outputs":1,"x":329.15485763549805,"y":180.19044589996338,"z":"cab86701.408c88","wires":[["71a136f2.4a6ae8"]]},{"id":"71a136f2.4a6ae8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":237.47619247436523,"y":323.5237879753113,"z":"cab86701.408c88","wires":[["d473982e.2073e8","21b535a4.6f3cfa","58735763.200388","67dca0c.5203f6","d4bebd02.2ac6","ed3aea18.ac56a8","ce33759f.7f8848","af4ea7a7.5e99e8","dd978c58.19189","a078b88c.279298","1469e91d.b421d7","4a2606ec.007d08"]]},{"id":"21b535a4.6f3cfa","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":504.0001106262207,"y":993.2145080566406,"z":"cab86701.408c88","wires":[]},{"id":"d473982e.2073e8","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":532.7540245056152,"y":957.3370542526245,"z":"cab86701.408c88","wires":[]},{"id":"dd978c58.19189","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":543.7542190551758,"y":704.0514001846313,"z":"cab86701.408c88","wires":[]},{"id":"67dca0c.5203f6","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n","comments":"","x":499.73806381225586,"y":297.33332538604736,"z":"cab86701.408c88","wires":[]},{"id":"58735763.200388","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />\n\n\n","comments":"","x":546.9973258972168,"y":263.59259128570557,"z":"cab86701.408c88","wires":[]},{"id":"d4bebd02.2ac6","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":505.9934196472168,"y":333.23152446746826,"z":"cab86701.408c88","wires":[[]]},{"id":"ce33759f.7f8848","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":568.5187530517578,"y":494.4594917297363,"z":"cab86701.408c88","wires":[["3d6ff871.1b6728","c68f9183.6fe9"]]},{"id":"ed3aea18.ac56a8","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.brg-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":534.0648536682129,"y":393.0172290802002,"z":"cab86701.408c88","wires":[[]]},{"id":"3d6ff871.1b6728","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":825.8148918151855,"y":493.26725220680237,"z":"cab86701.408c88","wires":[["cae924d0.c91d68"]]},{"id":"e3d80d76.f38b6","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":846.837329864502,"y":900.432332418859,"z":"cab86701.408c88","wires":[["e5182ef1.2930a"]]},{"id":"408d7749.7bfef8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":837.8373794555664,"y":868.9323581680655,"z":"cab86701.408c88","wires":[["e5182ef1.2930a"]]},{"id":"a26d7c72.44fcc","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":841.5874176025391,"y":839.2894630432129,"z":"cab86701.408c88","wires":[["e6e17eb6.e762c"]]},{"id":"e5182ef1.2930a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for brg-allotted-resource\" />\n","comments":"","x":1007.5874176025391,"y":869.6823820099235,"z":"cab86701.408c88","wires":[]},{"id":"cae924d0.c91d68","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1006.8148460388184,"y":493.7672016620636,"z":"cab86701.408c88","wires":[["a06def86.57a78","2d0ecbe9.d56c34"]]},{"id":"a06def86.57a78","type":"switchNode","name":"switch brg length","xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1252.6720924377441,"y":528.052964925766,"z":"cab86701.408c88","wires":[["ef02f832.92b468"]]},{"id":"ef02f832.92b468","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1443.6720962524414,"y":528.0529625415802,"z":"cab86701.408c88","wires":[["6ff8e752.374018"]]},{"id":"b7d42ce2.9a481","type":"set","name":"set brg-ar from get","xml":"<set>\n<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />\n","comments":"","x":1843.5292320251465,"y":528.6243867874146,"z":"cab86701.408c88","wires":[]},{"id":"6ff8e752.374018","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1614.5290794372559,"y":528.6244316101074,"z":"cab86701.408c88","wires":[["b7d42ce2.9a481","63e31730.e27918","d8d35b13.b628f8"]]},{"id":"63e31730.e27918","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1841.5294761657715,"y":596.0529508590698,"z":"cab86701.408c88","wires":[]},{"id":"bed5b961.bd6788","type":"comment","name":"GET brg-allotted-resource from mdsal","info":"","comments":"","x":593.8148155212402,"y":457.7671926021576,"z":"cab86701.408c88","wires":[]},{"id":"d8d35b13.b628f8","type":"switchNode","name":"switch order-status","xml":"<switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1851.52925491333,"y":561.6243848800659,"z":"cab86701.408c88","wires":[["55b36fbc.52943","19d63441.492dec"]]},{"id":"55b36fbc.52943","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2063.1292114257812,"y":522.6243848800659,"z":"cab86701.408c88","wires":[["27c47993.316bb6"]]},{"id":"19d63441.492dec","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2088.8435859680176,"y":558.052975654602,"z":"cab86701.408c88","wires":[["27c47993.316bb6"]]},{"id":"f3aeefda.cd911","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":549.3386383056641,"y":548.3386459350586,"z":"cab86701.408c88","wires":[]},{"id":"2d0ecbe9.d56c34","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-brg-ar' value='$mdsal-ar.' />\n","comments":"","x":1332.3864250183105,"y":493.76729369163513,"z":"cab86701.408c88","wires":[]},{"id":"33868ac7.abca26","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":504.9576606750488,"y":362.6243562698364,"z":"cab86701.408c88","wires":[]},{"id":"e6e17eb6.e762c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":983.2433853149414,"y":835.481632232666,"z":"cab86701.408c88","wires":[[]]},{"id":"2b3604ae.317ccc","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":517.2433776855468,"y":769.4815540313718,"z":"cab86701.408c88","wires":[]},{"id":"af4ea7a7.5e99e8","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":491.24338150024414,"y":665.4815549850464,"z":"cab86701.408c88","wires":[[]]},{"id":"c68f9183.6fe9","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":825.5766868591309,"y":529.4814250469208,"z":"cab86701.408c88","wires":[["336a662a.c1025a"]]},{"id":"336a662a.c1025a","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1005.5766372680664,"y":530.1479756832123,"z":"cab86701.408c88","wires":[[]]},{"id":"a078b88c.279298","type":"set","name":"set id","xml":"<set>\n<parameter name='brg-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='brg-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='brg-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='brg-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />","comments":"","x":474.24342346191406,"y":585.1481666564941,"z":"cab86701.408c88","wires":[]},{"id":"27c47993.316bb6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2277.5997276306152,"y":524.0000190734863,"z":"cab86701.408c88","wires":[[]]},{"id":"1469e91d.b421d7","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":574.0000152587891,"y":850.0000247955322,"z":"cab86701.408c88","wires":[["a26d7c72.44fcc","408d7749.7bfef8","e3d80d76.f38b6"]]},{"id":"4a2606ec.007d08","type":"set","name":"clear brg-ar-assignments","xml":"<set>\n<parameter name='brg-ar-assignments.' value=\"\" />\n\n\n\n","comments":"","x":518,"y":736,"z":"cab86701.408c88","wires":[]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-unassign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-unassign.json
index 46fe588d..05162757 100755
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-unassign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-unassign.json
@@ -1 +1 @@
-[{"id":"8f1f2ad4.1b2628","type":"dgstart","name":"DGSTART","outputs":1,"x":185,"y":110,"z":"892de9cf.a3e7e8","wires":[["aef28f38.d3ad2"]]},{"id":"aef28f38.d3ad2","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":281.2380790710449,"y":170.95239067077637,"z":"892de9cf.a3e7e8","wires":[["d541214e.1421c"]]},{"id":"d541214e.1421c","type":"method","name":"brg-topology-operation-unassign","xml":"<method rpc='brg-topology-operation-unassign' mode='sync'>\n","comments":"","outputs":1,"x":325.15489196777344,"y":210.190447807312,"z":"892de9cf.a3e7e8","wires":[["3d909232.be8cbe"]]},{"id":"3d909232.be8cbe","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":235.47619247436523,"y":349.5237879753113,"z":"892de9cf.a3e7e8","wires":[["ac546d04.a44e3","65b7ebff.45ef54","887af0a1.cfd5a","16719562.f89cfb","921e5db9.a3742","ae6a6800.748f18","4585bd6c.db3454","a30a4193.dc67c"]]},{"id":"65b7ebff.45ef54","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":502.0001106262207,"y":1019.2145080566406,"z":"892de9cf.a3e7e8","wires":[]},{"id":"ac546d04.a44e3","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":530.7540245056152,"y":983.3370542526245,"z":"892de9cf.a3e7e8","wires":[]},{"id":"16719562.f89cfb","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n","comments":"","x":497.73806381225586,"y":323.33332538604736,"z":"892de9cf.a3e7e8","wires":[]},{"id":"887af0a1.cfd5a","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.sz-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />\n\n\n","comments":"","x":544.9973258972168,"y":289.59259128570557,"z":"892de9cf.a3e7e8","wires":[]},{"id":"921e5db9.a3742","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":503.9934196472168,"y":359.23152446746826,"z":"892de9cf.a3e7e8","wires":[[]]},{"id":"4585bd6c.db3454","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":566.5187530517578,"y":520.4594917297363,"z":"892de9cf.a3e7e8","wires":[["39c78959.7ed206","f4ec9c65.dbf1a"]]},{"id":"ae6a6800.748f18","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.sz-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":532.0648536682129,"y":419.0172290802002,"z":"892de9cf.a3e7e8","wires":[[]]},{"id":"39c78959.7ed206","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":823.8148918151855,"y":519.2672522068024,"z":"892de9cf.a3e7e8","wires":[["aa4578bf.e01898"]]},{"id":"cf288e81.867c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":844.837329864502,"y":926.432332418859,"z":"892de9cf.a3e7e8","wires":[["562e732f.776e5c"]]},{"id":"8f1f61fb.4c4c9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":835.8373794555664,"y":894.9323581680655,"z":"892de9cf.a3e7e8","wires":[["562e732f.776e5c"]]},{"id":"48115134.9ae56","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":839.5874176025391,"y":865.2894630432129,"z":"892de9cf.a3e7e8","wires":[["9c761fba.db0c3"]]},{"id":"562e732f.776e5c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for brg-allotted-resource\" />\n","comments":"","x":1005.5874176025391,"y":895.6823820099235,"z":"892de9cf.a3e7e8","wires":[]},{"id":"aa4578bf.e01898","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1004.8148460388184,"y":519.7672016620636,"z":"892de9cf.a3e7e8","wires":[["d17cf2f0.cec85","dae16c74.e3b7c"]]},{"id":"d17cf2f0.cec85","type":"switchNode","name":"switch sz length","xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1250.6720924377441,"y":554.052964925766,"z":"892de9cf.a3e7e8","wires":[["9eb758cd.982008"]]},{"id":"9eb758cd.982008","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1441.6720962524414,"y":554.0529625415802,"z":"892de9cf.a3e7e8","wires":[["e43335e7.a2b4b8"]]},{"id":"90a7fa85.7e06d8","type":"set","name":"set sz-ar from get","xml":"<set>\n<parameter name='sz-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />\n","comments":"","x":1841.5292320251465,"y":554.6243867874146,"z":"892de9cf.a3e7e8","wires":[]},{"id":"e43335e7.a2b4b8","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1612.5290794372559,"y":554.6244316101074,"z":"892de9cf.a3e7e8","wires":[["90a7fa85.7e06d8","82e79827.7b2528","e9d4c55b.3b68e8"]]},{"id":"82e79827.7b2528","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1839.5294761657715,"y":622.0529508590698,"z":"892de9cf.a3e7e8","wires":[]},{"id":"dceff592.9c16a8","type":"comment","name":"GET brg-allotted-resource from mdsal","info":"","comments":"","x":591.8148155212402,"y":483.7671926021576,"z":"892de9cf.a3e7e8","wires":[]},{"id":"e9d4c55b.3b68e8","type":"switchNode","name":"switch order-status","xml":"<switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1849.52925491333,"y":587.6243848800659,"z":"892de9cf.a3e7e8","wires":[["ee32ca42.029ac8","f44f15e1.8ed938"]]},{"id":"ee32ca42.029ac8","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2061.1292114257812,"y":548.6243848800659,"z":"892de9cf.a3e7e8","wires":[["74e489f7.35eb68"]]},{"id":"f44f15e1.8ed938","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2086.8435859680176,"y":584.052975654602,"z":"892de9cf.a3e7e8","wires":[["74e489f7.35eb68"]]},{"id":"dae16c74.e3b7c","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-sz-ar' value='$mdsal-ar.' />\n","comments":"","x":1330.3864250183105,"y":519.7672936916351,"z":"892de9cf.a3e7e8","wires":[]},{"id":"972a22dc.b7b85","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":502.9576606750488,"y":388.6243562698364,"z":"892de9cf.a3e7e8","wires":[]},{"id":"9c761fba.db0c3","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":981.2433853149414,"y":861.481632232666,"z":"892de9cf.a3e7e8","wires":[[]]},{"id":"f4ec9c65.dbf1a","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":823.5766868591309,"y":555.4814250469208,"z":"892de9cf.a3e7e8","wires":[["8c932988.c6f7a8"]]},{"id":"8c932988.c6f7a8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1003.5766372680664,"y":556.1479756832123,"z":"892de9cf.a3e7e8","wires":[[]]},{"id":"74e489f7.35eb68","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2275.5997276306152,"y":550.0000190734863,"z":"892de9cf.a3e7e8","wires":[[]]},{"id":"a30a4193.dc67c","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":568.0000610351562,"y":878.0000267028809,"z":"892de9cf.a3e7e8","wires":[["48115134.9ae56","8f1f61fb.4c4c9","cf288e81.867c"]]}]
+[{"id":"8f1f2ad4.1b2628","type":"dgstart","name":"DGSTART","outputs":1,"x":185,"y":110,"z":"892de9cf.a3e7e8","wires":[["aef28f38.d3ad2"]]},{"id":"aef28f38.d3ad2","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":281.2380790710449,"y":170.95239067077637,"z":"892de9cf.a3e7e8","wires":[["d541214e.1421c"]]},{"id":"d541214e.1421c","type":"method","name":"brg-topology-operation-unassign","xml":"<method rpc='brg-topology-operation-unassign' mode='sync'>\n","comments":"","outputs":1,"x":325.15489196777344,"y":210.190447807312,"z":"892de9cf.a3e7e8","wires":[["3d909232.be8cbe"]]},{"id":"3d909232.be8cbe","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":235.47619247436523,"y":349.5237879753113,"z":"892de9cf.a3e7e8","wires":[["ac546d04.a44e3","65b7ebff.45ef54","887af0a1.cfd5a","16719562.f89cfb","921e5db9.a3742","ae6a6800.748f18","4585bd6c.db3454","a30a4193.dc67c"]]},{"id":"65b7ebff.45ef54","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":502.0001106262207,"y":1019.2145080566406,"z":"892de9cf.a3e7e8","wires":[]},{"id":"ac546d04.a44e3","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":530.7540245056152,"y":983.3370542526245,"z":"892de9cf.a3e7e8","wires":[]},{"id":"16719562.f89cfb","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n","comments":"","x":497.73806381225586,"y":323.33332538604736,"z":"892de9cf.a3e7e8","wires":[]},{"id":"887af0a1.cfd5a","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />\n\n\n","comments":"","x":544.9973258972168,"y":289.59259128570557,"z":"892de9cf.a3e7e8","wires":[]},{"id":"921e5db9.a3742","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":503.9934196472168,"y":359.23152446746826,"z":"892de9cf.a3e7e8","wires":[[]]},{"id":"4585bd6c.db3454","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":566.5187530517578,"y":520.4594917297363,"z":"892de9cf.a3e7e8","wires":[["39c78959.7ed206","f4ec9c65.dbf1a"]]},{"id":"ae6a6800.748f18","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.brg-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":532.0648536682129,"y":419.0172290802002,"z":"892de9cf.a3e7e8","wires":[[]]},{"id":"39c78959.7ed206","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":823.8148918151855,"y":519.2672522068024,"z":"892de9cf.a3e7e8","wires":[["aa4578bf.e01898"]]},{"id":"cf288e81.867c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":844.837329864502,"y":926.432332418859,"z":"892de9cf.a3e7e8","wires":[["562e732f.776e5c"]]},{"id":"8f1f61fb.4c4c9","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":835.8373794555664,"y":894.9323581680655,"z":"892de9cf.a3e7e8","wires":[["562e732f.776e5c"]]},{"id":"48115134.9ae56","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":839.5874176025391,"y":865.2894630432129,"z":"892de9cf.a3e7e8","wires":[["9c761fba.db0c3"]]},{"id":"562e732f.776e5c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for brg-allotted-resource\" />\n","comments":"","x":1005.5874176025391,"y":895.6823820099235,"z":"892de9cf.a3e7e8","wires":[]},{"id":"aa4578bf.e01898","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1004.8148460388184,"y":519.7672016620636,"z":"892de9cf.a3e7e8","wires":[["d17cf2f0.cec85","dae16c74.e3b7c"]]},{"id":"d17cf2f0.cec85","type":"switchNode","name":"switch brg length","xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1250.6720924377441,"y":554.052964925766,"z":"892de9cf.a3e7e8","wires":[["9eb758cd.982008"]]},{"id":"9eb758cd.982008","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1441.6720962524414,"y":554.0529625415802,"z":"892de9cf.a3e7e8","wires":[["e43335e7.a2b4b8"]]},{"id":"90a7fa85.7e06d8","type":"set","name":"set brg-ar from get","xml":"<set>\n<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />\n","comments":"","x":1841.5292320251465,"y":554.6243867874146,"z":"892de9cf.a3e7e8","wires":[]},{"id":"e43335e7.a2b4b8","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1612.5290794372559,"y":554.6244316101074,"z":"892de9cf.a3e7e8","wires":[["90a7fa85.7e06d8","82e79827.7b2528","e9d4c55b.3b68e8"]]},{"id":"82e79827.7b2528","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1839.5294761657715,"y":622.0529508590698,"z":"892de9cf.a3e7e8","wires":[]},{"id":"dceff592.9c16a8","type":"comment","name":"GET brg-allotted-resource from mdsal","info":"","comments":"","x":591.8148155212402,"y":483.7671926021576,"z":"892de9cf.a3e7e8","wires":[]},{"id":"e9d4c55b.3b68e8","type":"switchNode","name":"switch order-status","xml":"<switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1849.52925491333,"y":587.6243848800659,"z":"892de9cf.a3e7e8","wires":[["ee32ca42.029ac8","f44f15e1.8ed938"]]},{"id":"ee32ca42.029ac8","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2061.1292114257812,"y":548.6243848800659,"z":"892de9cf.a3e7e8","wires":[["74e489f7.35eb68"]]},{"id":"f44f15e1.8ed938","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2086.8435859680176,"y":584.052975654602,"z":"892de9cf.a3e7e8","wires":[["74e489f7.35eb68"]]},{"id":"dae16c74.e3b7c","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-brg-ar' value='$mdsal-ar.' />\n","comments":"","x":1330.3864250183105,"y":519.7672936916351,"z":"892de9cf.a3e7e8","wires":[]},{"id":"972a22dc.b7b85","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":502.9576606750488,"y":388.6243562698364,"z":"892de9cf.a3e7e8","wires":[]},{"id":"9c761fba.db0c3","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":981.2433853149414,"y":861.481632232666,"z":"892de9cf.a3e7e8","wires":[[]]},{"id":"f4ec9c65.dbf1a","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":823.5766868591309,"y":555.4814250469208,"z":"892de9cf.a3e7e8","wires":[["8c932988.c6f7a8"]]},{"id":"8c932988.c6f7a8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1003.5766372680664,"y":556.1479756832123,"z":"892de9cf.a3e7e8","wires":[[]]},{"id":"74e489f7.35eb68","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2275.5997276306152,"y":550.0000190734863,"z":"892de9cf.a3e7e8","wires":[[]]},{"id":"a30a4193.dc67c","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":568.0000610351562,"y":878.0000267028809,"z":"892de9cf.a3e7e8","wires":[["48115134.9ae56","8f1f61fb.4c4c9","cf288e81.867c"]]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation.json
index 1a7ddb7e..20af5f12 100755..100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation.json
@@ -1 +1 @@
-[{"id":"e4ebdff3.230ac","type":"dgstart","name":"DGSTART","outputs":1,"x":153.7037124633789,"y":150.37034606933594,"z":"38cff129.fc152e","wires":[["b4010019.28c11"]]},{"id":"b4010019.28c11","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":232.32273864746094,"y":190.60845851898193,"z":"38cff129.fc152e","wires":[["d0b7800c.ff6ae"]]},{"id":"d0b7800c.ff6ae","type":"method","name":"brg-topology-operation","xml":"<method rpc='brg-topology-operation' mode='sync'>\n","comments":"","outputs":1,"x":216.79901123046875,"y":250.3703441619873,"z":"38cff129.fc152e","wires":[["5cabda26.cb2e34"]]},{"id":"1d74440d.0be21c","type":"comment","name":"BRG-TOPOLOGY-OPERATION ","info":"","comments":"","x":544.7152328491211,"y":97.95668983459473,"z":"38cff129.fc152e","wires":[]},{"id":"5cabda26.cb2e34","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":270.084716796875,"y":333.81380558013916,"z":"38cff129.fc152e","wires":[["8572d942.568b08","a4dc8e17.f43eb","8f606133.785f7","b962e00e.873c9"]]},{"id":"8572d942.568b08","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.4537658691406,"y":937.6564655303955,"z":"38cff129.fc152e","wires":[]},{"id":"a4dc8e17.f43eb","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$brg-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":491.0846405029297,"y":544.2275238037109,"z":"38cff129.fc152e","wires":[["3b96ffc6.57b1a","2254507e.315a2","e31135d3.dc53d8","f3af2581.6384d8","928514d5.296ba8","5ec79a58.8d5414","fd3e4e18.0df77"]]},{"id":"3b96ffc6.57b1a","type":"other","name":"assign","xml":"<outcome value='assign'>\n","comments":"","outputs":1,"x":712.9894676208496,"y":405.0846047401428,"z":"38cff129.fc152e","wires":[["aa516bcc.267f38"]]},{"id":"aa516bcc.267f38","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":892.7989959716797,"y":407.51329612731934,"z":"38cff129.fc152e","wires":[["f56f040a.9ba298"]]},{"id":"8f606133.785f7","type":"call","name":"call GENERIC-RESOURCE-API:validate-brg-input","xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-brg-input' mode='sync' >\n","comments":"","outputs":1,"x":625.6560668945312,"y":325.7989387512207,"z":"38cff129.fc152e","wires":[[]]},{"id":"f56f040a.9ba298","type":"call","name":"call GENERIC-RESOURCE-API:brg-topology-operation-assign","xml":"<call module='GENERIC-RESOURCE-API' rpc='brg-topology-operation-assign' mode='sync' >\n","comments":"","outputs":1,"x":1264.3702926635742,"y":407.37035179138184,"z":"38cff129.fc152e","wires":[[]]},{"id":"2254507e.315a2","type":"other","name":"activate","xml":"<outcome value='activate'>\n","comments":"","outputs":1,"x":713.3703765869141,"y":494.37034606933594,"z":"38cff129.fc152e","wires":[["2b87dbfe.7ba6e4"]]},{"id":"2b87dbfe.7ba6e4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":897.6085357666016,"y":495.37046813964844,"z":"38cff129.fc152e","wires":[["49265f59.4181d"]]},{"id":"e8d2423f.a9142","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":1830.1800549825039,"y":1470.5608215332031,"z":"38cff129.fc152e","wires":[[]]},{"id":"e31135d3.dc53d8","type":"other","name":"deactivate","xml":"<outcome value='deactivate'>\n","comments":"","outputs":1,"x":722.3704166412354,"y":554.3704042434692,"z":"38cff129.fc152e","wires":[["39e52589.68fa0a"]]},{"id":"39e52589.68fa0a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":903.6085758209229,"y":555.3705263137817,"z":"38cff129.fc152e","wires":[["430726d9.dbdaa8"]]},{"id":"ed015722.b22218","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":1836.6799634297695,"y":1586.3108215332031,"z":"38cff129.fc152e","wires":[[]]},{"id":"f3af2581.6384d8","type":"other","name":"unassign","xml":"<outcome value='unassign'>\n","comments":"","outputs":1,"x":720.370439529419,"y":672.7037439346313,"z":"38cff129.fc152e","wires":[["5b1c51a7.e6aa7"]]},{"id":"5b1c51a7.e6aa7","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":901.6085987091064,"y":673.7038660049438,"z":"38cff129.fc152e","wires":[["5bc27941.d4f4f8"]]},{"id":"1d34f9a1.037d66","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":1843.4299634297695,"y":1699.0608215332031,"z":"38cff129.fc152e","wires":[[]]},{"id":"928514d5.296ba8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":719.7037696838379,"y":732.7037267684937,"z":"38cff129.fc152e","wires":[["4e2016c4.9e9208"]]},{"id":"4e2016c4.9e9208","type":"returnFailure","name":"return failure","xml":"<return 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":901.7037658691406,"y":731.7037363052368,"z":"38cff129.fc152e","wires":[]},{"id":"b962e00e.873c9","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":513.4814605712891,"y":896.8148040771484,"z":"38cff129.fc152e","wires":[]},{"id":"970980ab.4166","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":1732.1008466084804,"y":1364.465576171875,"z":"38cff129.fc152e","wires":[["7c375e30.6abc8"]]},{"id":"cec76c20.78cb4","type":"switchNode","name":"switch service-data.networks.network_length","xml":"<switch test='`$service-data.networks.network_length`'>\n","comments":"","outputs":1,"x":1065.8149426778164,"y":1329.0369567871094,"z":"38cff129.fc152e","wires":[["5fff2a9.d7e8dd4","94eadb3a.e3a458"]]},{"id":"5fff2a9.d7e8dd4","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1308.81488164266,"y":1331.0369663238525,"z":"38cff129.fc152e","wires":[["a0ca271a.2df248"]]},{"id":"94eadb3a.e3a458","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1262.8149121602382,"y":1364.0369873046875,"z":"38cff129.fc152e","wires":[["955a1867.ed1ea8"]]},{"id":"7c375e30.6abc8","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":2022.5293973286953,"y":1363.7156600952148,"z":"38cff129.fc152e","wires":[["43582bb0.126264"]]},{"id":"43582bb0.126264","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2211.4817517598476,"y":1364.6083984375,"z":"38cff129.fc152e","wires":[["e72ed2b6.760d4"]]},{"id":"e72ed2b6.760d4","type":"set","name":"set tmp.nidx and ctx.network-data","xml":"<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].`' />\n","comments":"","x":2445.0135205586757,"y":1363.3584060668945,"z":"38cff129.fc152e","wires":[]},{"id":"1533495c.2f7d47","type":"comment","name":"Find the index to service data for this network - save id in tmp.nidx, save service-data","info":"","comments":"","x":1188.9260266621914,"y":1298.036979675293,"z":"38cff129.fc152e","wires":[]},{"id":"a0ca271a.2df248","type":"returnFailure","name":"return failure","xml":"<return 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":1500.592439015707,"y":1328.9259643554688,"z":"38cff129.fc152e","wires":[]},{"id":"955a1867.ed1ea8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1430.0848782857265,"y":1363.5915641784668,"z":"38cff129.fc152e","wires":[["970980ab.4166","a77bcb8b.e65188"]]},{"id":"a77bcb8b.e65188","type":"switchNode","name":"switch tmp.nidx ","xml":"<switch test=\"`$tmp.nidx`\">\n\n","comments":"","outputs":1,"x":1650.4022763570156,"y":1406.4487829208374,"z":"38cff129.fc152e","wires":[["4037e2b3.df5d0c"]]},{"id":"bbb7bbcb.e9d3e8","type":"returnFailure","name":"return failure","xml":"<return 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":2003.25925954183,"y":1402.1630249023438,"z":"38cff129.fc152e","wires":[]},{"id":"4037e2b3.df5d0c","type":"outcome","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1821.8308118184414,"y":1405.0201683044434,"z":"38cff129.fc152e","wires":[["bbb7bbcb.e9d3e8"]]},{"id":"14c198e5.1cc677","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":1043.1482861836757,"y":1470.512222290039,"z":"38cff129.fc152e","wires":[["3c6c6eae.28e612","103089d1.c81916"]]},{"id":"3c6c6eae.28e612","type":"outcome","name":"outcome PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":1408.148265838623,"y":1470.51220703125,"z":"38cff129.fc152e","wires":[["e8d2423f.a9142"]]},{"id":"103089d1.c81916","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1358.1483128865566,"y":1510.5122375488281,"z":"38cff129.fc152e","wires":[["e490ae22.d5bde"]]},{"id":"e490ae22.d5bde","type":"returnFailure","name":"return failure","xml":"<return 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":1528.1483128865566,"y":1510.5122375488281,"z":"38cff129.fc152e","wires":[]},{"id":"ab179e35.550b2","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":1050.4497693379726,"y":1586.463623046875,"z":"38cff129.fc152e","wires":[["9d407a50.6f42b8","50a066bd.db29b8"]]},{"id":"9d407a50.6f42b8","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":1413.4497388203945,"y":1586.4636535644531,"z":"38cff129.fc152e","wires":[["ed015722.b22218"]]},{"id":"50a066bd.db29b8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1383.4497388203945,"y":1626.4636535644531,"z":"38cff129.fc152e","wires":[["a5c499d0.8c9ba8"]]},{"id":"a5c499d0.8c9ba8","type":"returnFailure","name":"return failure","xml":"<return 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 deactivate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />","comments":"","x":1549.4497388203945,"y":1628.4636535644531,"z":"38cff129.fc152e","wires":[]},{"id":"5487a9fc.903868","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":1050.2513440450039,"y":1700.665023803711,"z":"38cff129.fc152e","wires":[["774c458d.4976ec","ff4fd639.391848","9d8f3da4.83f8"]]},{"id":"774c458d.4976ec","type":"outcome","name":"outcome PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":1410.2513135274257,"y":1700.665054321289,"z":"38cff129.fc152e","wires":[["1d34f9a1.037d66"]]},{"id":"ff4fd639.391848","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1367.2512524922695,"y":1784.6650695800781,"z":"38cff129.fc152e","wires":[["8f2347ed.c81b08"]]},{"id":"8f2347ed.c81b08","type":"returnFailure","name":"return failure","xml":"<return 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":1558.5846722920742,"y":1783.3316984176636,"z":"38cff129.fc152e","wires":[]},{"id":"9d8f3da4.83f8","type":"outcome","name":"outcome PendingDelete","xml":"<outcome value='PendingDelete'>\n","comments":"","outputs":1,"x":1413.4815381368007,"y":1738.512222290039,"z":"38cff129.fc152e","wires":[["1d34f9a1.037d66"]]},{"id":"5ec79a58.8d5414","type":"other","name":"create","xml":"<outcome value='create'>\n","comments":"","outputs":1,"x":718.611083984375,"y":453.97518730163574,"z":"38cff129.fc152e","wires":[["5936e2cd.b6288c"]]},{"id":"5936e2cd.b6288c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":899.8492431640625,"y":454.97530937194824,"z":"38cff129.fc152e","wires":[["4a78d52c.c3db4c"]]},{"id":"4a78d52c.c3db4c","type":"call","name":"call GENERIC-RESOURCE-API:brg-topology-operation-create","xml":"<call module='GENERIC-RESOURCE-API' rpc='brg-topology-operation-create' mode='sync' >\n","comments":"","outputs":1,"x":1265.7539520263672,"y":454.49903106689453,"z":"38cff129.fc152e","wires":[[]]},{"id":"fd3e4e18.0df77","type":"other","name":"delete","xml":"<outcome value='delete'>\n","comments":"","outputs":1,"x":716.9444370269775,"y":615.6418466567993,"z":"38cff129.fc152e","wires":[["d1afc7c1.5f5188"]]},{"id":"d1afc7c1.5f5188","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":898.182596206665,"y":616.6419687271118,"z":"38cff129.fc152e","wires":[["c0792090.5b78d"]]},{"id":"430726d9.dbdaa8","type":"call","name":"call GENERIC-RESOURCE-API:brg-topology-operation-deactivate","xml":"<call module='GENERIC-RESOURCE-API' rpc='brg-topology-operation-deactivate' mode='sync' >\n","comments":"","outputs":1,"x":1285.5184936523438,"y":554.851884841919,"z":"38cff129.fc152e","wires":[[]]},{"id":"c0792090.5b78d","type":"call","name":"call GENERIC-RESOURCE-API:brg-topology-operation-delete","xml":"<call module='GENERIC-RESOURCE-API' rpc='brg-topology-operation-delete' mode='sync' >\n","comments":"","outputs":1,"x":1275.1853427886963,"y":616.5185136795044,"z":"38cff129.fc152e","wires":[[]]},{"id":"5bc27941.d4f4f8","type":"call","name":"call GENERIC-RESOURCE-API:brg-topology-operation-unassign","xml":"<call module='GENERIC-RESOURCE-API' rpc='brg-topology-operation-unassign' mode='sync' >\n","comments":"","outputs":1,"x":1280.8518466949463,"y":673.8518400192261,"z":"38cff129.fc152e","wires":[[]]},{"id":"49265f59.4181d","type":"call","name":"call GENERIC-RESOURCE-API:brg-topology-operation-activate","xml":"<call module='GENERIC-RESOURCE-API' rpc='brg-topology-operation-activate' mode='sync' >\n","comments":"","outputs":1,"x":1275.1851806640625,"y":495.851806640625,"z":"38cff129.fc152e","wires":[[]]},{"id":"ef47642e.ee9758","type":"set","name":"copy input to service-data","xml":"<set>\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.' value='`$network-topology-operation-input.network-request-input.`' />\n","comments":"","x":524.4444580078125,"y":855.873046875,"z":"38cff129.fc152e","wires":[]}]
+[{"id":"6c1dd237.4ac514","type":"dgstart","name":"DGSTART","outputs":1,"x":186,"y":122,"z":"8e01e90d.03c0b8","wires":[["1d978af4.0eb20d"]]},{"id":"1d978af4.0eb20d","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":264.61902618408203,"y":162.238112449646,"z":"8e01e90d.03c0b8","wires":[["54c410ef.22533"]]},{"id":"54c410ef.22533","type":"method","name":"brg-topology-operation","xml":"<method rpc='brg-topology-operation' mode='sync'>\n","comments":"","outputs":1,"x":249.09529876708984,"y":221.99999809265137,"z":"8e01e90d.03c0b8","wires":[["26f2dc2e.727b4c"]]},{"id":"ff82b2d4.02e6b8","type":"comment","name":"BRG-TOPOLOGY-OPERATION ","info":"","comments":"","x":577.0115203857422,"y":69.58634376525879,"z":"8e01e90d.03c0b8","wires":[]},{"id":"26f2dc2e.727b4c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":302.3810043334961,"y":305.4434595108032,"z":"8e01e90d.03c0b8","wires":[["b666324b.9917e8","9699fcc1.653908","83c22972.dcb878","673a5d62.b6f37c"]]},{"id":"b666324b.9917e8","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":526.7500534057617,"y":909.2861194610596,"z":"8e01e90d.03c0b8","wires":[]},{"id":"9699fcc1.653908","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$brg-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":523.3809280395508,"y":515.857177734375,"z":"8e01e90d.03c0b8","wires":[["b7f5f677.943d9","65adfd1a.c80ddc","1a041f5.60f9561","a13e6eac.da9aa8","e5d2641c.f1fb7","43a8465a.615b","acd124f4.75c688"]]},{"id":"b7f5f677.943d9","type":"other","name":"assign","xml":"<outcome value='assign'>\n","comments":"","outputs":1,"x":745.2857551574707,"y":376.7142586708069,"z":"8e01e90d.03c0b8","wires":[["fff021ad.b9858"]]},{"id":"fff021ad.b9858","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":925.0952835083008,"y":379.1429500579834,"z":"8e01e90d.03c0b8","wires":[["5269932b.15572c"]]},{"id":"83c22972.dcb878","type":"call","name":"call GENERIC-RESOURCE-API:validate-brg-input","xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-brg-input' mode='sync' >\n","comments":"","outputs":1,"x":657.9523544311523,"y":297.42859268188477,"z":"8e01e90d.03c0b8","wires":[[]]},{"id":"5269932b.15572c","type":"call","name":"call GENERIC-RESOURCE-API:brg-topology-operation-assign","xml":"<call module='GENERIC-RESOURCE-API' rpc='brg-topology-operation-assign' mode='sync' >\n","comments":"","outputs":1,"x":1296.6665802001953,"y":379.0000057220459,"z":"8e01e90d.03c0b8","wires":[[]]},{"id":"65adfd1a.c80ddc","type":"other","name":"activate","xml":"<outcome value='activate'>\n","comments":"","outputs":1,"x":745.6666641235352,"y":466,"z":"8e01e90d.03c0b8","wires":[["9e79cedd.803c8"]]},{"id":"9e79cedd.803c8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":929.9048233032227,"y":467.0001220703125,"z":"8e01e90d.03c0b8","wires":[["3e6fbc16.fbfb2c"]]},{"id":"9ba81ac2.6483c","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":1862.476342519125,"y":1442.1904754638672,"z":"8e01e90d.03c0b8","wires":[[]]},{"id":"1a041f5.60f9561","type":"other","name":"deactivate","xml":"<outcome value='deactivate'>\n","comments":"","outputs":1,"x":754.6667041778564,"y":526.0000581741333,"z":"8e01e90d.03c0b8","wires":[["c6a02ccd.3a8a4"]]},{"id":"c6a02ccd.3a8a4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":935.904863357544,"y":527.0001802444458,"z":"8e01e90d.03c0b8","wires":[["d6368656.a9dc9"]]},{"id":"8f2d181d.e9dd4","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":1868.9762509663906,"y":1557.9404754638672,"z":"8e01e90d.03c0b8","wires":[[]]},{"id":"a13e6eac.da9aa8","type":"other","name":"unassign","xml":"<outcome value='unassign'>\n","comments":"","outputs":1,"x":752.66672706604,"y":644.3333978652954,"z":"8e01e90d.03c0b8","wires":[["1ce38c61.56ed3c"]]},{"id":"1ce38c61.56ed3c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":933.9048862457275,"y":645.3335199356079,"z":"8e01e90d.03c0b8","wires":[["df0ce2cc.be0a4"]]},{"id":"138e04fc.67d6a3","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":1875.7262509663906,"y":1670.6904754638672,"z":"8e01e90d.03c0b8","wires":[[]]},{"id":"e5d2641c.f1fb7","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":752.000057220459,"y":704.3333806991577,"z":"8e01e90d.03c0b8","wires":[["ff51f24.baa951"]]},{"id":"ff51f24.baa951","type":"returnFailure","name":"return failure","xml":"<return 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":934.0000534057617,"y":703.3333902359009,"z":"8e01e90d.03c0b8","wires":[]},{"id":"673a5d62.b6f37c","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":545.7777481079102,"y":868.4444580078125,"z":"8e01e90d.03c0b8","wires":[]},{"id":"1591bdd5.239aaa","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":1764.3971341451015,"y":1336.095230102539,"z":"8e01e90d.03c0b8","wires":[["847a89dc.e4c0d"]]},{"id":"c52d3dc.ceedd4","type":"switchNode","name":"switch service-data.networks.network_length","xml":"<switch test='`$service-data.networks.network_length`'>\n","comments":"","outputs":1,"x":1098.1112302144375,"y":1300.6666107177734,"z":"8e01e90d.03c0b8","wires":[["fa068ef.134e47","2eb4354e.bacee2"]]},{"id":"fa068ef.134e47","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1341.1111691792812,"y":1302.6666202545166,"z":"8e01e90d.03c0b8","wires":[["7a71186c.880bf"]]},{"id":"2eb4354e.bacee2","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1295.1111996968593,"y":1335.6666412353516,"z":"8e01e90d.03c0b8","wires":[["5ae3e22f.181e3c"]]},{"id":"847a89dc.e4c0d","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":2054.8256848653164,"y":1335.345314025879,"z":"8e01e90d.03c0b8","wires":[["adf77eb2.a6bef"]]},{"id":"adf77eb2.a6bef","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2243.7780392964687,"y":1336.238052368164,"z":"8e01e90d.03c0b8","wires":[["b5bb9b20.bfcac8"]]},{"id":"b5bb9b20.bfcac8","type":"set","name":"set tmp.nidx and ctx.network-data","xml":"<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].`' />\n","comments":"","x":2477.309808095297,"y":1334.9880599975586,"z":"8e01e90d.03c0b8","wires":[]},{"id":"dfdb5580.53cbe","type":"comment","name":"Find the index to service data for this network - save id in tmp.nidx, save service-data","info":"","comments":"","x":1221.2223141988125,"y":1269.666633605957,"z":"8e01e90d.03c0b8","wires":[]},{"id":"7a71186c.880bf","type":"returnFailure","name":"return failure","xml":"<return 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":1532.888726552328,"y":1300.5556182861328,"z":"8e01e90d.03c0b8","wires":[]},{"id":"5ae3e22f.181e3c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1462.3811658223476,"y":1335.2212181091309,"z":"8e01e90d.03c0b8","wires":[["1591bdd5.239aaa","586139d7.8852a8"]]},{"id":"586139d7.8852a8","type":"switchNode","name":"switch tmp.nidx ","xml":"<switch test=\"`$tmp.nidx`\">\n\n","comments":"","outputs":1,"x":1682.6985638936367,"y":1378.0784368515015,"z":"8e01e90d.03c0b8","wires":[["15d3790a.886ca7"]]},{"id":"f7113043.4dc108","type":"returnFailure","name":"return failure","xml":"<return 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":2035.5555470784511,"y":1373.7926788330078,"z":"8e01e90d.03c0b8","wires":[]},{"id":"15d3790a.886ca7","type":"outcome","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1854.1270993550625,"y":1376.6498222351074,"z":"8e01e90d.03c0b8","wires":[["f7113043.4dc108"]]},{"id":"4bdb6fd2.39562","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":1075.4445737202968,"y":1442.1418762207031,"z":"8e01e90d.03c0b8","wires":[["bd001758.5c8da","b56f358b.638728"]]},{"id":"bd001758.5c8da","type":"outcome","name":"outcome PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":1440.4445533752441,"y":1442.141860961914,"z":"8e01e90d.03c0b8","wires":[["9ba81ac2.6483c"]]},{"id":"b56f358b.638728","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1390.4446004231777,"y":1482.1418914794922,"z":"8e01e90d.03c0b8","wires":[["ef3ca8f6.2d1be8"]]},{"id":"ef3ca8f6.2d1be8","type":"returnFailure","name":"return failure","xml":"<return 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":1560.4446004231777,"y":1482.1418914794922,"z":"8e01e90d.03c0b8","wires":[]},{"id":"2cef8cb5.8dce54","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":1082.7460568745937,"y":1558.093276977539,"z":"8e01e90d.03c0b8","wires":[["df811c8b.287138","ee8d6caf.c61f58"]]},{"id":"df811c8b.287138","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":1445.7460263570156,"y":1558.0933074951172,"z":"8e01e90d.03c0b8","wires":[["8f2d181d.e9dd4"]]},{"id":"ee8d6caf.c61f58","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1415.7460263570156,"y":1598.0933074951172,"z":"8e01e90d.03c0b8","wires":[["7ba4729f.e98744"]]},{"id":"7ba4729f.e98744","type":"returnFailure","name":"return failure","xml":"<return 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 deactivate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />","comments":"","x":1581.7460263570156,"y":1600.0933074951172,"z":"8e01e90d.03c0b8","wires":[]},{"id":"386e76f6.8691fa","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":1082.547631581625,"y":1672.294677734375,"z":"8e01e90d.03c0b8","wires":[["60db2784.a8367","cf88857c.ec7638","ee049e88.66a8e8"]]},{"id":"60db2784.a8367","type":"outcome","name":"outcome PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":1442.5476010640468,"y":1672.2947082519531,"z":"8e01e90d.03c0b8","wires":[["138e04fc.67d6a3"]]},{"id":"cf88857c.ec7638","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1399.5475400288906,"y":1756.2947235107422,"z":"8e01e90d.03c0b8","wires":[["265fb0.353f685"]]},{"id":"265fb0.353f685","type":"returnFailure","name":"return failure","xml":"<return 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":1590.8809598286953,"y":1754.9613523483276,"z":"8e01e90d.03c0b8","wires":[]},{"id":"ee049e88.66a8e8","type":"outcome","name":"outcome PendingDelete","xml":"<outcome value='PendingDelete'>\n","comments":"","outputs":1,"x":1445.7778256734218,"y":1710.1418762207031,"z":"8e01e90d.03c0b8","wires":[["138e04fc.67d6a3"]]},{"id":"43a8465a.615b","type":"other","name":"create","xml":"<outcome value='create'>\n","comments":"","outputs":1,"x":750.9073715209961,"y":425.6048412322998,"z":"8e01e90d.03c0b8","wires":[["f465062d.77326"]]},{"id":"f465062d.77326","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":932.1455307006836,"y":426.6049633026123,"z":"8e01e90d.03c0b8","wires":[["8386ff96.bd5e8"]]},{"id":"8386ff96.bd5e8","type":"call","name":"call GENERIC-RESOURCE-API:brg-topology-operation-create","xml":"<call module='GENERIC-RESOURCE-API' rpc='brg-topology-operation-create' mode='sync' >\n","comments":"","outputs":1,"x":1298.0502395629883,"y":426.1286849975586,"z":"8e01e90d.03c0b8","wires":[[]]},{"id":"acd124f4.75c688","type":"other","name":"delete","xml":"<outcome value='delete'>\n","comments":"","outputs":1,"x":749.2407245635986,"y":587.2715005874634,"z":"8e01e90d.03c0b8","wires":[["5fda9f53.2a83b8"]]},{"id":"5fda9f53.2a83b8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":930.4788837432861,"y":588.2716226577759,"z":"8e01e90d.03c0b8","wires":[["a08d1432.8f8368"]]},{"id":"d6368656.a9dc9","type":"call","name":"call GENERIC-RESOURCE-API:brg-topology-operation-deactivate","xml":"<call module='GENERIC-RESOURCE-API' rpc='brg-topology-operation-deactivate' mode='sync' >\n","comments":"","outputs":1,"x":1317.8147811889648,"y":526.481538772583,"z":"8e01e90d.03c0b8","wires":[[]]},{"id":"a08d1432.8f8368","type":"call","name":"call GENERIC-RESOURCE-API:brg-topology-operation-delete","xml":"<call module='GENERIC-RESOURCE-API' rpc='brg-topology-operation-delete' mode='sync' >\n","comments":"","outputs":1,"x":1307.4816303253174,"y":588.1481676101685,"z":"8e01e90d.03c0b8","wires":[[]]},{"id":"df0ce2cc.be0a4","type":"call","name":"call GENERIC-RESOURCE-API:brg-topology-operation-unassign","xml":"<call module='GENERIC-RESOURCE-API' rpc='brg-topology-operation-unassign' mode='sync' >\n","comments":"","outputs":1,"x":1313.1481342315674,"y":645.4814939498901,"z":"8e01e90d.03c0b8","wires":[[]]},{"id":"3e6fbc16.fbfb2c","type":"call","name":"call GENERIC-RESOURCE-API:brg-topology-operation-activate","xml":"<call module='GENERIC-RESOURCE-API' rpc='brg-topology-operation-activate' mode='sync' >\n","comments":"","outputs":1,"x":1307.4814682006836,"y":467.48146057128906,"z":"8e01e90d.03c0b8","wires":[[]]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.json
index 7a73e378..5f0ecf5b 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.json
@@ -1 +1 @@
-[{"id":"89ae3f75.efc06","type":"dgstart","name":"DGSTART","outputs":1,"x":141,"y":83,"z":"307d8ab2.24f886","wires":[["a0627d9f.9732f8"]]},{"id":"a0627d9f.9732f8","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":237.23807907104492,"y":143.95239067077637,"z":"307d8ab2.24f886","wires":[["d2b128d2.d9f3b"]]},{"id":"d2b128d2.d9f3b","type":"method","name":"tunnelxconn-topology-operation-activate","xml":"<method rpc='tunnelxconn-topology-operation-activate' mode='sync'>\n","comments":"","outputs":1,"x":283.15485763549805,"y":179.19044589996338,"z":"307d8ab2.24f886","wires":[["e0a0d26a.cd7c18"]]},{"id":"e0a0d26a.cd7c18","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":191.47619247436523,"y":322.5237879753113,"z":"307d8ab2.24f886","wires":[["3595ac23.ea8734","f82799c8.167508","e00d09b3.2a3938","2679eac0.b2cc36","1a8f12fd.5ade8d","d30bace3.5a7f2","6c7cdfc8.6b2608","e60cbd81.14ee9","e233eb48.73f8b","69d61c38.40caa4","d2103b31.1f83e8","3936aa7e.049e66"]]},{"id":"f82799c8.167508","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":458.0001106262207,"y":992.2145080566406,"z":"307d8ab2.24f886","wires":[]},{"id":"3595ac23.ea8734","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":486.75402450561523,"y":956.3370542526245,"z":"307d8ab2.24f886","wires":[]},{"id":"69d61c38.40caa4","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":497.7542190551758,"y":703.0514001846313,"z":"307d8ab2.24f886","wires":[]},{"id":"2679eac0.b2cc36","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n","comments":"","x":453.73806381225586,"y":296.33332538604736,"z":"307d8ab2.24f886","wires":[]},{"id":"e00d09b3.2a3938","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.sz-vnf-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.tunnelxconn-vnf-id`' />\n\n\n","comments":"","x":500.9973258972168,"y":262.59259128570557,"z":"307d8ab2.24f886","wires":[]},{"id":"1a8f12fd.5ade8d","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":459.9934196472168,"y":332.23152446746826,"z":"307d8ab2.24f886","wires":[[]]},{"id":"6c7cdfc8.6b2608","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":522.5187530517578,"y":493.4594917297363,"z":"307d8ab2.24f886","wires":[["4b2d666b.abe658","c5e31c5.77e05e"]]},{"id":"d30bace3.5a7f2","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.tx-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":488.0648536682129,"y":392.0172290802002,"z":"307d8ab2.24f886","wires":[[]]},{"id":"4b2d666b.abe658","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":779.8148918151855,"y":492.26725220680237,"z":"307d8ab2.24f886","wires":[["56d62b25.1f49bc"]]},{"id":"e60cbd81.14ee9","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":530.5293121337891,"y":846.4341316223145,"z":"307d8ab2.24f886","wires":[["46ade8d5.b547e","20a825ec.94755a","ce5466bc.b050b"]]},{"id":"46ade8d5.b547e","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":800.837329864502,"y":899.432332418859,"z":"307d8ab2.24f886","wires":[["83dde006.65958"]]},{"id":"20a825ec.94755a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":791.8373794555664,"y":867.9323581680655,"z":"307d8ab2.24f886","wires":[["83dde006.65958"]]},{"id":"ce5466bc.b050b","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":795.5874176025391,"y":838.2894630432129,"z":"307d8ab2.24f886","wires":[["f7831c73.19aa18"]]},{"id":"83dde006.65958","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n","comments":"","x":961.5874176025391,"y":868.6823820099235,"z":"307d8ab2.24f886","wires":[]},{"id":"56d62b25.1f49bc","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":960.8148460388184,"y":492.7672016620636,"z":"307d8ab2.24f886","wires":[["e624279a.12ec8","a31618b2.409b8"]]},{"id":"e624279a.12ec8","type":"switchNode","name":"switch tx length","xml":"<switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1206.6720924377441,"y":527.052964925766,"z":"307d8ab2.24f886","wires":[["3cddd823.41afe"]]},{"id":"3cddd823.41afe","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1397.6720962524414,"y":527.0529625415802,"z":"307d8ab2.24f886","wires":[["6be9fe1e.f9c138"]]},{"id":"d7146c6d.b9cef8","type":"set","name":"set tx-ar from get","xml":"<set>\n<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />\n","comments":"","x":1797.5292320251465,"y":527.6243867874146,"z":"307d8ab2.24f886","wires":[]},{"id":"6be9fe1e.f9c138","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1568.5290794372559,"y":527.6244316101074,"z":"307d8ab2.24f886","wires":[["d7146c6d.b9cef8","357a7eb2.2788c2","aecdfd17.ff094"]]},{"id":"357a7eb2.2788c2","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1795.5294761657715,"y":595.0529508590698,"z":"307d8ab2.24f886","wires":[]},{"id":"787114c9.2806c4","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":547.8148155212402,"y":456.7671926021576,"z":"307d8ab2.24f886","wires":[]},{"id":"aecdfd17.ff094","type":"switchNode","name":"switch order-status","xml":"<switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1805.52925491333,"y":560.6243848800659,"z":"307d8ab2.24f886","wires":[["60364cde.e8654c","5dbfe46e.a42744"]]},{"id":"60364cde.e8654c","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2017.1292114257812,"y":521.6243848800659,"z":"307d8ab2.24f886","wires":[["2e5253bb.935b44"]]},{"id":"5dbfe46e.a42744","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2042.8435859680176,"y":557.052975654602,"z":"307d8ab2.24f886","wires":[["2e5253bb.935b44"]]},{"id":"3137dae9.e2b426","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":503.33863830566406,"y":547.3386459350586,"z":"307d8ab2.24f886","wires":[]},{"id":"a31618b2.409b8","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-tx-ar' value='$mdsal-ar.' />\n","comments":"","x":1286.3864250183105,"y":492.76729369163513,"z":"307d8ab2.24f886","wires":[]},{"id":"f725e409.258e68","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":458.9576606750488,"y":361.6243562698364,"z":"307d8ab2.24f886","wires":[]},{"id":"f7831c73.19aa18","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":937.2433853149414,"y":834.481632232666,"z":"307d8ab2.24f886","wires":[[]]},{"id":"6917ca0.586c538","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":461.2433776855469,"y":735.1481952667236,"z":"307d8ab2.24f886","wires":[]},{"id":"e233eb48.73f8b","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":445.24338150024414,"y":664.4815549850464,"z":"307d8ab2.24f886","wires":[[]]},{"id":"c5e31c5.77e05e","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":779.5766868591309,"y":528.4814250469208,"z":"307d8ab2.24f886","wires":[["dd1ff459.39f8a8"]]},{"id":"dd1ff459.39f8a8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":959.5766372680664,"y":529.1479756832123,"z":"307d8ab2.24f886","wires":[[]]},{"id":"d2103b31.1f83e8","type":"set","name":"set id","xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />","comments":"","x":428.24342346191406,"y":584.1481666564941,"z":"307d8ab2.24f886","wires":[]},{"id":"2e5253bb.935b44","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2231.5997276306152,"y":523.0000190734863,"z":"307d8ab2.24f886","wires":[[]]},{"id":"3936aa7e.049e66","type":"update","name":"update AAI allotted-resource","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"operational-status\" value=\"in-service-path\" />\n","comments":"","outputs":1,"x":488.85716247558594,"y":768.2380628585815,"z":"307d8ab2.24f886","wires":[["578afeed.16a8f8","fb8f774e.d3d13"]]},{"id":"578afeed.16a8f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":744.6190567016602,"y":751.1905598640442,"z":"307d8ab2.24f886","wires":[["9bc7661.b85f498"]]},{"id":"9bc7661.b85f498","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"AAI failed\" />\n","comments":"","x":911.142936706543,"y":762.8096308708191,"z":"307d8ab2.24f886","wires":[]},{"id":"fb8f774e.d3d13","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":751.7143440246582,"y":783.9525275230408,"z":"307d8ab2.24f886","wires":[["9bc7661.b85f498"]]}]
\ No newline at end of file
+[{"id":"89ae3f75.efc06","type":"dgstart","name":"DGSTART","outputs":1,"x":141,"y":83,"z":"307d8ab2.24f886","wires":[["a0627d9f.9732f8"]]},{"id":"a0627d9f.9732f8","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":237.23807907104492,"y":143.95239067077637,"z":"307d8ab2.24f886","wires":[["d2b128d2.d9f3b"]]},{"id":"d2b128d2.d9f3b","type":"method","name":"tunnelxconn-topology-operation-activate","xml":"<method rpc='tunnelxconn-topology-operation-activate' mode='sync'>\n","comments":"","outputs":1,"x":283.15485763549805,"y":179.19044589996338,"z":"307d8ab2.24f886","wires":[["e0a0d26a.cd7c18"]]},{"id":"e0a0d26a.cd7c18","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":191.47619247436523,"y":322.5237879753113,"z":"307d8ab2.24f886","wires":[["3595ac23.ea8734","f82799c8.167508","e00d09b3.2a3938","2679eac0.b2cc36","1a8f12fd.5ade8d","d30bace3.5a7f2","6c7cdfc8.6b2608","e60cbd81.14ee9","e233eb48.73f8b","69d61c38.40caa4","d2103b31.1f83e8","3936aa7e.049e66"]]},{"id":"f82799c8.167508","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":458.0001106262207,"y":992.2145080566406,"z":"307d8ab2.24f886","wires":[]},{"id":"3595ac23.ea8734","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":486.75402450561523,"y":956.3370542526245,"z":"307d8ab2.24f886","wires":[]},{"id":"69d61c38.40caa4","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":497.7542190551758,"y":703.0514001846313,"z":"307d8ab2.24f886","wires":[]},{"id":"2679eac0.b2cc36","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n","comments":"","x":453.73806381225586,"y":296.33332538604736,"z":"307d8ab2.24f886","wires":[]},{"id":"e00d09b3.2a3938","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.brg-vnf-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.tunnelxconn-vnf-id`' />\n\n\n","comments":"","x":500.9973258972168,"y":262.59259128570557,"z":"307d8ab2.24f886","wires":[]},{"id":"1a8f12fd.5ade8d","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":459.9934196472168,"y":332.23152446746826,"z":"307d8ab2.24f886","wires":[[]]},{"id":"6c7cdfc8.6b2608","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":522.5187530517578,"y":493.4594917297363,"z":"307d8ab2.24f886","wires":[["4b2d666b.abe658","c5e31c5.77e05e"]]},{"id":"d30bace3.5a7f2","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.tx-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":488.0648536682129,"y":392.0172290802002,"z":"307d8ab2.24f886","wires":[[]]},{"id":"4b2d666b.abe658","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":779.8148918151855,"y":492.26725220680237,"z":"307d8ab2.24f886","wires":[["56d62b25.1f49bc"]]},{"id":"e60cbd81.14ee9","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":530.5293121337891,"y":846.4341316223145,"z":"307d8ab2.24f886","wires":[["46ade8d5.b547e","20a825ec.94755a","ce5466bc.b050b"]]},{"id":"46ade8d5.b547e","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":800.837329864502,"y":899.432332418859,"z":"307d8ab2.24f886","wires":[["83dde006.65958"]]},{"id":"20a825ec.94755a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":791.8373794555664,"y":867.9323581680655,"z":"307d8ab2.24f886","wires":[["83dde006.65958"]]},{"id":"ce5466bc.b050b","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":795.5874176025391,"y":838.2894630432129,"z":"307d8ab2.24f886","wires":[["f7831c73.19aa18"]]},{"id":"83dde006.65958","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n","comments":"","x":961.5874176025391,"y":868.6823820099235,"z":"307d8ab2.24f886","wires":[]},{"id":"56d62b25.1f49bc","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":960.8148460388184,"y":492.7672016620636,"z":"307d8ab2.24f886","wires":[["e624279a.12ec8","a31618b2.409b8"]]},{"id":"e624279a.12ec8","type":"switchNode","name":"switch tx length","xml":"<switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1206.6720924377441,"y":527.052964925766,"z":"307d8ab2.24f886","wires":[["3cddd823.41afe"]]},{"id":"3cddd823.41afe","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1397.6720962524414,"y":527.0529625415802,"z":"307d8ab2.24f886","wires":[["6be9fe1e.f9c138"]]},{"id":"d7146c6d.b9cef8","type":"set","name":"set tx-ar from get","xml":"<set>\n<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />\n","comments":"","x":1797.5292320251465,"y":527.6243867874146,"z":"307d8ab2.24f886","wires":[]},{"id":"6be9fe1e.f9c138","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1568.5290794372559,"y":527.6244316101074,"z":"307d8ab2.24f886","wires":[["d7146c6d.b9cef8","357a7eb2.2788c2","aecdfd17.ff094"]]},{"id":"357a7eb2.2788c2","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1795.5294761657715,"y":595.0529508590698,"z":"307d8ab2.24f886","wires":[]},{"id":"787114c9.2806c4","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":547.8148155212402,"y":456.7671926021576,"z":"307d8ab2.24f886","wires":[]},{"id":"aecdfd17.ff094","type":"switchNode","name":"switch order-status","xml":"<switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1805.52925491333,"y":560.6243848800659,"z":"307d8ab2.24f886","wires":[["60364cde.e8654c","5dbfe46e.a42744"]]},{"id":"60364cde.e8654c","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2017.1292114257812,"y":521.6243848800659,"z":"307d8ab2.24f886","wires":[["2e5253bb.935b44"]]},{"id":"5dbfe46e.a42744","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2042.8435859680176,"y":557.052975654602,"z":"307d8ab2.24f886","wires":[["2e5253bb.935b44"]]},{"id":"3137dae9.e2b426","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":503.33863830566406,"y":547.3386459350586,"z":"307d8ab2.24f886","wires":[]},{"id":"a31618b2.409b8","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-tx-ar' value='$mdsal-ar.' />\n","comments":"","x":1286.3864250183105,"y":492.76729369163513,"z":"307d8ab2.24f886","wires":[]},{"id":"f725e409.258e68","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":458.9576606750488,"y":361.6243562698364,"z":"307d8ab2.24f886","wires":[]},{"id":"f7831c73.19aa18","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":937.2433853149414,"y":834.481632232666,"z":"307d8ab2.24f886","wires":[[]]},{"id":"6917ca0.586c538","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":461.2433776855469,"y":735.1481952667236,"z":"307d8ab2.24f886","wires":[]},{"id":"e233eb48.73f8b","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":445.24338150024414,"y":664.4815549850464,"z":"307d8ab2.24f886","wires":[[]]},{"id":"c5e31c5.77e05e","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":779.5766868591309,"y":528.4814250469208,"z":"307d8ab2.24f886","wires":[["dd1ff459.39f8a8"]]},{"id":"dd1ff459.39f8a8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":959.5766372680664,"y":529.1479756832123,"z":"307d8ab2.24f886","wires":[[]]},{"id":"d2103b31.1f83e8","type":"set","name":"set id","xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />","comments":"","x":428.24342346191406,"y":584.1481666564941,"z":"307d8ab2.24f886","wires":[]},{"id":"2e5253bb.935b44","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2231.5997276306152,"y":523.0000190734863,"z":"307d8ab2.24f886","wires":[[]]},{"id":"3936aa7e.049e66","type":"update","name":"update AAI allotted-resource","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"operational-status\" value=\"in-service-path\" />\n","comments":"","outputs":1,"x":488.85716247558594,"y":768.2380628585815,"z":"307d8ab2.24f886","wires":[["578afeed.16a8f8","fb8f774e.d3d13"]]},{"id":"578afeed.16a8f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":744.6190567016602,"y":751.1905598640442,"z":"307d8ab2.24f886","wires":[["9bc7661.b85f498"]]},{"id":"9bc7661.b85f498","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"AAI failed\" />\n","comments":"","x":911.142936706543,"y":762.8096308708191,"z":"307d8ab2.24f886","wires":[]},{"id":"fb8f774e.d3d13","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":751.7143440246582,"y":783.9525275230408,"z":"307d8ab2.24f886","wires":[["9bc7661.b85f498"]]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.json
index 0c8a4dc1..1f5f0ce7 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.json
@@ -1 +1 @@
-[{"id":"86e50663.b6ee7","type":"dgstart","name":"DGSTART","outputs":1,"x":137,"y":88,"z":"c29cef13.e3d5d8","wires":[["2d24af1e.7fa2a8"]]},{"id":"2d24af1e.7fa2a8","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":233.23807907104492,"y":148.95239067077637,"z":"c29cef13.e3d5d8","wires":[["74e24875.3cfcf8"]]},{"id":"74e24875.3cfcf8","type":"method","name":"tunnelxconn-topology-operation-assign","xml":"<method rpc='tunnelxconn-topology-operation-assign' mode='sync'>\n","comments":"","outputs":1,"x":279.15485763549805,"y":184.19044589996338,"z":"c29cef13.e3d5d8","wires":[["e072894a.7154d"]]},{"id":"e072894a.7154d","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":187.47619247436523,"y":327.5237879753113,"z":"c29cef13.e3d5d8","wires":[["e3d48cc9.bb58f8","36020bb.08daef4","2334bb07.ed3ebc","9391ddc8.bf5ea","2a1bf6fd.d6a2f2"]]},{"id":"17bdbcaa.47310b","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":1030.6666564941406,"y":2254.5477046966553,"z":"c29cef13.e3d5d8","wires":[]},{"id":"1451bf9b.af76b8","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":1067.7540550231934,"y":2133.432439804077,"z":"c29cef13.e3d5d8","wires":[]},{"id":"497553dc.51cd54","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":1139.468376159668,"y":1550.6228160858154,"z":"c29cef13.e3d5d8","wires":[]},{"id":"36020bb.08daef4","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n","comments":"","x":617.7380676269531,"y":219.33331298828125,"z":"c29cef13.e3d5d8","wires":[]},{"id":"e3d48cc9.bb58f8","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n","comments":"","x":670.997314453125,"y":181.59259033203125,"z":"c29cef13.e3d5d8","wires":[]},{"id":"7927a826.f8f1b","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":820.8148803710938,"y":367.26727294921875,"z":"c29cef13.e3d5d8","wires":[["60ea4bed.346d0c"]]},{"id":"d07cdc4.42333a","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":1160.8626251220703,"y":1775.1008231639862,"z":"c29cef13.e3d5d8","wires":[["aa00e07b.8ef6d8","b4bb7aeb.8c162","6f8d61a1.195bf8"]]},{"id":"aa00e07b.8ef6d8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1429.5040016174316,"y":1826.4322349056602,"z":"c29cef13.e3d5d8","wires":[["7e2a0a64.95737c"]]},{"id":"b4bb7aeb.8c162","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1420.504051208496,"y":1794.9322606548667,"z":"c29cef13.e3d5d8","wires":[["7e2a0a64.95737c"]]},{"id":"6f8d61a1.195bf8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1424.2540893554688,"y":1765.289365530014,"z":"c29cef13.e3d5d8","wires":[["d7380552.a9c53"]]},{"id":"7e2a0a64.95737c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n","comments":"","x":1590.2540893554688,"y":1795.6822844967246,"z":"c29cef13.e3d5d8","wires":[]},{"id":"407c544a.c6a19c","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1170.5294189453125,"y":468.05291748046875,"z":"c29cef13.e3d5d8","wires":[]},{"id":"f5ba2ddd.50b9d8","type":"comment","name":"Save consumed-allotted-resources to mdsal","info":"","comments":"","x":1238.2434692382812,"y":1149.7196044921875,"z":"c29cef13.e3d5d8","wires":[]},{"id":"a098c2bd.fe8618","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":543.8148193359375,"y":337.7672119140625,"z":"c29cef13.e3d5d8","wires":[]},{"id":"60ea4bed.346d0c","type":"returnFailure","name":"return failure - tunnelxconn already exists","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" \n    value=\"`'Existing tunnelxconn-allotted-resource with order status of ' + $mdsal-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n","comments":"","x":1130.129150390625,"y":363.6243896484375,"z":"c29cef13.e3d5d8","wires":[]},{"id":"f495041c.cf2a78","type":"set","name":"set tx-ar-identifiers","xml":"<set>\n<parameter name='tx-ar-identifiers.consuming-service-instance-id' value=\"`$tunnelxconn-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='tx-ar-identifiers.parent-service-instance-id' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='tx-ar-identifiers.allotted-resource-type' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='tx-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n","comments":"","x":1180.38623046875,"y":561.6243896484375,"z":"c29cef13.e3d5d8","wires":[]},{"id":"c9dfb7d2.b3163","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":1207.338623046875,"y":520.338623046875,"z":"c29cef13.e3d5d8","wires":[]},{"id":"64aabef8.7a73d8","type":"set","name":"set identifiers in overal structure","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.' \nvalue=\"`$tx-ar-identifiers.`\" />\n\n\n","comments":"","x":1197.38623046875,"y":869.910400390625,"z":"c29cef13.e3d5d8","wires":[]},{"id":"c612b930.1cf6b8","type":"set","name":"set ecomp model information from input","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.' \nvalue=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.`\" />\n\n\n","comments":"","x":1225.957763671875,"y":604.9100952148438,"z":"c29cef13.e3d5d8","wires":[]},{"id":"e5f0b40c.f7347","type":"switchNode","name":"switch model-invariant-uuid is null","xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>\n","comments":"","outputs":1,"x":1206.8148193359375,"y":644.195809841156,"z":"c29cef13.e3d5d8","wires":[["52bbafa3.847198"]]},{"id":"52bbafa3.847198","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1433.9576988220215,"y":645.6243271827698,"z":"c29cef13.e3d5d8","wires":[["756ec60f.a6522"]]},{"id":"756ec60f.a6522","type":"set","name":"set model-invariant-uuid","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-invariant-uuid' \nvalue=\"`$ar-model.invariant-uuid`\" />\n\n\n","comments":"","x":1635.38627243042,"y":645.0528798103333,"z":"c29cef13.e3d5d8","wires":[]},{"id":"320f47da.57618","type":"switchNode","name":"switch model-uuid is null","xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>\n","comments":"","outputs":1,"x":1178.2434158325195,"y":678.4815106391907,"z":"c29cef13.e3d5d8","wires":[["1363b23a.2bac66"]]},{"id":"1363b23a.2bac66","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1379.6719818115234,"y":679.0529322624207,"z":"c29cef13.e3d5d8","wires":[["47e6ae6.894ccd"]]},{"id":"47e6ae6.894ccd","type":"set","name":"set model-uuid","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-uuid' \nvalue=\"`$ar-model.uuid`\" />\n\n\n","comments":"","x":1572.529140472412,"y":679.0528540611267,"z":"c29cef13.e3d5d8","wires":[]},{"id":"14102754.2f6c51","type":"switchNode","name":"switch model-version is null","xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>\n","comments":"","outputs":1,"x":1186.8148193359375,"y":711.3386378288269,"z":"c29cef13.e3d5d8","wires":[["9846f707.69b828"]]},{"id":"9846f707.69b828","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1436.8148002624512,"y":711.3386225700378,"z":"c29cef13.e3d5d8","wires":[["5486c366.6df384"]]},{"id":"5486c366.6df384","type":"set","name":"set model-version","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version' \nvalue=\"`$ar-model.version`\" />\n\n\n","comments":"","x":1629.6719589233398,"y":711.3385443687439,"z":"c29cef13.e3d5d8","wires":[]},{"id":"38287bd7.9e2524","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.ecomp-generated-naming`'>\n","comments":"","outputs":1,"x":1250.38623046875,"y":813.7672729492188,"z":"c29cef13.e3d5d8","wires":[["1630cff4.056008","fd40616c.d3ea4"]]},{"id":"1630cff4.056008","type":"other","name":"outcome Y","xml":"<outcome value='Y'>\n","comments":"","outputs":1,"x":1536.3862915039062,"y":813.1958618164062,"z":"c29cef13.e3d5d8","wires":[["f4621f21.a2a11"]]},{"id":"f4621f21.a2a11","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":1690.1363525390625,"y":815.69580078125,"z":"c29cef13.e3d5d8","wires":[["5a678ab9.2fce1c"]]},{"id":"fd40616c.d3ea4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1555.608642578125,"y":902.1958618164062,"z":"c29cef13.e3d5d8","wires":[["bf700f18.196ef"]]},{"id":"bf700f18.196ef","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error in allotted-resource-model data.  Ecomp-generated-naming should be true\" />\n\n","comments":"","x":1738.608642578125,"y":907.1958618164062,"z":"c29cef13.e3d5d8","wires":[]},{"id":"5a678ab9.2fce1c","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.naming-policy`'>\n","comments":"","outputs":1,"x":1826.38623046875,"y":864.767333984375,"z":"c29cef13.e3d5d8","wires":[["4e249f82.48136","97ec05b1.e90f88"]]},{"id":"4e249f82.48136","type":"other","name":"outcome oam_network_policy","xml":"<outcome value='oam_network_policy'>\n","comments":"","outputs":1,"x":2201.244140625,"y":868.3453369140625,"z":"c29cef13.e3d5d8","wires":[["c9390e58.bb68c8"]]},{"id":"97ec05b1.e90f88","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2115.671875,"y":945.1958618164062,"z":"c29cef13.e3d5d8","wires":[["c9390e58.bb68c8"]]},{"id":"88881b26.fb7d38","type":"set","name":"set ar_name","xml":"<set>\n<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />\n","comments":"","x":2507.100830078125,"y":903.7672729492188,"z":"c29cef13.e3d5d8","wires":[]},{"id":"76abfc9.97d1a84","type":"execute","name":"execute SliStringUtils - replace TenantOAMNetworkRole","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ar-name`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-name\"/>\n    <parameter name=\"target\" value=\"$TenantOAMNetworkRole\"/>\n    <parameter name=\"replacement\" value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`\"/>\n\n","comments":"","outputs":1,"x":2651.2437858581543,"y":947.6244196891785,"z":"c29cef13.e3d5d8","wires":[[]]},{"id":"ed2c81e9.2e91e8","type":"execute","name":"execute SliStringUtils - replace LandingNetworkRole","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ar-name`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-name\"/>\n    <parameter name=\"target\" value=\"$LandingNetworkRole\"/>\n    <parameter name=\"replacement\" value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`\"/>\n\n","comments":"","outputs":1,"x":2638.243896484375,"y":987.7672729492188,"z":"c29cef13.e3d5d8","wires":[[]]},{"id":"c9390e58.bb68c8","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":2315.5292015075684,"y":943.3387522697449,"z":"c29cef13.e3d5d8","wires":[["88881b26.fb7d38","76abfc9.97d1a84","ed2c81e9.2e91e8","f84cf9b0.7188f"]]},{"id":"f84cf9b0.7188f","type":"set","name":"set identifiers.allotted-resource-name","xml":"<set>\n<parameter name='tx-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />\n","comments":"","x":2596.1005859375,"y":1038.052978515625,"z":"c29cef13.e3d5d8","wires":[]},{"id":"e31cc878.3632a","type":"set","name":"set assignments in overall structure","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.' \nvalue=\"`$tx-ar-assignments.`\" />\n\n\n","comments":"","x":1205.8624572753906,"y":1074.6246919631958,"z":"c29cef13.e3d5d8","wires":[]},{"id":"b8eb597f.e4b52","type":"set","name":"Handle tx-ar-assignments","xml":"<set>\n<parameter name='tx-ar-assignments.vni' value='`$tmp.vni`'/>\n<parameter name='tx-ar-assignments.vgmux-bearer-ip' value='`$tmp.vgmux-bearer-ip'/>\n<parameter name='tx-ar-assignments.vgmux-lan-ip' value='`$tmp.vgmux-lan-ip`'/>\n\n","comments":"","x":1189.529052734375,"y":1020.0530395507812,"z":"c29cef13.e3d5d8","wires":[]},{"id":"4376dbb6.6e16c4","type":"for","name":"for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]","xml":"<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n","comments":"","outputs":1,"x":2223.8155822753906,"y":1348.0411586761475,"z":"c29cef13.e3d5d8","wires":[["da3b0b74.a6e568"]]},{"id":"56f6507f.26de7","type":"switchNode","name":"switch service-data.consumed-allotted-resources_length","xml":"<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1252.8148498535156,"y":1236.505145072937,"z":"c29cef13.e3d5d8","wires":[["ddb5a763.1df178","691ec547.ee1574"]]},{"id":"ddb5a763.1df178","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1630.2077865600586,"y":1240.1124458312988,"z":"c29cef13.e3d5d8","wires":[["a44492ce.2e3908"]]},{"id":"691ec547.ee1574","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1628.9577865600586,"y":1330.1124477386475,"z":"c29cef13.e3d5d8","wires":[["41a2ddf2.4f55c4"]]},{"id":"da3b0b74.a6e568","type":"switchNode","name":"switch allotted-resource-id","xml":"<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n","comments":"","outputs":1,"x":2658.4106826782227,"y":1349.85085105896,"z":"c29cef13.e3d5d8","wires":[["b4288564.1e2e2"]]},{"id":"b4288564.1e2e2","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2865.220375061035,"y":1353.064962387085,"z":"c29cef13.e3d5d8","wires":[["eded98a3.21f45"]]},{"id":"41a2ddf2.4f55c4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1786.834976196289,"y":1336.4885501861572,"z":"c29cef13.e3d5d8","wires":[["4376dbb6.6e16c4","91cf9c53.dae668"]]},{"id":"eded98a3.21f45","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":3033.4817276000977,"y":1357.9222631454468,"z":"c29cef13.e3d5d8","wires":[["f2db02fc.3ac3f","2f227815.6875b"]]},{"id":"a44492ce.2e3908","type":"set","name":"set cidx","xml":"<set>\n<parameter name='tmp.cidx' value=\"`0`\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value=\"1\" />\n\n\n","comments":"","x":1809.0647735595703,"y":1242.3266830444336,"z":"c29cef13.e3d5d8","wires":[]},{"id":"f2db02fc.3ac3f","type":"set","name":"set tmp.cidx and ctx.consumed-ar","xml":"<set>\n<parameter name='tmp.cidx' value='`$cidx`' />\n<parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />\n<parameter name='tmp.found-cidx' value='true' />","comments":"","x":3279.3391876220703,"y":1352.4937419891357,"z":"c29cef13.e3d5d8","wires":[]},{"id":"d7198f32.c664e8","type":"set","name":"set consumed allotted resources","xml":"<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n","comments":"","x":1165.6720123291016,"y":1400.826681137085,"z":"c29cef13.e3d5d8","wires":[]},{"id":"d7380552.a9c53","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1565.910057067871,"y":1761.4815347194672,"z":"c29cef13.e3d5d8","wires":[["2bf804d6.1b13ec"]]},{"id":"2814978b.152d58","type":"comment","name":"Add SZ AR to mdsal","info":"","comments":"","x":1090.148208618164,"y":1736.1957080364227,"z":"c29cef13.e3d5d8","wires":[]},{"id":"e95c0e8b.7b1248","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":1106.4814224243164,"y":1474.671986579895,"z":"c29cef13.e3d5d8","wires":[[]]},{"id":"735e650c.0ff434","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":826.57666015625,"y":418.4814453125,"z":"c29cef13.e3d5d8","wires":[["a53bbad0.d05ee8"]]},{"id":"39921a42.ea205e","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":774.57666015625,"y":914.2908325195312,"z":"c29cef13.e3d5d8","wires":[["b5f1a66c.e80ff","f495041c.cf2a78","c612b930.1cf6b8","e5f0b40c.f7347","320f47da.57618","14102754.2f6c51","407c544a.c6a19c","38287bd7.9e2524","64aabef8.7a73d8","b8eb597f.e4b52","e31cc878.3632a","56f6507f.26de7","d7198f32.c664e8","e95c0e8b.7b1248","497553dc.51cd54","60a883f0.bcb034","d07cdc4.42333a","1451bf9b.af76b8","17bdbcaa.47310b","23924a89.1c85be","a9a8df25.360928"]]},{"id":"b5f1a66c.e80ff","type":"set","name":"set id","xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />","comments":"","x":1145.2434387207031,"y":424.433837890625,"z":"c29cef13.e3d5d8","wires":[]},{"id":"60a883f0.bcb034","type":"update","name":"update AAI allotted-resource","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$ar-model.invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$ar-model.uuid`\" />\n\t<parameter name=\"operational-status\" value=\"null\" />\n","comments":"","outputs":1,"x":1127.0529327392578,"y":1642.5767517089844,"z":"c29cef13.e3d5d8","wires":[["df395b50.238bb8","eeb033b6.d141e"]]},{"id":"df395b50.238bb8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1382.814842224121,"y":1625.5292553901672,"z":"c29cef13.e3d5d8","wires":[["861087a0.153ab8"]]},{"id":"861087a0.153ab8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"AAI failed\" />\n","comments":"","x":1549.338722229004,"y":1637.1483263969421,"z":"c29cef13.e3d5d8","wires":[]},{"id":"eeb033b6.d141e","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1389.9101295471191,"y":1658.2912230491638,"z":"c29cef13.e3d5d8","wires":[["861087a0.153ab8"]]},{"id":"91cf9c53.dae668","type":"switchNode","name":"switch tmp.found-cidx","xml":"<switch test='`$tmp.found-cidx`'>\n","comments":"","outputs":1,"x":2038.743423461914,"y":1594.2315921783447,"z":"c29cef13.e3d5d8","wires":[["80f9a157.bbe228"]]},{"id":"80f9a157.bbe228","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2228.743377685547,"y":1594.2315292358398,"z":"c29cef13.e3d5d8","wires":[["605822b2.0a83c4"]]},{"id":"605822b2.0a83c4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2394.743377685547,"y":1594.2315292358398,"z":"c29cef13.e3d5d8","wires":[["ca25698a.78028"]]},{"id":"ca25698a.78028","type":"set","name":"set tmp.cidx ","xml":"<set>\n<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\n","comments":"","x":2640.600706100464,"y":1594.8030033111572,"z":"c29cef13.e3d5d8","wires":[]},{"id":"2f227815.6875b","type":"break","name":"break","xml":"<break>\n","comments":"","x":3198.243408203125,"y":1397.731689453125,"z":"c29cef13.e3d5d8","wires":[]},{"id":"2bf804d6.1b13ec","type":"execute","name":"execute RestApiCallNode - Update parent provided service AR","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"parent\" />\n\n","comments":"","outputs":1,"x":1916.9521980285645,"y":1761.1904199123383,"z":"c29cef13.e3d5d8","wires":[["193e2f60.7d9e81","8877f57e.888c98","a9bea253.65b4a"]]},{"id":"f021e3bb.033ca","type":"comment","name":"Rollback parent","info":"","comments":"","x":1760.9521255493164,"y":1730.8570504188538,"z":"c29cef13.e3d5d8","wires":[]},{"id":"193e2f60.7d9e81","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2288.2602462768555,"y":1821.8553862571716,"z":"c29cef13.e3d5d8","wires":[["5ec6265b.8cb5d8"]]},{"id":"8877f57e.888c98","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2279.26029586792,"y":1790.3554120063782,"z":"c29cef13.e3d5d8","wires":[["5ec6265b.8cb5d8"]]},{"id":"a9bea253.65b4a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2283.0103340148926,"y":1760.7125168815255,"z":"c29cef13.e3d5d8","wires":[["5ec6265b.8cb5d8"]]},{"id":"5ec6265b.8cb5d8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2424.666301727295,"y":1756.9046860709786,"z":"c29cef13.e3d5d8","wires":[[]]},{"id":"54cbf738.cbd81","type":"comment","name":"Generate naming","info":"","comments":"","x":1181.3862762451172,"y":771.7672252655029,"z":"c29cef13.e3d5d8","wires":[]},{"id":"2334bb07.ed3ebc","type":"get-resource","name":"get-resource tunnelxconn-allotted-resource","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/$tunnelxconn-topology-operation-input.alloted-resource-information.allotted-resource-id' pfx='mdsal-ar' >\n","comments":"","outputs":1,"x":526,"y":372,"z":"c29cef13.e3d5d8","wires":[["7927a826.f8f1b","735e650c.0ff434"]]},{"id":"9391ddc8.bf5ea","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":602,"y":261,"z":"c29cef13.e3d5d8","wires":[[]]},{"id":"a53bbad0.d05ee8","type":"get-resource","name":"get-resource parent service instance","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id' pfx='mdsal-parent-service-instance' >\n","comments":"","outputs":1,"x":639,"y":521,"z":"c29cef13.e3d5d8","wires":[["1c82d68a.81b5e1","e03911fc.6a3c8"]]},{"id":"1c82d68a.81b5e1","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":902,"y":515,"z":"c29cef13.e3d5d8","wires":[["39921a42.ea205e"]]},{"id":"e03911fc.6a3c8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":715,"y":616,"z":"c29cef13.e3d5d8","wires":[["fffb2361.a3a2b8"]]},{"id":"fffb2361.a3a2b8","type":"returnFailure","name":"return failure - tunnelxconn already exists","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" \n    value=\"`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`\" />\n","comments":"","x":642,"y":677,"z":"c29cef13.e3d5d8","wires":[]},{"id":"23924a89.1c85be","type":"for","name":"for vf module parameters","xml":"<for index='curparm' start='0' end='`$parent-service-instance.service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameter.param_length`' >\n","comments":"","outputs":1,"x":1176,"y":967,"z":"c29cef13.e3d5d8","wires":[["ad9071a3.b4a0a8"]]},{"id":"ad9071a3.b4a0a8","type":"switchNode","name":"switch parameter name","xml":"<switch test='$parent-service-instance.service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameter.param[$curparm].name'>\n","comments":"","outputs":1,"x":1446,"y":966,"z":"c29cef13.e3d5d8","wires":[["f47ff540.ec451","7d2a4f55.aa0bd"]]},{"id":"f47ff540.ec451","type":"other","name":"vGMUX_Bearer_IP","xml":"<outcome value='vGMUX_Bearer_IP'>\n","comments":"","outputs":1,"x":1672,"y":970,"z":"c29cef13.e3d5d8","wires":[["e88342e.05cd1c"]]},{"id":"e88342e.05cd1c","type":"set","name":"set tmp.vgmux-bearer-ip","xml":"<set>\n<parameter name='tmp.vgmux-bearer-ip' value='`$parent-service-instance.service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameter.param[$curparm].value`'>\n`' />\n","comments":"","x":1915,"y":971,"z":"c29cef13.e3d5d8","wires":[]},{"id":"7d2a4f55.aa0bd","type":"other","name":"vGMUX_LAN_IP","xml":"<outcome value='vGMUX_LAN_IP'>\n","comments":"","outputs":1,"x":1674,"y":1030,"z":"c29cef13.e3d5d8","wires":[["7cfcb230.1feb74"]]},{"id":"7cfcb230.1feb74","type":"set","name":"set tmp.vgmux-lan-ip","xml":"<set>\n<parameter name='tmp.vgmux-lan-ip' value='`$parent-service-instance.service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameter.param[$curparm].value`'>\n`' />\n","comments":"","x":1917,"y":1031,"z":"c29cef13.e3d5d8","wires":[]},{"id":"a9a8df25.360928","type":"set","name":"set default assignments","xml":"<set>\n<parameter name='tmp.vni' value='123' />\n<parameter name='tmp.vgmux-bearer-ip' value='127.0.0.1' />\n<parameter name='tmp.vgmux-lan-ip' value='127.0.0.1' />","comments":"","x":1160,"y":916,"z":"c29cef13.e3d5d8","wires":[]},{"id":"2a1bf6fd.d6a2f2","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.tx-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":609,"y":301,"z":"c29cef13.e3d5d8","wires":[[]]}]
\ No newline at end of file
+[{"id":"86e50663.b6ee7","type":"dgstart","name":"DGSTART","outputs":1,"x":137,"y":88,"z":"c29cef13.e3d5d8","wires":[["2d24af1e.7fa2a8"]]},{"id":"2d24af1e.7fa2a8","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":233.23807907104492,"y":148.95239067077637,"z":"c29cef13.e3d5d8","wires":[["74e24875.3cfcf8"]]},{"id":"74e24875.3cfcf8","type":"method","name":"tunnelxconn-topology-operation-assign","xml":"<method rpc='tunnelxconn-topology-operation-assign' mode='sync'>\n","comments":"","outputs":1,"x":279.15485763549805,"y":184.19044589996338,"z":"c29cef13.e3d5d8","wires":[["e072894a.7154d"]]},{"id":"e072894a.7154d","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":187.47619247436523,"y":327.5237879753113,"z":"c29cef13.e3d5d8","wires":[["e3d48cc9.bb58f8","36020bb.08daef4","2334bb07.ed3ebc","9391ddc8.bf5ea","2a1bf6fd.d6a2f2"]]},{"id":"17bdbcaa.47310b","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":1030.6666564941406,"y":2254.5477046966553,"z":"c29cef13.e3d5d8","wires":[]},{"id":"1451bf9b.af76b8","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":1067.7540550231934,"y":2133.432439804077,"z":"c29cef13.e3d5d8","wires":[]},{"id":"497553dc.51cd54","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":1139.468376159668,"y":1550.6228160858154,"z":"c29cef13.e3d5d8","wires":[]},{"id":"36020bb.08daef4","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n","comments":"","x":617.7380676269531,"y":219.33331298828125,"z":"c29cef13.e3d5d8","wires":[]},{"id":"e3d48cc9.bb58f8","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n","comments":"","x":670.997314453125,"y":181.59259033203125,"z":"c29cef13.e3d5d8","wires":[]},{"id":"7927a826.f8f1b","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":820.8148803710938,"y":367.26727294921875,"z":"c29cef13.e3d5d8","wires":[["60ea4bed.346d0c"]]},{"id":"d07cdc4.42333a","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":1160.8626251220703,"y":1775.1008231639862,"z":"c29cef13.e3d5d8","wires":[["aa00e07b.8ef6d8","b4bb7aeb.8c162","6f8d61a1.195bf8"]]},{"id":"aa00e07b.8ef6d8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1429.5040016174316,"y":1826.4322349056602,"z":"c29cef13.e3d5d8","wires":[["7e2a0a64.95737c"]]},{"id":"b4bb7aeb.8c162","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1420.504051208496,"y":1794.9322606548667,"z":"c29cef13.e3d5d8","wires":[["7e2a0a64.95737c"]]},{"id":"6f8d61a1.195bf8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1424.2540893554688,"y":1765.289365530014,"z":"c29cef13.e3d5d8","wires":[["d7380552.a9c53"]]},{"id":"7e2a0a64.95737c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n","comments":"","x":1590.2540893554688,"y":1795.6822844967246,"z":"c29cef13.e3d5d8","wires":[]},{"id":"407c544a.c6a19c","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1170.5294189453125,"y":468.05291748046875,"z":"c29cef13.e3d5d8","wires":[]},{"id":"f5ba2ddd.50b9d8","type":"comment","name":"Save consumed-allotted-resources to mdsal","info":"","comments":"","x":1238.2434692382812,"y":1149.7196044921875,"z":"c29cef13.e3d5d8","wires":[]},{"id":"a098c2bd.fe8618","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":543.8148193359375,"y":337.7672119140625,"z":"c29cef13.e3d5d8","wires":[]},{"id":"60ea4bed.346d0c","type":"returnFailure","name":"return failure - tunnelxconn already exists","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" \n    value=\"`'Existing tunnelxconn-allotted-resource with order status of ' + $mdsal-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n","comments":"","x":1130.129150390625,"y":363.6243896484375,"z":"c29cef13.e3d5d8","wires":[]},{"id":"f495041c.cf2a78","type":"set","name":"set tx-ar-identifiers","xml":"<set>\n<parameter name='tx-ar-identifiers.consuming-service-instance-id' value=\"`$tunnelxconn-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='tx-ar-identifiers.parent-service-instance-id' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='tx-ar-identifiers.allotted-resource-type' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='tx-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n","comments":"","x":1180.38623046875,"y":561.6243896484375,"z":"c29cef13.e3d5d8","wires":[]},{"id":"c9dfb7d2.b3163","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":1207.338623046875,"y":520.338623046875,"z":"c29cef13.e3d5d8","wires":[]},{"id":"64aabef8.7a73d8","type":"set","name":"set identifiers in overal structure","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.' \nvalue=\"`$tx-ar-identifiers.`\" />\n\n\n","comments":"","x":1197.38623046875,"y":869.910400390625,"z":"c29cef13.e3d5d8","wires":[]},{"id":"c612b930.1cf6b8","type":"set","name":"set ecomp model information from input","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.' \nvalue=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.`\" />\n\n\n","comments":"","x":1225.957763671875,"y":604.9100952148438,"z":"c29cef13.e3d5d8","wires":[]},{"id":"e5f0b40c.f7347","type":"switchNode","name":"switch model-invariant-uuid is null","xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>\n","comments":"","outputs":1,"x":1206.8148193359375,"y":644.195809841156,"z":"c29cef13.e3d5d8","wires":[["52bbafa3.847198"]]},{"id":"52bbafa3.847198","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1433.9576988220215,"y":645.6243271827698,"z":"c29cef13.e3d5d8","wires":[["756ec60f.a6522"]]},{"id":"756ec60f.a6522","type":"set","name":"set model-invariant-uuid","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-invariant-uuid' \nvalue=\"`$ar-model.invariant-uuid`\" />\n\n\n","comments":"","x":1635.38627243042,"y":645.0528798103333,"z":"c29cef13.e3d5d8","wires":[]},{"id":"320f47da.57618","type":"switchNode","name":"switch model-uuid is null","xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>\n","comments":"","outputs":1,"x":1178.2434158325195,"y":678.4815106391907,"z":"c29cef13.e3d5d8","wires":[["1363b23a.2bac66"]]},{"id":"1363b23a.2bac66","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1379.6719818115234,"y":679.0529322624207,"z":"c29cef13.e3d5d8","wires":[["47e6ae6.894ccd"]]},{"id":"47e6ae6.894ccd","type":"set","name":"set model-uuid","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-uuid' \nvalue=\"`$ar-model.uuid`\" />\n\n\n","comments":"","x":1572.529140472412,"y":679.0528540611267,"z":"c29cef13.e3d5d8","wires":[]},{"id":"14102754.2f6c51","type":"switchNode","name":"switch model-version is null","xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>\n","comments":"","outputs":1,"x":1186.8148193359375,"y":711.3386378288269,"z":"c29cef13.e3d5d8","wires":[["9846f707.69b828"]]},{"id":"9846f707.69b828","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1436.8148002624512,"y":711.3386225700378,"z":"c29cef13.e3d5d8","wires":[["5486c366.6df384"]]},{"id":"5486c366.6df384","type":"set","name":"set model-version","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version' \nvalue=\"`$ar-model.version`\" />\n\n\n","comments":"","x":1629.6719589233398,"y":711.3385443687439,"z":"c29cef13.e3d5d8","wires":[]},{"id":"38287bd7.9e2524","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.ecomp-generated-naming`'>\n","comments":"","outputs":1,"x":1250.38623046875,"y":813.7672729492188,"z":"c29cef13.e3d5d8","wires":[["1630cff4.056008","fd40616c.d3ea4"]]},{"id":"1630cff4.056008","type":"other","name":"outcome Y","xml":"<outcome value='Y'>\n","comments":"","outputs":1,"x":1536.3862915039062,"y":813.1958618164062,"z":"c29cef13.e3d5d8","wires":[["f4621f21.a2a11"]]},{"id":"f4621f21.a2a11","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":1690.1363525390625,"y":815.69580078125,"z":"c29cef13.e3d5d8","wires":[["5a678ab9.2fce1c"]]},{"id":"fd40616c.d3ea4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1555.608642578125,"y":902.1958618164062,"z":"c29cef13.e3d5d8","wires":[["bf700f18.196ef"]]},{"id":"bf700f18.196ef","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error in allotted-resource-model data.  Ecomp-generated-naming should be true\" />\n\n","comments":"","x":1738.608642578125,"y":907.1958618164062,"z":"c29cef13.e3d5d8","wires":[]},{"id":"5a678ab9.2fce1c","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.naming-policy`'>\n","comments":"","outputs":1,"x":1826.38623046875,"y":864.767333984375,"z":"c29cef13.e3d5d8","wires":[["4e249f82.48136","97ec05b1.e90f88"]]},{"id":"4e249f82.48136","type":"other","name":"outcome oam_network_policy","xml":"<outcome value='oam_network_policy'>\n","comments":"","outputs":1,"x":2201.244140625,"y":868.3453369140625,"z":"c29cef13.e3d5d8","wires":[["c9390e58.bb68c8"]]},{"id":"97ec05b1.e90f88","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2115.671875,"y":945.1958618164062,"z":"c29cef13.e3d5d8","wires":[["c9390e58.bb68c8"]]},{"id":"88881b26.fb7d38","type":"set","name":"set ar_name","xml":"<set>\n<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />\n","comments":"","x":2507.100830078125,"y":903.7672729492188,"z":"c29cef13.e3d5d8","wires":[]},{"id":"76abfc9.97d1a84","type":"execute","name":"execute SliStringUtils - replace TenantOAMNetworkRole","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ar-name`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-name\"/>\n    <parameter name=\"target\" value=\"$TenantOAMNetworkRole\"/>\n    <parameter name=\"replacement\" value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`\"/>\n\n","comments":"","outputs":1,"x":2651.2437858581543,"y":947.6244196891785,"z":"c29cef13.e3d5d8","wires":[[]]},{"id":"ed2c81e9.2e91e8","type":"execute","name":"execute SliStringUtils - replace LandingNetworkRole","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ar-name`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-name\"/>\n    <parameter name=\"target\" value=\"$LandingNetworkRole\"/>\n    <parameter name=\"replacement\" value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`\"/>\n\n","comments":"","outputs":1,"x":2638.243896484375,"y":987.7672729492188,"z":"c29cef13.e3d5d8","wires":[[]]},{"id":"c9390e58.bb68c8","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":2315.5292015075684,"y":943.3387522697449,"z":"c29cef13.e3d5d8","wires":[["88881b26.fb7d38","76abfc9.97d1a84","ed2c81e9.2e91e8","f84cf9b0.7188f"]]},{"id":"f84cf9b0.7188f","type":"set","name":"set identifiers.allotted-resource-name","xml":"<set>\n<parameter name='tx-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />\n","comments":"","x":2596.1005859375,"y":1038.052978515625,"z":"c29cef13.e3d5d8","wires":[]},{"id":"e31cc878.3632a","type":"set","name":"set assignments in overall structure","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.' \nvalue=\"`$tx-ar-assignments.`\" />\n\n\n","comments":"","x":1205.8624572753906,"y":1074.6246919631958,"z":"c29cef13.e3d5d8","wires":[]},{"id":"b8eb597f.e4b52","type":"set","name":"Handle tx-ar-assignments","xml":"<set>\n<parameter name='tx-ar-assignments.vni' value='`$tmp.vni`'/>\n<parameter name='tx-ar-assignments.vgmux-bearer-ip' value='`$tmp.vgmux-bearer-ip'/>\n<parameter name='tx-ar-assignments.vgmux-lan-ip' value='`$tmp.vgmux-lan-ip`'/>\n\n","comments":"","x":1189.529052734375,"y":1020.0530395507812,"z":"c29cef13.e3d5d8","wires":[]},{"id":"4376dbb6.6e16c4","type":"for","name":"for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]","xml":"<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n","comments":"","outputs":1,"x":2223.8155822753906,"y":1348.0411586761475,"z":"c29cef13.e3d5d8","wires":[["da3b0b74.a6e568"]]},{"id":"56f6507f.26de7","type":"switchNode","name":"switch service-data.consumed-allotted-resources_length","xml":"<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1252.8148498535156,"y":1236.505145072937,"z":"c29cef13.e3d5d8","wires":[["ddb5a763.1df178","691ec547.ee1574"]]},{"id":"ddb5a763.1df178","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1630.2077865600586,"y":1240.1124458312988,"z":"c29cef13.e3d5d8","wires":[["a44492ce.2e3908"]]},{"id":"691ec547.ee1574","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1628.9577865600586,"y":1330.1124477386475,"z":"c29cef13.e3d5d8","wires":[["41a2ddf2.4f55c4"]]},{"id":"da3b0b74.a6e568","type":"switchNode","name":"switch allotted-resource-id","xml":"<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n","comments":"","outputs":1,"x":2658.4106826782227,"y":1349.85085105896,"z":"c29cef13.e3d5d8","wires":[["b4288564.1e2e2"]]},{"id":"b4288564.1e2e2","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2865.220375061035,"y":1353.064962387085,"z":"c29cef13.e3d5d8","wires":[["eded98a3.21f45"]]},{"id":"41a2ddf2.4f55c4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1786.834976196289,"y":1336.4885501861572,"z":"c29cef13.e3d5d8","wires":[["4376dbb6.6e16c4","91cf9c53.dae668"]]},{"id":"eded98a3.21f45","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":3033.4817276000977,"y":1357.9222631454468,"z":"c29cef13.e3d5d8","wires":[["f2db02fc.3ac3f","2f227815.6875b"]]},{"id":"a44492ce.2e3908","type":"set","name":"set cidx","xml":"<set>\n<parameter name='tmp.cidx' value=\"`0`\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value=\"1\" />\n\n\n","comments":"","x":1809.0647735595703,"y":1242.3266830444336,"z":"c29cef13.e3d5d8","wires":[]},{"id":"f2db02fc.3ac3f","type":"set","name":"set tmp.cidx and ctx.consumed-ar","xml":"<set>\n<parameter name='tmp.cidx' value='`$cidx`' />\n<parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />\n<parameter name='tmp.found-cidx' value='true' />","comments":"","x":3279.3391876220703,"y":1352.4937419891357,"z":"c29cef13.e3d5d8","wires":[]},{"id":"d7198f32.c664e8","type":"set","name":"set consumed allotted resources","xml":"<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n","comments":"","x":1165.6720123291016,"y":1400.826681137085,"z":"c29cef13.e3d5d8","wires":[]},{"id":"d7380552.a9c53","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1565.910057067871,"y":1761.4815347194672,"z":"c29cef13.e3d5d8","wires":[["2bf804d6.1b13ec"]]},{"id":"2814978b.152d58","type":"comment","name":"Add SZ AR to mdsal","info":"","comments":"","x":1090.148208618164,"y":1736.1957080364227,"z":"c29cef13.e3d5d8","wires":[]},{"id":"e95c0e8b.7b1248","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":1106.4814224243164,"y":1474.671986579895,"z":"c29cef13.e3d5d8","wires":[[]]},{"id":"735e650c.0ff434","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":826.57666015625,"y":418.4814453125,"z":"c29cef13.e3d5d8","wires":[["a53bbad0.d05ee8"]]},{"id":"39921a42.ea205e","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":774.57666015625,"y":914.2908325195312,"z":"c29cef13.e3d5d8","wires":[["b5f1a66c.e80ff","f495041c.cf2a78","c612b930.1cf6b8","e5f0b40c.f7347","320f47da.57618","14102754.2f6c51","407c544a.c6a19c","38287bd7.9e2524","64aabef8.7a73d8","b8eb597f.e4b52","e31cc878.3632a","56f6507f.26de7","d7198f32.c664e8","e95c0e8b.7b1248","497553dc.51cd54","60a883f0.bcb034","d07cdc4.42333a","1451bf9b.af76b8","17bdbcaa.47310b","23924a89.1c85be","a9a8df25.360928"]]},{"id":"b5f1a66c.e80ff","type":"set","name":"set id","xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />","comments":"","x":1145.2434387207031,"y":424.433837890625,"z":"c29cef13.e3d5d8","wires":[]},{"id":"60a883f0.bcb034","type":"update","name":"update AAI allotted-resource","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$ar-model.invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$ar-model.uuid`\" />\n\t<parameter name=\"operational-status\" value=\"null\" />\n","comments":"","outputs":1,"x":1127.0529327392578,"y":1642.5767517089844,"z":"c29cef13.e3d5d8","wires":[["df395b50.238bb8","eeb033b6.d141e"]]},{"id":"df395b50.238bb8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1382.814842224121,"y":1625.5292553901672,"z":"c29cef13.e3d5d8","wires":[["861087a0.153ab8"]]},{"id":"861087a0.153ab8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"AAI failed\" />\n","comments":"","x":1549.338722229004,"y":1637.1483263969421,"z":"c29cef13.e3d5d8","wires":[]},{"id":"eeb033b6.d141e","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1389.9101295471191,"y":1658.2912230491638,"z":"c29cef13.e3d5d8","wires":[["861087a0.153ab8"]]},{"id":"91cf9c53.dae668","type":"switchNode","name":"switch tmp.found-cidx","xml":"<switch test='`$tmp.found-cidx`'>\n","comments":"","outputs":1,"x":2038.743423461914,"y":1594.2315921783447,"z":"c29cef13.e3d5d8","wires":[["80f9a157.bbe228"]]},{"id":"80f9a157.bbe228","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2228.743377685547,"y":1594.2315292358398,"z":"c29cef13.e3d5d8","wires":[["605822b2.0a83c4"]]},{"id":"605822b2.0a83c4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2394.743377685547,"y":1594.2315292358398,"z":"c29cef13.e3d5d8","wires":[["ca25698a.78028"]]},{"id":"ca25698a.78028","type":"set","name":"set tmp.cidx ","xml":"<set>\n<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\n","comments":"","x":2640.600706100464,"y":1594.8030033111572,"z":"c29cef13.e3d5d8","wires":[]},{"id":"2f227815.6875b","type":"break","name":"break","xml":"<break>\n","comments":"","x":3198.243408203125,"y":1397.731689453125,"z":"c29cef13.e3d5d8","wires":[]},{"id":"2bf804d6.1b13ec","type":"execute","name":"execute RestApiCallNode - Update parent provided service AR","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"parent\" />\n\n","comments":"","outputs":1,"x":1916.9521980285645,"y":1761.1904199123383,"z":"c29cef13.e3d5d8","wires":[["193e2f60.7d9e81","8877f57e.888c98","a9bea253.65b4a"]]},{"id":"f021e3bb.033ca","type":"comment","name":"Rollback parent","info":"","comments":"","x":1760.9521255493164,"y":1730.8570504188538,"z":"c29cef13.e3d5d8","wires":[]},{"id":"193e2f60.7d9e81","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2288.2602462768555,"y":1821.8553862571716,"z":"c29cef13.e3d5d8","wires":[["5ec6265b.8cb5d8"]]},{"id":"8877f57e.888c98","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2279.26029586792,"y":1790.3554120063782,"z":"c29cef13.e3d5d8","wires":[["5ec6265b.8cb5d8"]]},{"id":"a9bea253.65b4a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2283.0103340148926,"y":1760.7125168815255,"z":"c29cef13.e3d5d8","wires":[["5ec6265b.8cb5d8"]]},{"id":"5ec6265b.8cb5d8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2424.666301727295,"y":1756.9046860709786,"z":"c29cef13.e3d5d8","wires":[[]]},{"id":"54cbf738.cbd81","type":"comment","name":"Generate naming","info":"","comments":"","x":1181.3862762451172,"y":771.7672252655029,"z":"c29cef13.e3d5d8","wires":[]},{"id":"2334bb07.ed3ebc","type":"get-resource","name":"get-resource tunnelxconn-allotted-resource","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/$tunnelxconn-topology-operation-input.alloted-resource-information.allotted-resource-id' pfx='mdsal-ar' >\n","comments":"","outputs":1,"x":526,"y":372,"z":"c29cef13.e3d5d8","wires":[["7927a826.f8f1b","735e650c.0ff434"]]},{"id":"9391ddc8.bf5ea","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":602,"y":261,"z":"c29cef13.e3d5d8","wires":[[]]},{"id":"a53bbad0.d05ee8","type":"get-resource","name":"get-resource parent service instance","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id' pfx='mdsal-parent-service-instance' >\n","comments":"","outputs":1,"x":639,"y":521,"z":"c29cef13.e3d5d8","wires":[["1c82d68a.81b5e1","e03911fc.6a3c8"]]},{"id":"1c82d68a.81b5e1","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":902,"y":515,"z":"c29cef13.e3d5d8","wires":[["39921a42.ea205e"]]},{"id":"e03911fc.6a3c8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":715,"y":616,"z":"c29cef13.e3d5d8","wires":[["fffb2361.a3a2b8"]]},{"id":"fffb2361.a3a2b8","type":"returnFailure","name":"return failure - tunnelxconn already exists","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" \n    value=\"`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`\" />\n","comments":"","x":642,"y":677,"z":"c29cef13.e3d5d8","wires":[]},{"id":"23924a89.1c85be","type":"for","name":"for vf module parameters","xml":"<for index='curparm' start='0' end='`$parent-service-instance.service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameter.param_length`' >\n","comments":"","outputs":1,"x":1176,"y":967,"z":"c29cef13.e3d5d8","wires":[["ad9071a3.b4a0a8"]]},{"id":"ad9071a3.b4a0a8","type":"switchNode","name":"switch parameter name","xml":"<switch test='$parent-service-instance.service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameter.param[$curparm].name'>\n","comments":"","outputs":1,"x":1446,"y":966,"z":"c29cef13.e3d5d8","wires":[["f47ff540.ec451","7d2a4f55.aa0bd"]]},{"id":"f47ff540.ec451","type":"other","name":"vGMUX_Bearer_IP","xml":"<outcome value='vGMUX_Bearer_IP'>\n","comments":"","outputs":1,"x":1672,"y":970,"z":"c29cef13.e3d5d8","wires":[["e88342e.05cd1c"]]},{"id":"e88342e.05cd1c","type":"set","name":"set tmp.vgmux-bearer-ip","xml":"<set>\n<parameter name='tmp.vgmux-bearer-ip' value='`$parent-service-instance.service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameter.param[$curparm].value`'>\n`' />\n","comments":"","x":1915,"y":971,"z":"c29cef13.e3d5d8","wires":[]},{"id":"7d2a4f55.aa0bd","type":"other","name":"vGMUX_LAN_IP","xml":"<outcome value='vGMUX_LAN_IP'>\n","comments":"","outputs":1,"x":1674,"y":1030,"z":"c29cef13.e3d5d8","wires":[["7cfcb230.1feb74"]]},{"id":"7cfcb230.1feb74","type":"set","name":"set tmp.vgmux-lan-ip","xml":"<set>\n<parameter name='tmp.vgmux-lan-ip' value='`$parent-service-instance.service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameter.param[$curparm].value`'>\n`' />\n","comments":"","x":1917,"y":1031,"z":"c29cef13.e3d5d8","wires":[]},{"id":"a9a8df25.360928","type":"set","name":"set default assignments","xml":"<set>\n<parameter name='tmp.vni' value='123' />\n<parameter name='tmp.vgmux-bearer-ip' value='127.0.0.1' />\n<parameter name='tmp.vgmux-lan-ip' value='127.0.0.1' />","comments":"","x":1160,"y":916,"z":"c29cef13.e3d5d8","wires":[]},{"id":"2a1bf6fd.d6a2f2","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.tx-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":609,"y":301,"z":"c29cef13.e3d5d8","wires":[[]]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.json
index 17bf796e..69c08835 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.json
@@ -1 +1 @@
-[{"id":"6f9de066.5847d","type":"dgstart","name":"DGSTART","outputs":1,"x":189,"y":158,"z":"f4d2a254.893c58","wires":[["8e2f74e3.858b78"]]},{"id":"8e2f74e3.858b78","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":285.2380790710449,"y":218.95239067077637,"z":"f4d2a254.893c58","wires":[["13a34c29.c3702c"]]},{"id":"13a34c29.c3702c","type":"method","name":"tunnelxconn-topology-operation-create","xml":"<method rpc='tunnelxconn-topology-operation-create' mode='sync'>\n","comments":"","outputs":1,"x":331.15485763549805,"y":254.19044589996338,"z":"f4d2a254.893c58","wires":[["c87d156a.699c4"]]},{"id":"c87d156a.699c4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":239.47619247436523,"y":397.5237879753113,"z":"f4d2a254.893c58","wires":[["51f87abd.a1d5dc","d66ce436.545278","19a0b3c5.18bfac","5c3f7f0e.d5bc28","8e013dc1.0fe2f","d14d013f.790a1","ad7ac3a4.bb6208","600070a1.7dce","6c97080a.edebb8","701ead52.f8f14c","5e09bd7.a43f8c4"]]},{"id":"d66ce436.545278","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":506.0001106262207,"y":1067.2145080566406,"z":"f4d2a254.893c58","wires":[]},{"id":"51f87abd.a1d5dc","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":534.7540245056152,"y":1031.3370542526245,"z":"f4d2a254.893c58","wires":[]},{"id":"701ead52.f8f14c","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":545.7542190551758,"y":778.0514001846313,"z":"f4d2a254.893c58","wires":[]},{"id":"5c3f7f0e.d5bc28","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n","comments":"","x":501.73806381225586,"y":371.33332538604736,"z":"f4d2a254.893c58","wires":[]},{"id":"19a0b3c5.18bfac","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n","comments":"","x":548.9973258972168,"y":337.59259128570557,"z":"f4d2a254.893c58","wires":[]},{"id":"8e013dc1.0fe2f","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":507.9934196472168,"y":407.23152446746826,"z":"f4d2a254.893c58","wires":[[]]},{"id":"ad7ac3a4.bb6208","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":570.5187530517578,"y":568.4594917297363,"z":"f4d2a254.893c58","wires":[["d15fca63.87d168","eac73efa.76b39"]]},{"id":"d14d013f.790a1","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.tx-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":536.0648536682129,"y":467.0172290802002,"z":"f4d2a254.893c58","wires":[[]]},{"id":"d15fca63.87d168","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":827.8148918151855,"y":567.2672522068024,"z":"f4d2a254.893c58","wires":[["7f82a913.8b496"]]},{"id":"600070a1.7dce","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":578.5293121337891,"y":921.4341316223145,"z":"f4d2a254.893c58","wires":[["ed2c78bc.20561","4efc51c7.e66398","bfd18d0a.8b02a8"]]},{"id":"ed2c78bc.20561","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":848.837329864502,"y":974.432332418859,"z":"f4d2a254.893c58","wires":[["538613e6.cf2ad4"]]},{"id":"4efc51c7.e66398","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":839.8373794555664,"y":942.9323581680655,"z":"f4d2a254.893c58","wires":[["538613e6.cf2ad4"]]},{"id":"bfd18d0a.8b02a8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":843.5874176025391,"y":913.2894630432129,"z":"f4d2a254.893c58","wires":[["af481428.ea3e6"]]},{"id":"538613e6.cf2ad4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n","comments":"","x":1009.5874176025391,"y":943.6823820099235,"z":"f4d2a254.893c58","wires":[]},{"id":"7f82a913.8b496","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1008.8148460388184,"y":567.7672016620636,"z":"f4d2a254.893c58","wires":[["3875eb6b.6bea24","d63e58d3.730ee"]]},{"id":"3875eb6b.6bea24","type":"switchNode","name":"switch sz length","xml":"<switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1254.6720924377441,"y":602.052964925766,"z":"f4d2a254.893c58","wires":[["3dbbde42.9a06fa"]]},{"id":"3dbbde42.9a06fa","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1445.6720962524414,"y":602.0529625415802,"z":"f4d2a254.893c58","wires":[["7411af85.9984f"]]},{"id":"d2c578e5.e1d038","type":"set","name":"set sz-ar from get","xml":"<set>\n<parameter name='sz-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />\n","comments":"","x":1845.5292320251465,"y":602.6243867874146,"z":"f4d2a254.893c58","wires":[]},{"id":"7411af85.9984f","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1616.5290794372559,"y":602.6244316101074,"z":"f4d2a254.893c58","wires":[["d2c578e5.e1d038","1f10e607.97da32","2abad38f.3beeb4"]]},{"id":"1f10e607.97da32","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1843.5294761657715,"y":670.0529508590698,"z":"f4d2a254.893c58","wires":[]},{"id":"9b73e788.952fc","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":595.8148155212402,"y":531.7671926021576,"z":"f4d2a254.893c58","wires":[]},{"id":"2abad38f.3beeb4","type":"switchNode","name":"switch order-status","xml":"<switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1853.52925491333,"y":635.6243848800659,"z":"f4d2a254.893c58","wires":[["dd6b4159.8810d8","eab76f6c.c6e5e8"]]},{"id":"dd6b4159.8810d8","type":"outcome","name":"outcome PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":2065.1292114257812,"y":596.6243848800659,"z":"f4d2a254.893c58","wires":[["2c5cdd88.b6dbda"]]},{"id":"eab76f6c.c6e5e8","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2090.8435859680176,"y":632.052975654602,"z":"f4d2a254.893c58","wires":[["2c5cdd88.b6dbda"]]},{"id":"7a9e9266.ab18fc","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":551.3386383056641,"y":622.3386459350586,"z":"f4d2a254.893c58","wires":[]},{"id":"d63e58d3.730ee","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-sz-ar' value='$mdsal-ar.' />\n","comments":"","x":1334.3864250183105,"y":567.7672936916351,"z":"f4d2a254.893c58","wires":[]},{"id":"f4f81fab.0ae3c8","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":506.9576606750488,"y":436.6243562698364,"z":"f4d2a254.893c58","wires":[]},{"id":"af481428.ea3e6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":985.2433853149414,"y":909.481632232666,"z":"f4d2a254.893c58","wires":[[]]},{"id":"febc7c1.096ff","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":519.2433776855469,"y":843.4815540313718,"z":"f4d2a254.893c58","wires":[]},{"id":"6c97080a.edebb8","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":493.24338150024414,"y":739.4815549850464,"z":"f4d2a254.893c58","wires":[[]]},{"id":"eac73efa.76b39","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":827.5766868591309,"y":603.4814250469208,"z":"f4d2a254.893c58","wires":[["73dce329.c1bf1c"]]},{"id":"73dce329.c1bf1c","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1007.5766372680664,"y":604.1479756832123,"z":"f4d2a254.893c58","wires":[[]]},{"id":"5e09bd7.a43f8c4","type":"set","name":"set id","xml":"<set>\n<parameter name='sz-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='sz-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='sz-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='sz-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />","comments":"","x":476.24342346191406,"y":659.1481666564941,"z":"f4d2a254.893c58","wires":[]},{"id":"2c5cdd88.b6dbda","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2279.5997276306152,"y":598.0000190734863,"z":"f4d2a254.893c58","wires":[[]]}]
\ No newline at end of file
+[{"id":"6f9de066.5847d","type":"dgstart","name":"DGSTART","outputs":1,"x":189,"y":158,"z":"f4d2a254.893c58","wires":[["8e2f74e3.858b78"]]},{"id":"8e2f74e3.858b78","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":285.2380790710449,"y":218.95239067077637,"z":"f4d2a254.893c58","wires":[["13a34c29.c3702c"]]},{"id":"13a34c29.c3702c","type":"method","name":"tunnelxconn-topology-operation-create","xml":"<method rpc='tunnelxconn-topology-operation-create' mode='sync'>\n","comments":"","outputs":1,"x":331.15485763549805,"y":254.19044589996338,"z":"f4d2a254.893c58","wires":[["c87d156a.699c4"]]},{"id":"c87d156a.699c4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":239.47619247436523,"y":397.5237879753113,"z":"f4d2a254.893c58","wires":[["51f87abd.a1d5dc","d66ce436.545278","19a0b3c5.18bfac","5c3f7f0e.d5bc28","8e013dc1.0fe2f","d14d013f.790a1","ad7ac3a4.bb6208","600070a1.7dce","6c97080a.edebb8","701ead52.f8f14c","5e09bd7.a43f8c4"]]},{"id":"d66ce436.545278","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":506.0001106262207,"y":1067.2145080566406,"z":"f4d2a254.893c58","wires":[]},{"id":"51f87abd.a1d5dc","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":534.7540245056152,"y":1031.3370542526245,"z":"f4d2a254.893c58","wires":[]},{"id":"701ead52.f8f14c","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":545.7542190551758,"y":778.0514001846313,"z":"f4d2a254.893c58","wires":[]},{"id":"5c3f7f0e.d5bc28","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n","comments":"","x":501.73806381225586,"y":371.33332538604736,"z":"f4d2a254.893c58","wires":[]},{"id":"19a0b3c5.18bfac","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n","comments":"","x":548.9973258972168,"y":337.59259128570557,"z":"f4d2a254.893c58","wires":[]},{"id":"8e013dc1.0fe2f","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":507.9934196472168,"y":407.23152446746826,"z":"f4d2a254.893c58","wires":[[]]},{"id":"ad7ac3a4.bb6208","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":570.5187530517578,"y":568.4594917297363,"z":"f4d2a254.893c58","wires":[["d15fca63.87d168","eac73efa.76b39"]]},{"id":"d14d013f.790a1","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.tx-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":536.0648536682129,"y":467.0172290802002,"z":"f4d2a254.893c58","wires":[[]]},{"id":"d15fca63.87d168","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":827.8148918151855,"y":567.2672522068024,"z":"f4d2a254.893c58","wires":[["7f82a913.8b496"]]},{"id":"600070a1.7dce","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":578.5293121337891,"y":921.4341316223145,"z":"f4d2a254.893c58","wires":[["ed2c78bc.20561","4efc51c7.e66398","bfd18d0a.8b02a8"]]},{"id":"ed2c78bc.20561","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":848.837329864502,"y":974.432332418859,"z":"f4d2a254.893c58","wires":[["538613e6.cf2ad4"]]},{"id":"4efc51c7.e66398","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":839.8373794555664,"y":942.9323581680655,"z":"f4d2a254.893c58","wires":[["538613e6.cf2ad4"]]},{"id":"bfd18d0a.8b02a8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":843.5874176025391,"y":913.2894630432129,"z":"f4d2a254.893c58","wires":[["af481428.ea3e6"]]},{"id":"538613e6.cf2ad4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n","comments":"","x":1009.5874176025391,"y":943.6823820099235,"z":"f4d2a254.893c58","wires":[]},{"id":"7f82a913.8b496","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1008.8148460388184,"y":567.7672016620636,"z":"f4d2a254.893c58","wires":[["3875eb6b.6bea24","d63e58d3.730ee"]]},{"id":"3875eb6b.6bea24","type":"switchNode","name":"switch tx length","xml":"<switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1254.6720924377441,"y":602.052964925766,"z":"f4d2a254.893c58","wires":[["3dbbde42.9a06fa"]]},{"id":"3dbbde42.9a06fa","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1445.6720962524414,"y":602.0529625415802,"z":"f4d2a254.893c58","wires":[["7411af85.9984f"]]},{"id":"d2c578e5.e1d038","type":"set","name":"set tx-ar from get","xml":"<set>\n<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />\n","comments":"","x":1845.5292320251465,"y":602.6243867874146,"z":"f4d2a254.893c58","wires":[]},{"id":"7411af85.9984f","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1616.5290794372559,"y":602.6244316101074,"z":"f4d2a254.893c58","wires":[["d2c578e5.e1d038","1f10e607.97da32","2abad38f.3beeb4"]]},{"id":"1f10e607.97da32","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1843.5294761657715,"y":670.0529508590698,"z":"f4d2a254.893c58","wires":[]},{"id":"9b73e788.952fc","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":595.8148155212402,"y":531.7671926021576,"z":"f4d2a254.893c58","wires":[]},{"id":"2abad38f.3beeb4","type":"switchNode","name":"switch order-status","xml":"<switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1853.52925491333,"y":635.6243848800659,"z":"f4d2a254.893c58","wires":[["dd6b4159.8810d8","eab76f6c.c6e5e8"]]},{"id":"dd6b4159.8810d8","type":"outcome","name":"outcome PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":2065.1292114257812,"y":596.6243848800659,"z":"f4d2a254.893c58","wires":[["2c5cdd88.b6dbda"]]},{"id":"eab76f6c.c6e5e8","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2090.8435859680176,"y":632.052975654602,"z":"f4d2a254.893c58","wires":[["2c5cdd88.b6dbda"]]},{"id":"7a9e9266.ab18fc","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":551.3386383056641,"y":622.3386459350586,"z":"f4d2a254.893c58","wires":[]},{"id":"d63e58d3.730ee","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-tx-ar' value='$mdsal-ar.' />\n","comments":"","x":1334.3864250183105,"y":567.7672936916351,"z":"f4d2a254.893c58","wires":[]},{"id":"f4f81fab.0ae3c8","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":506.9576606750488,"y":436.6243562698364,"z":"f4d2a254.893c58","wires":[]},{"id":"af481428.ea3e6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":985.2433853149414,"y":909.481632232666,"z":"f4d2a254.893c58","wires":[[]]},{"id":"febc7c1.096ff","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":519.2433776855469,"y":843.4815540313718,"z":"f4d2a254.893c58","wires":[]},{"id":"6c97080a.edebb8","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":493.24338150024414,"y":739.4815549850464,"z":"f4d2a254.893c58","wires":[[]]},{"id":"eac73efa.76b39","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":827.5766868591309,"y":603.4814250469208,"z":"f4d2a254.893c58","wires":[["73dce329.c1bf1c"]]},{"id":"73dce329.c1bf1c","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1007.5766372680664,"y":604.1479756832123,"z":"f4d2a254.893c58","wires":[[]]},{"id":"5e09bd7.a43f8c4","type":"set","name":"set id","xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />","comments":"","x":476.24342346191406,"y":659.1481666564941,"z":"f4d2a254.893c58","wires":[]},{"id":"2c5cdd88.b6dbda","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2279.5997276306152,"y":598.0000190734863,"z":"f4d2a254.893c58","wires":[[]]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.json
index 6908c783..403c1ff3 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.json
@@ -1 +1 @@
-[{"id":"77e7c41f.d39b2c","type":"dgstart","name":"DGSTART","outputs":1,"x":129,"y":77,"z":"2b82a97f.11e4ee","wires":[["eb62acdc.bba158"]]},{"id":"eb62acdc.bba158","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":225.23807907104492,"y":137.95239067077637,"z":"2b82a97f.11e4ee","wires":[["6dbf8ba8.4b789c"]]},{"id":"6dbf8ba8.4b789c","type":"method","name":"tunnelxconn-topology-operation-deactivate","xml":"<method rpc='tunnelxconn-topology-operation-deactivate' mode='sync'>\n","comments":"","outputs":1,"x":271.15485763549805,"y":173.19044589996338,"z":"2b82a97f.11e4ee","wires":[["12e90cec.9889bb"]]},{"id":"12e90cec.9889bb","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":179.47619247436523,"y":316.5237879753113,"z":"2b82a97f.11e4ee","wires":[["bfde80e.cd9818","a9f3bbe1.8e6458","2ebe5fb6.6deef","a139db86.7c9fb","50a44a6b.6f304c","f5391cda.7ebb38","7dc1b11b.7bf04","4e75d792.04ff58","5fcf2002.dc2648","6bad160a.61f6c8","63f6549a.034eec","17f54773.35cae9"]]},{"id":"a9f3bbe1.8e6458","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","x":446.0001106262207,"y":986.2145080566406,"z":"2b82a97f.11e4ee","wires":[]},{"id":"bfde80e.cd9818","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":474.7540283203125,"y":949.3370361328125,"z":"2b82a97f.11e4ee","wires":[]},{"id":"6bad160a.61f6c8","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":485.7542419433594,"y":697.0514221191406,"z":"2b82a97f.11e4ee","wires":[]},{"id":"a139db86.7c9fb","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n","comments":"","x":441.73806381225586,"y":290.33332538604736,"z":"2b82a97f.11e4ee","wires":[]},{"id":"2ebe5fb6.6deef","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n","comments":"","x":488.9973258972168,"y":256.59259128570557,"z":"2b82a97f.11e4ee","wires":[]},{"id":"50a44a6b.6f304c","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":447.9934196472168,"y":326.23152446746826,"z":"2b82a97f.11e4ee","wires":[[]]},{"id":"7dc1b11b.7bf04","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":510.5187530517578,"y":487.4594917297363,"z":"2b82a97f.11e4ee","wires":[["a6b8e311.5d4ba","ed37dff8.8e4478"]]},{"id":"f5391cda.7ebb38","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.sz-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":476.0648536682129,"y":386.0172290802002,"z":"2b82a97f.11e4ee","wires":[[]]},{"id":"a6b8e311.5d4ba","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":767.8148918151855,"y":486.26725220680237,"z":"2b82a97f.11e4ee","wires":[["78a50574.e49954"]]},{"id":"4e75d792.04ff58","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":518.5293121337891,"y":840.4341316223145,"z":"2b82a97f.11e4ee","wires":[["2ed02149.4dd00e","a6a159ad.147bc","820e27ec.2ca21"]]},{"id":"2ed02149.4dd00e","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":788.837329864502,"y":893.432332418859,"z":"2b82a97f.11e4ee","wires":[["275cb7a4.5d6a28"]]},{"id":"a6a159ad.147bc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":779.8373794555664,"y":861.9323581680655,"z":"2b82a97f.11e4ee","wires":[["275cb7a4.5d6a28"]]},{"id":"820e27ec.2ca21","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":783.5874176025391,"y":832.2894630432129,"z":"2b82a97f.11e4ee","wires":[["e3974867.1ad8f8"]]},{"id":"275cb7a4.5d6a28","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n","comments":"","x":949.5874176025391,"y":862.6823820099235,"z":"2b82a97f.11e4ee","wires":[]},{"id":"78a50574.e49954","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":948.8148460388184,"y":486.7672016620636,"z":"2b82a97f.11e4ee","wires":[["495c50c0.877d7","15865c28.4b50bc"]]},{"id":"495c50c0.877d7","type":"switchNode","name":"switch tx length","xml":"<switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1194.6720924377441,"y":521.052964925766,"z":"2b82a97f.11e4ee","wires":[["17c51ecf.7cd569"]]},{"id":"17c51ecf.7cd569","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1385.6720962524414,"y":521.0529625415802,"z":"2b82a97f.11e4ee","wires":[["68fb786b.6c9068"]]},{"id":"f91188db.7ca6","type":"set","name":"set sz-ar from get","xml":"<set>\n<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />\n","comments":"","x":1785.5292320251465,"y":521.6243867874146,"z":"2b82a97f.11e4ee","wires":[]},{"id":"68fb786b.6c9068","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1556.5290794372559,"y":521.6244316101074,"z":"2b82a97f.11e4ee","wires":[["f91188db.7ca6","24a63c38.36bad4","ed06370.898bd48"]]},{"id":"24a63c38.36bad4","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1783.5294761657715,"y":589.0529508590698,"z":"2b82a97f.11e4ee","wires":[]},{"id":"480b8187.423d28","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":535.8148155212402,"y":450.7671926021576,"z":"2b82a97f.11e4ee","wires":[]},{"id":"ed06370.898bd48","type":"switchNode","name":"switch order-status","xml":"<switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1793.52925491333,"y":554.6243848800659,"z":"2b82a97f.11e4ee","wires":[["8b637658.dc76d","523ac249.9cee14"]]},{"id":"8b637658.dc76d","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2005.1292114257812,"y":515.6243848800659,"z":"2b82a97f.11e4ee","wires":[["ae90d88c.f247e"]]},{"id":"523ac249.9cee14","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2030.8435859680176,"y":551.052975654602,"z":"2b82a97f.11e4ee","wires":[["ae90d88c.f247e"]]},{"id":"8ab3497c.81651","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":491.33863830566406,"y":541.3386459350586,"z":"2b82a97f.11e4ee","wires":[]},{"id":"15865c28.4b50bc","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-tx-ar' value='$mdsal-ar.' />\n","comments":"","x":1274.3864250183105,"y":486.76729369163513,"z":"2b82a97f.11e4ee","wires":[]},{"id":"667a59da.7e3228","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":446.9576606750488,"y":355.6243562698364,"z":"2b82a97f.11e4ee","wires":[]},{"id":"e3974867.1ad8f8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":925.2433853149414,"y":828.481632232666,"z":"2b82a97f.11e4ee","wires":[[]]},{"id":"877979d2.d0cc48","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":453.52909088134766,"y":733.9101696014404,"z":"2b82a97f.11e4ee","wires":[]},{"id":"5fcf2002.dc2648","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":433.24338150024414,"y":658.4815549850464,"z":"2b82a97f.11e4ee","wires":[[]]},{"id":"ed37dff8.8e4478","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":767.5766868591309,"y":522.4814250469208,"z":"2b82a97f.11e4ee","wires":[["4ddae737.3112d"]]},{"id":"4ddae737.3112d","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":947.5766372680664,"y":523.1479756832123,"z":"2b82a97f.11e4ee","wires":[[]]},{"id":"63f6549a.034eec","type":"set","name":"set id","xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />","comments":"","x":416.24342346191406,"y":578.1481666564941,"z":"2b82a97f.11e4ee","wires":[]},{"id":"ae90d88c.f247e","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2219.5997276306152,"y":517.0000190734863,"z":"2b82a97f.11e4ee","wires":[[]]},{"id":"17f54773.35cae9","type":"update","name":"update AAI allotted-resource","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"operational-status\" value=\"out-of-service-path\" />\n","comments":"","outputs":1,"x":480.42857360839844,"y":775.571418762207,"z":"2b82a97f.11e4ee","wires":[["5bc14f2f.834cb","dcde8ae.d8a6c78"]]},{"id":"5bc14f2f.834cb","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":736.1904830932617,"y":758.5239224433899,"z":"2b82a97f.11e4ee","wires":[["11d358d.8f25ba7"]]},{"id":"11d358d.8f25ba7","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"AAI failed\" />\n","comments":"","x":902.7143630981445,"y":770.1429934501648,"z":"2b82a97f.11e4ee","wires":[]},{"id":"dcde8ae.d8a6c78","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":743.2857704162598,"y":791.2858901023865,"z":"2b82a97f.11e4ee","wires":[["11d358d.8f25ba7"]]}]
\ No newline at end of file
+[{"id":"77e7c41f.d39b2c","type":"dgstart","name":"DGSTART","outputs":1,"x":129,"y":77,"z":"2b82a97f.11e4ee","wires":[["eb62acdc.bba158"]]},{"id":"eb62acdc.bba158","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":225.23807907104492,"y":137.95239067077637,"z":"2b82a97f.11e4ee","wires":[["6dbf8ba8.4b789c"]]},{"id":"6dbf8ba8.4b789c","type":"method","name":"tunnelxconn-topology-operation-deactivate","xml":"<method rpc='tunnelxconn-topology-operation-deactivate' mode='sync'>\n","comments":"","outputs":1,"x":271.15485763549805,"y":173.19044589996338,"z":"2b82a97f.11e4ee","wires":[["12e90cec.9889bb"]]},{"id":"12e90cec.9889bb","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":179.47619247436523,"y":316.5237879753113,"z":"2b82a97f.11e4ee","wires":[["bfde80e.cd9818","a9f3bbe1.8e6458","2ebe5fb6.6deef","a139db86.7c9fb","50a44a6b.6f304c","f5391cda.7ebb38","7dc1b11b.7bf04","4e75d792.04ff58","5fcf2002.dc2648","6bad160a.61f6c8","63f6549a.034eec","17f54773.35cae9"]]},{"id":"a9f3bbe1.8e6458","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","x":446.0001106262207,"y":986.2145080566406,"z":"2b82a97f.11e4ee","wires":[]},{"id":"bfde80e.cd9818","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":474.7540283203125,"y":949.3370361328125,"z":"2b82a97f.11e4ee","wires":[]},{"id":"6bad160a.61f6c8","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":485.7542419433594,"y":697.0514221191406,"z":"2b82a97f.11e4ee","wires":[]},{"id":"a139db86.7c9fb","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n","comments":"","x":441.73806381225586,"y":290.33332538604736,"z":"2b82a97f.11e4ee","wires":[]},{"id":"2ebe5fb6.6deef","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n","comments":"","x":488.9973258972168,"y":256.59259128570557,"z":"2b82a97f.11e4ee","wires":[]},{"id":"50a44a6b.6f304c","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":447.9934196472168,"y":326.23152446746826,"z":"2b82a97f.11e4ee","wires":[[]]},{"id":"7dc1b11b.7bf04","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":510.5187530517578,"y":487.4594917297363,"z":"2b82a97f.11e4ee","wires":[["a6b8e311.5d4ba","ed37dff8.8e4478"]]},{"id":"f5391cda.7ebb38","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.tx-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":476.0648536682129,"y":386.0172290802002,"z":"2b82a97f.11e4ee","wires":[[]]},{"id":"a6b8e311.5d4ba","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":767.8148918151855,"y":486.26725220680237,"z":"2b82a97f.11e4ee","wires":[["78a50574.e49954"]]},{"id":"4e75d792.04ff58","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":518.5293121337891,"y":840.4341316223145,"z":"2b82a97f.11e4ee","wires":[["2ed02149.4dd00e","a6a159ad.147bc","820e27ec.2ca21"]]},{"id":"2ed02149.4dd00e","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":788.837329864502,"y":893.432332418859,"z":"2b82a97f.11e4ee","wires":[["275cb7a4.5d6a28"]]},{"id":"a6a159ad.147bc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":779.8373794555664,"y":861.9323581680655,"z":"2b82a97f.11e4ee","wires":[["275cb7a4.5d6a28"]]},{"id":"820e27ec.2ca21","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":783.5874176025391,"y":832.2894630432129,"z":"2b82a97f.11e4ee","wires":[["e3974867.1ad8f8"]]},{"id":"275cb7a4.5d6a28","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n","comments":"","x":949.5874176025391,"y":862.6823820099235,"z":"2b82a97f.11e4ee","wires":[]},{"id":"78a50574.e49954","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":948.8148460388184,"y":486.7672016620636,"z":"2b82a97f.11e4ee","wires":[["495c50c0.877d7","15865c28.4b50bc"]]},{"id":"495c50c0.877d7","type":"switchNode","name":"switch tx length","xml":"<switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1194.6720924377441,"y":521.052964925766,"z":"2b82a97f.11e4ee","wires":[["17c51ecf.7cd569"]]},{"id":"17c51ecf.7cd569","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1385.6720962524414,"y":521.0529625415802,"z":"2b82a97f.11e4ee","wires":[["68fb786b.6c9068"]]},{"id":"f91188db.7ca6","type":"set","name":"set tx-ar from get","xml":"<set>\n<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />\n","comments":"","x":1785.5292320251465,"y":521.6243867874146,"z":"2b82a97f.11e4ee","wires":[]},{"id":"68fb786b.6c9068","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1556.5290794372559,"y":521.6244316101074,"z":"2b82a97f.11e4ee","wires":[["f91188db.7ca6","24a63c38.36bad4","ed06370.898bd48"]]},{"id":"24a63c38.36bad4","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1783.5294761657715,"y":589.0529508590698,"z":"2b82a97f.11e4ee","wires":[]},{"id":"480b8187.423d28","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":535.8148155212402,"y":450.7671926021576,"z":"2b82a97f.11e4ee","wires":[]},{"id":"ed06370.898bd48","type":"switchNode","name":"switch order-status","xml":"<switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1793.52925491333,"y":554.6243848800659,"z":"2b82a97f.11e4ee","wires":[["8b637658.dc76d","523ac249.9cee14"]]},{"id":"8b637658.dc76d","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2005.1292114257812,"y":515.6243848800659,"z":"2b82a97f.11e4ee","wires":[["ae90d88c.f247e"]]},{"id":"523ac249.9cee14","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2030.8435859680176,"y":551.052975654602,"z":"2b82a97f.11e4ee","wires":[["ae90d88c.f247e"]]},{"id":"8ab3497c.81651","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":491.33863830566406,"y":541.3386459350586,"z":"2b82a97f.11e4ee","wires":[]},{"id":"15865c28.4b50bc","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-tx-ar' value='$mdsal-ar.' />\n","comments":"","x":1274.3864250183105,"y":486.76729369163513,"z":"2b82a97f.11e4ee","wires":[]},{"id":"667a59da.7e3228","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":446.9576606750488,"y":355.6243562698364,"z":"2b82a97f.11e4ee","wires":[]},{"id":"e3974867.1ad8f8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":925.2433853149414,"y":828.481632232666,"z":"2b82a97f.11e4ee","wires":[[]]},{"id":"877979d2.d0cc48","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":453.52909088134766,"y":733.9101696014404,"z":"2b82a97f.11e4ee","wires":[]},{"id":"5fcf2002.dc2648","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":433.24338150024414,"y":658.4815549850464,"z":"2b82a97f.11e4ee","wires":[[]]},{"id":"ed37dff8.8e4478","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":767.5766868591309,"y":522.4814250469208,"z":"2b82a97f.11e4ee","wires":[["4ddae737.3112d"]]},{"id":"4ddae737.3112d","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":947.5766372680664,"y":523.1479756832123,"z":"2b82a97f.11e4ee","wires":[[]]},{"id":"63f6549a.034eec","type":"set","name":"set id","xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />","comments":"","x":416.24342346191406,"y":578.1481666564941,"z":"2b82a97f.11e4ee","wires":[]},{"id":"ae90d88c.f247e","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2219.5997276306152,"y":517.0000190734863,"z":"2b82a97f.11e4ee","wires":[[]]},{"id":"17f54773.35cae9","type":"update","name":"update AAI allotted-resource","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"operational-status\" value=\"out-of-service-path\" />\n","comments":"","outputs":1,"x":480.42857360839844,"y":775.571418762207,"z":"2b82a97f.11e4ee","wires":[["5bc14f2f.834cb","dcde8ae.d8a6c78"]]},{"id":"5bc14f2f.834cb","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":736.1904830932617,"y":758.5239224433899,"z":"2b82a97f.11e4ee","wires":[["11d358d.8f25ba7"]]},{"id":"11d358d.8f25ba7","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"AAI failed\" />\n","comments":"","x":902.7143630981445,"y":770.1429934501648,"z":"2b82a97f.11e4ee","wires":[]},{"id":"dcde8ae.d8a6c78","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":743.2857704162598,"y":791.2858901023865,"z":"2b82a97f.11e4ee","wires":[["11d358d.8f25ba7"]]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.json
index 5e845a9f..7b867f8b 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.json
@@ -1 +1 @@
-[{"id":"73e15983.54aaa","type":"dgstart","name":"DGSTART","outputs":1,"x":134,"y":114,"z":"83d5bebc.b2e04","wires":[["d289c8b5.38246"]]},{"id":"d289c8b5.38246","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":230.23807907104492,"y":174.95239067077637,"z":"83d5bebc.b2e04","wires":[["1e31bf7c.bf4681"]]},{"id":"1e31bf7c.bf4681","type":"method","name":"tunnelxconn-topology-operation-delete","xml":"<method rpc='tunnelxconn-topology-operation-delete' mode='sync'>\n","comments":"","outputs":1,"x":276.15485763549805,"y":210.19044589996338,"z":"83d5bebc.b2e04","wires":[["88507a82.3be6b"]]},{"id":"88507a82.3be6b","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":184.47619247436523,"y":353.5237879753113,"z":"83d5bebc.b2e04","wires":[["708c9cdf.38800c","38980918.60101e","940119d2.97d148","e2436206.64fe28","aed70f88.b64e","4926e886.d118d8","d8423ad3.959b9","1cda58ea.ace997","a1df0643.52ee18","c5f2e7f7.67fa4","481ae8b1.0c6d8","abfc59fc.fb60e"]]},{"id":"38980918.60101e","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":451.0001106262207,"y":1023.2145080566406,"z":"83d5bebc.b2e04","wires":[]},{"id":"708c9cdf.38800c","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":479.75402450561523,"y":987.3370542526245,"z":"83d5bebc.b2e04","wires":[]},{"id":"a1df0643.52ee18","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":490.7542190551758,"y":734.0514001846313,"z":"83d5bebc.b2e04","wires":[]},{"id":"e2436206.64fe28","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n","comments":"","x":446.73806381225586,"y":327.33332538604736,"z":"83d5bebc.b2e04","wires":[]},{"id":"940119d2.97d148","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n","comments":"","x":493.9973258972168,"y":293.59259128570557,"z":"83d5bebc.b2e04","wires":[]},{"id":"aed70f88.b64e","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":452.9934196472168,"y":363.23152446746826,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"d8423ad3.959b9","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":515.5187530517578,"y":524.4594917297363,"z":"83d5bebc.b2e04","wires":[["f4db9cab.d2556","d2ef8432.b57"]]},{"id":"4926e886.d118d8","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.sz-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":481.0648536682129,"y":423.0172290802002,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"f4db9cab.d2556","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":772.8148918151855,"y":523.2672522068024,"z":"83d5bebc.b2e04","wires":[["3354ddf4.08c79a"]]},{"id":"ece1582d.455d9","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":793.837329864502,"y":930.432332418859,"z":"83d5bebc.b2e04","wires":[["cf83304d.d0ebb8"]]},{"id":"83c14202.0049f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":784.8373794555664,"y":898.9323581680655,"z":"83d5bebc.b2e04","wires":[["cf83304d.d0ebb8"]]},{"id":"9bc349d7.413588","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":788.5874176025391,"y":869.2894630432129,"z":"83d5bebc.b2e04","wires":[["6b98a797.ae324"]]},{"id":"cf83304d.d0ebb8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n","comments":"","x":954.5874176025391,"y":899.6823820099235,"z":"83d5bebc.b2e04","wires":[]},{"id":"3354ddf4.08c79a","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":953.8148460388184,"y":523.7672016620636,"z":"83d5bebc.b2e04","wires":[["2b27c4d4.997524","ab03d1d0.e9037"]]},{"id":"2b27c4d4.997524","type":"switchNode","name":"switch tx length","xml":"<switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1199.6720924377441,"y":558.052964925766,"z":"83d5bebc.b2e04","wires":[["930a4219.057d78"]]},{"id":"930a4219.057d78","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1390.6720962524414,"y":558.0529625415802,"z":"83d5bebc.b2e04","wires":[["4cf6e1d2.effed"]]},{"id":"f1ca49e7.6e5fc","type":"set","name":"set tx-ar from get","xml":"<set>\n<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />\n","comments":"","x":1790.5292320251465,"y":558.6243867874146,"z":"83d5bebc.b2e04","wires":[]},{"id":"4cf6e1d2.effed","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1561.5290794372559,"y":558.6244316101074,"z":"83d5bebc.b2e04","wires":[["f1ca49e7.6e5fc","485e3856.60d4a8","222bb1e9.0427b6"]]},{"id":"485e3856.60d4a8","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1788.5294761657715,"y":626.0529508590698,"z":"83d5bebc.b2e04","wires":[]},{"id":"1b34868.09b18fa","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":540.8148155212402,"y":487.7671926021576,"z":"83d5bebc.b2e04","wires":[]},{"id":"222bb1e9.0427b6","type":"switchNode","name":"switch order-status","xml":"<switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1798.52925491333,"y":591.6243848800659,"z":"83d5bebc.b2e04","wires":[["d4024b9b.b96b68","5352c45c.7c8d2c"]]},{"id":"d4024b9b.b96b68","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2010.1292114257812,"y":552.6243848800659,"z":"83d5bebc.b2e04","wires":[["43e0fc0.7e21584"]]},{"id":"5352c45c.7c8d2c","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2035.8435859680176,"y":588.052975654602,"z":"83d5bebc.b2e04","wires":[["43e0fc0.7e21584"]]},{"id":"51ffa743.27a62","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":496.33863830566406,"y":578.3386459350586,"z":"83d5bebc.b2e04","wires":[]},{"id":"ab03d1d0.e9037","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-tx-ar' value='$mdsal-ar.' />\n","comments":"","x":1279.3864250183105,"y":523.7672936916351,"z":"83d5bebc.b2e04","wires":[]},{"id":"903a3cb1.1c223","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":451.9576606750488,"y":392.6243562698364,"z":"83d5bebc.b2e04","wires":[]},{"id":"6b98a797.ae324","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":930.2433853149414,"y":865.481632232666,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"32ab8eae.09664a","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":464.2433776855469,"y":799.4815540313718,"z":"83d5bebc.b2e04","wires":[]},{"id":"1cda58ea.ace997","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":438.24338150024414,"y":695.4815549850464,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"d2ef8432.b57","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":772.5766868591309,"y":559.4814250469208,"z":"83d5bebc.b2e04","wires":[["2c450f2e.03316"]]},{"id":"2c450f2e.03316","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":952.5766372680664,"y":560.1479756832123,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"c5f2e7f7.67fa4","type":"set","name":"set id","xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />","comments":"","x":421.24342346191406,"y":615.1481666564941,"z":"83d5bebc.b2e04","wires":[]},{"id":"43e0fc0.7e21584","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2224.5997276306152,"y":554.0000190734863,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"481ae8b1.0c6d8","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":521.0000152587891,"y":880.0000247955322,"z":"83d5bebc.b2e04","wires":[["9bc349d7.413588","83c14202.0049f8","ece1582d.455d9"]]},{"id":"abfc59fc.fb60e","type":"set","name":"clear tx-ar-assignments","xml":"<set>\n<parameter name='tx-ar-assignments.' value=\"\" />\n\n\n\n","comments":"","x":465,"y":766,"z":"83d5bebc.b2e04","wires":[]}]
\ No newline at end of file
+[{"id":"73e15983.54aaa","type":"dgstart","name":"DGSTART","outputs":1,"x":134,"y":114,"z":"83d5bebc.b2e04","wires":[["d289c8b5.38246"]]},{"id":"d289c8b5.38246","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":230.23807907104492,"y":174.95239067077637,"z":"83d5bebc.b2e04","wires":[["1e31bf7c.bf4681"]]},{"id":"1e31bf7c.bf4681","type":"method","name":"tunnelxconn-topology-operation-delete","xml":"<method rpc='tunnelxconn-topology-operation-delete' mode='sync'>\n","comments":"","outputs":1,"x":276.15485763549805,"y":210.19044589996338,"z":"83d5bebc.b2e04","wires":[["88507a82.3be6b"]]},{"id":"88507a82.3be6b","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":184.47619247436523,"y":353.5237879753113,"z":"83d5bebc.b2e04","wires":[["708c9cdf.38800c","38980918.60101e","940119d2.97d148","e2436206.64fe28","aed70f88.b64e","4926e886.d118d8","d8423ad3.959b9","1cda58ea.ace997","a1df0643.52ee18","c5f2e7f7.67fa4","481ae8b1.0c6d8","abfc59fc.fb60e"]]},{"id":"38980918.60101e","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":451.0001106262207,"y":1023.2145080566406,"z":"83d5bebc.b2e04","wires":[]},{"id":"708c9cdf.38800c","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":479.75402450561523,"y":987.3370542526245,"z":"83d5bebc.b2e04","wires":[]},{"id":"a1df0643.52ee18","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":490.7542190551758,"y":734.0514001846313,"z":"83d5bebc.b2e04","wires":[]},{"id":"e2436206.64fe28","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n","comments":"","x":446.73806381225586,"y":327.33332538604736,"z":"83d5bebc.b2e04","wires":[]},{"id":"940119d2.97d148","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n","comments":"","x":493.9973258972168,"y":293.59259128570557,"z":"83d5bebc.b2e04","wires":[]},{"id":"aed70f88.b64e","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":452.9934196472168,"y":363.23152446746826,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"d8423ad3.959b9","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":515.5187530517578,"y":524.4594917297363,"z":"83d5bebc.b2e04","wires":[["f4db9cab.d2556","d2ef8432.b57"]]},{"id":"4926e886.d118d8","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.tx-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":481.0648536682129,"y":423.0172290802002,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"f4db9cab.d2556","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":772.8148918151855,"y":523.2672522068024,"z":"83d5bebc.b2e04","wires":[["3354ddf4.08c79a"]]},{"id":"ece1582d.455d9","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":793.837329864502,"y":930.432332418859,"z":"83d5bebc.b2e04","wires":[["cf83304d.d0ebb8"]]},{"id":"83c14202.0049f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":784.8373794555664,"y":898.9323581680655,"z":"83d5bebc.b2e04","wires":[["cf83304d.d0ebb8"]]},{"id":"9bc349d7.413588","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":788.5874176025391,"y":869.2894630432129,"z":"83d5bebc.b2e04","wires":[["6b98a797.ae324"]]},{"id":"cf83304d.d0ebb8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n","comments":"","x":954.5874176025391,"y":899.6823820099235,"z":"83d5bebc.b2e04","wires":[]},{"id":"3354ddf4.08c79a","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":953.8148460388184,"y":523.7672016620636,"z":"83d5bebc.b2e04","wires":[["2b27c4d4.997524","ab03d1d0.e9037"]]},{"id":"2b27c4d4.997524","type":"switchNode","name":"switch tx length","xml":"<switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1199.6720924377441,"y":558.052964925766,"z":"83d5bebc.b2e04","wires":[["930a4219.057d78"]]},{"id":"930a4219.057d78","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1390.6720962524414,"y":558.0529625415802,"z":"83d5bebc.b2e04","wires":[["4cf6e1d2.effed"]]},{"id":"f1ca49e7.6e5fc","type":"set","name":"set tx-ar from get","xml":"<set>\n<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />\n","comments":"","x":1790.5292320251465,"y":558.6243867874146,"z":"83d5bebc.b2e04","wires":[]},{"id":"4cf6e1d2.effed","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1561.5290794372559,"y":558.6244316101074,"z":"83d5bebc.b2e04","wires":[["f1ca49e7.6e5fc","485e3856.60d4a8","222bb1e9.0427b6"]]},{"id":"485e3856.60d4a8","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1788.5294761657715,"y":626.0529508590698,"z":"83d5bebc.b2e04","wires":[]},{"id":"1b34868.09b18fa","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":540.8148155212402,"y":487.7671926021576,"z":"83d5bebc.b2e04","wires":[]},{"id":"222bb1e9.0427b6","type":"switchNode","name":"switch order-status","xml":"<switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1798.52925491333,"y":591.6243848800659,"z":"83d5bebc.b2e04","wires":[["d4024b9b.b96b68","5352c45c.7c8d2c"]]},{"id":"d4024b9b.b96b68","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2010.1292114257812,"y":552.6243848800659,"z":"83d5bebc.b2e04","wires":[["43e0fc0.7e21584"]]},{"id":"5352c45c.7c8d2c","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2035.8435859680176,"y":588.052975654602,"z":"83d5bebc.b2e04","wires":[["43e0fc0.7e21584"]]},{"id":"51ffa743.27a62","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":496.33863830566406,"y":578.3386459350586,"z":"83d5bebc.b2e04","wires":[]},{"id":"ab03d1d0.e9037","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-tx-ar' value='$mdsal-ar.' />\n","comments":"","x":1279.3864250183105,"y":523.7672936916351,"z":"83d5bebc.b2e04","wires":[]},{"id":"903a3cb1.1c223","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":451.9576606750488,"y":392.6243562698364,"z":"83d5bebc.b2e04","wires":[]},{"id":"6b98a797.ae324","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":930.2433853149414,"y":865.481632232666,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"32ab8eae.09664a","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":464.2433776855469,"y":799.4815540313718,"z":"83d5bebc.b2e04","wires":[]},{"id":"1cda58ea.ace997","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":438.24338150024414,"y":695.4815549850464,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"d2ef8432.b57","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":772.5766868591309,"y":559.4814250469208,"z":"83d5bebc.b2e04","wires":[["2c450f2e.03316"]]},{"id":"2c450f2e.03316","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":952.5766372680664,"y":560.1479756832123,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"c5f2e7f7.67fa4","type":"set","name":"set id","xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />","comments":"","x":421.24342346191406,"y":615.1481666564941,"z":"83d5bebc.b2e04","wires":[]},{"id":"43e0fc0.7e21584","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2224.5997276306152,"y":554.0000190734863,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"481ae8b1.0c6d8","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":521.0000152587891,"y":880.0000247955322,"z":"83d5bebc.b2e04","wires":[["9bc349d7.413588","83c14202.0049f8","ece1582d.455d9"]]},{"id":"abfc59fc.fb60e","type":"set","name":"clear tx-ar-assignments","xml":"<set>\n<parameter name='tx-ar-assignments.' value=\"\" />\n\n\n\n","comments":"","x":465,"y":766,"z":"83d5bebc.b2e04","wires":[]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.json
index 90740e70..d1895cf0 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.json
@@ -1 +1 @@
-[{"id":"d0df0900.4fcd5","type":"dgstart","name":"DGSTART","outputs":1,"x":133,"y":56,"z":"7c97bedb.1d31f","wires":[["c6ff669a.26cce"]]},{"id":"c6ff669a.26cce","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":229.23807907104492,"y":116.95239067077637,"z":"7c97bedb.1d31f","wires":[["a36cb8ff.96247"]]},{"id":"a36cb8ff.96247","type":"method","name":"tunnelxconn-topology-operation-unassign","xml":"<method rpc='tunnelxconn-topology-operation-unassign' mode='sync'>\n","comments":"","outputs":1,"x":273.15489196777344,"y":156.190447807312,"z":"7c97bedb.1d31f","wires":[["80d4d61f.2e5f5"]]},{"id":"80d4d61f.2e5f5","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":183.47619247436523,"y":295.5237879753113,"z":"7c97bedb.1d31f","wires":[["f43956d6.a61ab","78019473.89211c","56e75d3b.d9027c","399e93b8.1efa3c","87471e8d.32c7a8","b069670d.e3fd9","8def1fff.634bf","763bc49e.756a84"]]},{"id":"78019473.89211c","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":450.0001106262207,"y":965.2145080566406,"z":"7c97bedb.1d31f","wires":[]},{"id":"f43956d6.a61ab","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":478.75402450561523,"y":929.3370542526245,"z":"7c97bedb.1d31f","wires":[]},{"id":"399e93b8.1efa3c","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n","comments":"","x":445.73806381225586,"y":269.33332538604736,"z":"7c97bedb.1d31f","wires":[]},{"id":"56e75d3b.d9027c","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n","comments":"","x":492.9973258972168,"y":235.59259128570557,"z":"7c97bedb.1d31f","wires":[]},{"id":"87471e8d.32c7a8","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":451.9934196472168,"y":305.23152446746826,"z":"7c97bedb.1d31f","wires":[[]]},{"id":"8def1fff.634bf","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":514.5187530517578,"y":466.4594917297363,"z":"7c97bedb.1d31f","wires":[["2879f807.c2d608","c9414c31.18699"]]},{"id":"b069670d.e3fd9","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.tx-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":480.0648536682129,"y":365.0172290802002,"z":"7c97bedb.1d31f","wires":[[]]},{"id":"2879f807.c2d608","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":771.8148918151855,"y":465.26725220680237,"z":"7c97bedb.1d31f","wires":[["f4855ff6.0b3b"]]},{"id":"14a648.1d9f09b9","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":792.837329864502,"y":872.432332418859,"z":"7c97bedb.1d31f","wires":[["c4ba90bf.2de4a"]]},{"id":"d473f1de.148fe8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":783.8373794555664,"y":840.9323581680655,"z":"7c97bedb.1d31f","wires":[["c4ba90bf.2de4a"]]},{"id":"a8e7182f.312998","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":787.5874176025391,"y":811.2894630432129,"z":"7c97bedb.1d31f","wires":[["4057dc1e.4aac64"]]},{"id":"c4ba90bf.2de4a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n","comments":"","x":953.5874176025391,"y":841.6823820099235,"z":"7c97bedb.1d31f","wires":[]},{"id":"f4855ff6.0b3b","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":952.8148460388184,"y":465.7672016620636,"z":"7c97bedb.1d31f","wires":[["cffd4ec6.6adda","db8e227c.028b78"]]},{"id":"cffd4ec6.6adda","type":"switchNode","name":"switch sz length","xml":"<switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1198.6720924377441,"y":500.052964925766,"z":"7c97bedb.1d31f","wires":[["5cecfc03.3b3404"]]},{"id":"5cecfc03.3b3404","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1389.6720962524414,"y":500.0529625415802,"z":"7c97bedb.1d31f","wires":[["51b6d859.ea7e28"]]},{"id":"a96ddd82.3a31d","type":"set","name":"set sz-ar from get","xml":"<set>\n<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />\n","comments":"","x":1789.5292320251465,"y":500.62438678741455,"z":"7c97bedb.1d31f","wires":[]},{"id":"51b6d859.ea7e28","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1560.5290794372559,"y":500.6244316101074,"z":"7c97bedb.1d31f","wires":[["a96ddd82.3a31d","ec99f86c.00d618","23d29c1b.fb536c"]]},{"id":"ec99f86c.00d618","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1787.5294761657715,"y":568.0529508590698,"z":"7c97bedb.1d31f","wires":[]},{"id":"6c17e931.0e29b","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":539.8148155212402,"y":429.7671926021576,"z":"7c97bedb.1d31f","wires":[]},{"id":"23d29c1b.fb536c","type":"switchNode","name":"switch order-status","xml":"<switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1797.52925491333,"y":533.6243848800659,"z":"7c97bedb.1d31f","wires":[["5f932a1c.5e9fdc","72c9269a.8f042"]]},{"id":"5f932a1c.5e9fdc","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2009.1292114257812,"y":494.6243848800659,"z":"7c97bedb.1d31f","wires":[["44c6766b.392c3"]]},{"id":"72c9269a.8f042","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2034.8435859680176,"y":530.052975654602,"z":"7c97bedb.1d31f","wires":[["44c6766b.392c3"]]},{"id":"db8e227c.028b78","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-sz-ar' value='$mdsal-ar.' />\n","comments":"","x":1278.3864250183105,"y":465.76729369163513,"z":"7c97bedb.1d31f","wires":[]},{"id":"547d4cb2.bc5df4","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":450.9576606750488,"y":334.6243562698364,"z":"7c97bedb.1d31f","wires":[]},{"id":"4057dc1e.4aac64","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":929.2433853149414,"y":807.481632232666,"z":"7c97bedb.1d31f","wires":[[]]},{"id":"c9414c31.18699","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":771.5766868591309,"y":501.4814250469208,"z":"7c97bedb.1d31f","wires":[["98283d92.bd116"]]},{"id":"98283d92.bd116","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":951.5766372680664,"y":502.1479756832123,"z":"7c97bedb.1d31f","wires":[[]]},{"id":"44c6766b.392c3","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2223.5997276306152,"y":496.0000190734863,"z":"7c97bedb.1d31f","wires":[[]]},{"id":"763bc49e.756a84","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":516.0000610351562,"y":824.0000267028809,"z":"7c97bedb.1d31f","wires":[["a8e7182f.312998","d473f1de.148fe8","14a648.1d9f09b9"]]}]
\ No newline at end of file
+[{"id":"d0df0900.4fcd5","type":"dgstart","name":"DGSTART","outputs":1,"x":133,"y":56,"z":"7c97bedb.1d31f","wires":[["c6ff669a.26cce"]]},{"id":"c6ff669a.26cce","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":229.23807907104492,"y":116.95239067077637,"z":"7c97bedb.1d31f","wires":[["a36cb8ff.96247"]]},{"id":"a36cb8ff.96247","type":"method","name":"tunnelxconn-topology-operation-unassign","xml":"<method rpc='tunnelxconn-topology-operation-unassign' mode='sync'>\n","comments":"","outputs":1,"x":273.15489196777344,"y":156.190447807312,"z":"7c97bedb.1d31f","wires":[["80d4d61f.2e5f5"]]},{"id":"80d4d61f.2e5f5","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":183.47619247436523,"y":295.5237879753113,"z":"7c97bedb.1d31f","wires":[["f43956d6.a61ab","78019473.89211c","56e75d3b.d9027c","399e93b8.1efa3c","87471e8d.32c7a8","b069670d.e3fd9","8def1fff.634bf","763bc49e.756a84"]]},{"id":"78019473.89211c","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":450.0001106262207,"y":965.2145080566406,"z":"7c97bedb.1d31f","wires":[]},{"id":"f43956d6.a61ab","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":478.75402450561523,"y":929.3370542526245,"z":"7c97bedb.1d31f","wires":[]},{"id":"399e93b8.1efa3c","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n","comments":"","x":445.73806381225586,"y":269.33332538604736,"z":"7c97bedb.1d31f","wires":[]},{"id":"56e75d3b.d9027c","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n","comments":"","x":492.9973258972168,"y":235.59259128570557,"z":"7c97bedb.1d31f","wires":[]},{"id":"87471e8d.32c7a8","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":451.9934196472168,"y":305.23152446746826,"z":"7c97bedb.1d31f","wires":[[]]},{"id":"8def1fff.634bf","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":514.5187530517578,"y":466.4594917297363,"z":"7c97bedb.1d31f","wires":[["2879f807.c2d608","c9414c31.18699"]]},{"id":"b069670d.e3fd9","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.tx-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":480.0648536682129,"y":365.0172290802002,"z":"7c97bedb.1d31f","wires":[[]]},{"id":"2879f807.c2d608","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":771.8148918151855,"y":465.26725220680237,"z":"7c97bedb.1d31f","wires":[["f4855ff6.0b3b"]]},{"id":"14a648.1d9f09b9","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":792.837329864502,"y":872.432332418859,"z":"7c97bedb.1d31f","wires":[["c4ba90bf.2de4a"]]},{"id":"d473f1de.148fe8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":783.8373794555664,"y":840.9323581680655,"z":"7c97bedb.1d31f","wires":[["c4ba90bf.2de4a"]]},{"id":"a8e7182f.312998","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":787.5874176025391,"y":811.2894630432129,"z":"7c97bedb.1d31f","wires":[["4057dc1e.4aac64"]]},{"id":"c4ba90bf.2de4a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n","comments":"","x":953.5874176025391,"y":841.6823820099235,"z":"7c97bedb.1d31f","wires":[]},{"id":"f4855ff6.0b3b","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":952.8148460388184,"y":465.7672016620636,"z":"7c97bedb.1d31f","wires":[["cffd4ec6.6adda","db8e227c.028b78"]]},{"id":"cffd4ec6.6adda","type":"switchNode","name":"switch tx length","xml":"<switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1198.6720924377441,"y":500.052964925766,"z":"7c97bedb.1d31f","wires":[["5cecfc03.3b3404"]]},{"id":"5cecfc03.3b3404","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1389.6720962524414,"y":500.0529625415802,"z":"7c97bedb.1d31f","wires":[["51b6d859.ea7e28"]]},{"id":"a96ddd82.3a31d","type":"set","name":"set tx-ar from get","xml":"<set>\n<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />\n","comments":"","x":1789.5292320251465,"y":500.62438678741455,"z":"7c97bedb.1d31f","wires":[]},{"id":"51b6d859.ea7e28","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1560.5290794372559,"y":500.6244316101074,"z":"7c97bedb.1d31f","wires":[["a96ddd82.3a31d","ec99f86c.00d618","23d29c1b.fb536c"]]},{"id":"ec99f86c.00d618","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1787.5294761657715,"y":568.0529508590698,"z":"7c97bedb.1d31f","wires":[]},{"id":"6c17e931.0e29b","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":539.8148155212402,"y":429.7671926021576,"z":"7c97bedb.1d31f","wires":[]},{"id":"23d29c1b.fb536c","type":"switchNode","name":"switch order-status","xml":"<switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1797.52925491333,"y":533.6243848800659,"z":"7c97bedb.1d31f","wires":[["5f932a1c.5e9fdc","72c9269a.8f042"]]},{"id":"5f932a1c.5e9fdc","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2009.1292114257812,"y":494.6243848800659,"z":"7c97bedb.1d31f","wires":[["44c6766b.392c3"]]},{"id":"72c9269a.8f042","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2034.8435859680176,"y":530.052975654602,"z":"7c97bedb.1d31f","wires":[["44c6766b.392c3"]]},{"id":"db8e227c.028b78","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-tx-ar' value='$mdsal-ar.' />\n","comments":"","x":1278.3864250183105,"y":465.76729369163513,"z":"7c97bedb.1d31f","wires":[]},{"id":"547d4cb2.bc5df4","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":450.9576606750488,"y":334.6243562698364,"z":"7c97bedb.1d31f","wires":[]},{"id":"4057dc1e.4aac64","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":929.2433853149414,"y":807.481632232666,"z":"7c97bedb.1d31f","wires":[[]]},{"id":"c9414c31.18699","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":771.5766868591309,"y":501.4814250469208,"z":"7c97bedb.1d31f","wires":[["98283d92.bd116"]]},{"id":"98283d92.bd116","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":951.5766372680664,"y":502.1479756832123,"z":"7c97bedb.1d31f","wires":[[]]},{"id":"44c6766b.392c3","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2223.5997276306152,"y":496.0000190734863,"z":"7c97bedb.1d31f","wires":[[]]},{"id":"763bc49e.756a84","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":516.0000610351562,"y":824.0000267028809,"z":"7c97bedb.1d31f","wires":[["a8e7182f.312998","d473f1de.148fe8","14a648.1d9f09b9"]]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-brg-input.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-brg-input.json
index 682d23bf..e9a0fa65 100755..100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-brg-input.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-brg-input.json
@@ -1 +1 @@
-[{"id":"d8f6b3bb.4c275","type":"dgstart","name":"DGSTART","outputs":1,"x":235.55557250976562,"y":315.5555419921875,"z":"893326ee.bae438","wires":[["a018c9a4.117f98"]]},{"id":"a018c9a4.117f98","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":391.8412780761719,"y":389.7936553955078,"z":"893326ee.bae438","wires":[["3f03d10e.2ffb5e"]]},{"id":"3f03d10e.2ffb5e","type":"method","name":"validate-brg-input","xml":"<method rpc='validate-brg-input' mode='sync'>\n","comments":"","outputs":1,"x":391.9841842651367,"y":453.22223949432373,"z":"893326ee.bae438","wires":[["b2b60df0.c53fb"]]},{"id":"b2b60df0.c53fb","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":405.3056182861328,"y":733.9990367889404,"z":"893326ee.bae438","wires":[["e18f70ed.64e6e","c55d0b64.80ebf8","798d06aa.649188","9a6b6b65.fb46e8","e80fb296.5b5af","36ba5c7b.d8e654"]]},{"id":"e18f70ed.64e6e","type":"switchNode","name":"switch svc-request-id","xml":"<switch test='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`'>\n","comments":"","outputs":1,"x":740.3651428222656,"y":218.65082263946533,"z":"893326ee.bae438","wires":[["991652a9.25d26"]]},{"id":"991652a9.25d26","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":970.0794279915945,"y":216.65081936972456,"z":"893326ee.bae438","wires":[["aa2be7a3.2f0818"]]},{"id":"aa2be7a3.2f0818","type":"returnFailure","name":"return failure","xml":"<return 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":1121.5079345703125,"y":213.31748580932617,"z":"893326ee.bae438","wires":[]},{"id":"c55d0b64.80ebf8","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$brg-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":732.9364929199219,"y":172.22222137451172,"z":"893326ee.bae438","wires":[["86d6351c.c6dd08"]]},{"id":"86d6351c.c6dd08","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":968.6508483886719,"y":173.79364490509033,"z":"893326ee.bae438","wires":[["b2821e24.be3db"]]},{"id":"b2821e24.be3db","type":"returnFailure","name":"return failure","xml":"<return 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":1118.650821685791,"y":173.7936544418335,"z":"893326ee.bae438","wires":[]},{"id":"798d06aa.649188","type":"switchNode","name":"switch request-action","xml":"<switch test='`$brg-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":742.9365386962891,"y":267.5079708099365,"z":"893326ee.bae438","wires":[["cbf1edf6.578e5","3a2f6108.3a98ce","d7c95278.f68aa","c59cbe0b.ae17b"]]},{"id":"cbf1edf6.578e5","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":977.9841423034668,"y":331.3651924133301,"z":"893326ee.bae438","wires":[["7c061461.ed6d7c"]]},{"id":"7c061461.ed6d7c","type":"returnFailure","name":"return failure","xml":"<return 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":1149.412582397461,"y":331.36519145965576,"z":"893326ee.bae438","wires":[]},{"id":"4bfff6bd.144358","type":"comment","name":"validate-brg-input - CHANGELOG","info":"3/22: Initial release 1.0.0","comments":"","x":248.55557250976562,"y":219.5555419921875,"z":"893326ee.bae438","wires":[]},{"id":"9a6b6b65.fb46e8","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$brg-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":645.2222328186035,"y":739.5555782318115,"z":"893326ee.bae438","wires":[["f61c14ca.d17008","c832b3ea.1cb26","ce191e6f.c63c","83dfb84.6c9ec48","f0422740.d800b8","f1ddac97.f2155"]]},{"id":"f61c14ca.d17008","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":906.2699356079102,"y":575.1270084381104,"z":"893326ee.bae438","wires":[["7ceecd60.009724"]]},{"id":"c832b3ea.1cb26","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":926.5555419921875,"y":762.5555725097656,"z":"893326ee.bae438","wires":[["72bc9a53.a4a1c4"]]},{"id":"ce191e6f.c63c","type":"other","name":"deactivate","xml":"<outcome value='deactivate'>","comments":"","outputs":1,"x":933.5555419921875,"y":852.5555725097656,"z":"893326ee.bae438","wires":[["ed55d557.297dd8"]]},{"id":"7ceecd60.009724","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1063.5555725097656,"y":577.8889179229736,"z":"893326ee.bae438","wires":[["ba167228.b3ffe"]]},{"id":"ba167228.b3ffe","type":"switchNode","name":"switch request-action","xml":"<switch test='`$brg-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":1271.8889541625977,"y":577.8889236450195,"z":"893326ee.bae438","wires":[["e9519759.0bd708","b5904d01.67034"]]},{"id":"e9519759.0bd708","type":"other","name":"CreateSecurityZoneInstance","xml":"<outcome value='CreateSecurityZoneInstance'>","comments":"","outputs":1,"x":1618.0793151855469,"y":505.0317816734314,"z":"893326ee.bae438","wires":[["ec0a16a2.d398b8"]]},{"id":"b5904d01.67034","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1557.5555534362793,"y":571.8889350891113,"z":"893326ee.bae438","wires":[["6ff9efab.1acb8"]]},{"id":"6ff9efab.1acb8","type":"returnFailure","name":"return failure","xml":"<return 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 to be CreateSecurityZoneInstance for svc-action=assign\" />\n","comments":"","x":1704.8888969421387,"y":573.5556974411011,"z":"893326ee.bae438","wires":[]},{"id":"72bc9a53.a4a1c4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1100.5555419921875,"y":762.5555725097656,"z":"893326ee.bae438","wires":[["f8cd13e2.ec99a"]]},{"id":"f8cd13e2.ec99a","type":"switchNode","name":"switch request-action","xml":"<switch test='`$brg-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":1317.5555419921875,"y":762.5555725097656,"z":"893326ee.bae438","wires":[["29c24ed5.8c97a2","12034d41.71a063"]]},{"id":"29c24ed5.8c97a2","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1541.5555419921875,"y":803.5555725097656,"z":"893326ee.bae438","wires":[["c4fec971.125ad8"]]},{"id":"c4fec971.125ad8","type":"returnFailure","name":"return failure","xml":"<return 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 to be CreateSecurityZoneInstance for svc-action=activate\" />\n","comments":"","x":1710.5555419921875,"y":803.5555725097656,"z":"893326ee.bae438","wires":[]},{"id":"ed55d557.297dd8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1115.5555419921875,"y":851.5555725097656,"z":"893326ee.bae438","wires":[["55f7035.720defc"]]},{"id":"55f7035.720defc","type":"switchNode","name":"switch request-action","xml":"<switch test='`$brg-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":1332.5555419921875,"y":851.5555725097656,"z":"893326ee.bae438","wires":[["94748701.276ad8","94eb145d.dbec38"]]},{"id":"94748701.276ad8","type":"other","name":"DeleteSecurityZoneInstance","xml":"<outcome value='DeleteSecurityZoneInstance'>","comments":"","outputs":1,"x":1615.2220764160156,"y":850.8889589309692,"z":"893326ee.bae438","wires":[["3e9b45b4.1ff76a"]]},{"id":"94eb145d.dbec38","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1556.5555419921875,"y":892.5555725097656,"z":"893326ee.bae438","wires":[["610782ce.0e012c"]]},{"id":"610782ce.0e012c","type":"returnFailure","name":"return failure","xml":"<return 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 to be DeleteSecurityZoneInstance for svc-action=deactivate\" />\n","comments":"","x":1725.5555419921875,"y":892.5555725097656,"z":"893326ee.bae438","wires":[]},{"id":"83dfb84.6c9ec48","type":"other","name":"unassign","xml":"<outcome value='unassign'>","comments":"","outputs":1,"x":914.5554046630859,"y":1019.8888998031616,"z":"893326ee.bae438","wires":[["97760e1d.874c1"]]},{"id":"97760e1d.874c1","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1096.555435180664,"y":1015.8889226913452,"z":"893326ee.bae438","wires":[["d856938c.c7fcd"]]},{"id":"d856938c.c7fcd","type":"switchNode","name":"switch request-action","xml":"<switch test='`$brg-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":1313.555435180664,"y":1015.8889226913452,"z":"893326ee.bae438","wires":[["8ba8ac96.939ac","ac3bb1cc.3a778"]]},{"id":"8ba8ac96.939ac","type":"other","name":"DeleteSecurityZoneInstance","xml":"<outcome value='DeleteSecurityZoneInstance'>","comments":"","outputs":1,"x":1594.555305480957,"y":1016.8889398574829,"z":"893326ee.bae438","wires":[["1b3b1eab.cd8bc1"]]},{"id":"ac3bb1cc.3a778","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1537.555435180664,"y":1056.8889226913452,"z":"893326ee.bae438","wires":[["cefb5d61.5cfae"]]},{"id":"cefb5d61.5cfae","type":"returnFailure","name":"return failure","xml":"<return 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 to be DeleteSecurityZoneInstance for svc-action=unassign\" />\n","comments":"","x":1708.2221603393555,"y":1063.5555746555328,"z":"893326ee.bae438","wires":[]},{"id":"ec0a16a2.d398b8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1864.0793266296387,"y":504.0317687988281,"z":"893326ee.bae438","wires":[["8020e36.a7e482","6c805fc8.58afb","a182697b.c45e68","c43eb58f.69d438","474a1931.cb3468","fb13eb4d.718288","beb405ab.4654d8","9bbcec2b.09769"]]},{"id":"619f5f72.2ac62","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1823.5555419921875,"y":763.5555725097656,"z":"893326ee.bae438","wires":[["c43eb58f.69d438","fb13eb4d.718288"]]},{"id":"3e9b45b4.1ff76a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1869.5555419921875,"y":853.5555725097656,"z":"893326ee.bae438","wires":[["c43eb58f.69d438","fb13eb4d.718288"]]},{"id":"1b3b1eab.cd8bc1","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1853.555435180664,"y":1017.8889226913452,"z":"893326ee.bae438","wires":[["c43eb58f.69d438"]]},{"id":"8020e36.a7e482","type":"switchNode","name":"switch vlan-tag","xml":"<switch test='`$brg-topology-operation-input.brg-request-input.vlan-tag`'>\n","comments":"","outputs":1,"x":2200.174575805664,"y":377.60317516326904,"z":"893326ee.bae438","wires":[["219b4575.07624a"]]},{"id":"219b4575.07624a","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2366.1744232177734,"y":377.4127187728882,"z":"893326ee.bae438","wires":[["8270f4ae.45f928"]]},{"id":"8270f4ae.45f928","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"brg-topology-operation-input.brg-request-input.vlan-tag is a required input\" />\n","comments":"","x":2522.365135192871,"y":377.41267108917236,"z":"893326ee.bae438","wires":[]},{"id":"a182697b.c45e68","type":"switchNode","name":"switch onap-model-information.model-customization-uuid","xml":"<switch test='`$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`'>\n","comments":"","outputs":1,"x":2334.4129180908203,"y":300.5556230545044,"z":"893326ee.bae438","wires":[["d0a4dd20.c4866"]]},{"id":"d0a4dd20.c4866","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2628.412826538086,"y":301.5555639266968,"z":"893326ee.bae438","wires":[["c36cc0f.8c7124"]]},{"id":"c36cc0f.8c7124","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"brg-information.onap-model-information.model-customization-uuid is a required input\" />\n","comments":"","x":2775.841293334961,"y":301.5555639266968,"z":"893326ee.bae438","wires":[]},{"id":"e80fb296.5b5af","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":671.9126892089844,"y":1161.0555114746094,"z":"893326ee.bae438","wires":[]},{"id":"6c805fc8.58afb","type":"get-resource","name":"get-resource AR_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $brg-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid'\n  pfx='ar-model'>\n\n","comments":"","outputs":1,"x":2236.6076889038086,"y":522.0873641967773,"z":"893326ee.bae438","wires":[["dea250d4.a547c","a0f786da.b959f8"]]},{"id":"d0b05c60.619cc","type":"returnFailure","name":"return failure","xml":"<return 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 alloted resource model found for model customization UUID ' + $brg-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`\" />\n","comments":"","x":2693.690872192383,"y":502.75396156311035,"z":"893326ee.bae438","wires":[]},{"id":"dea250d4.a547c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2494.9409523010254,"y":498.111177444458,"z":"893326ee.bae438","wires":[["d0b05c60.619cc"]]},{"id":"a0f786da.b959f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2488.6909523010254,"y":530.611177444458,"z":"893326ee.bae438","wires":[["d0b05c60.619cc"]]},{"id":"3a2f6108.3a98ce","type":"other","name":"CreateSecurityZoneInstance","xml":"<outcome value='CreateSecurityZoneInstance'>","comments":"","outputs":1,"x":1038.6032104492188,"y":253.17459869384766,"z":"893326ee.bae438","wires":[["93d6c176.7fe5a"]]},{"id":"d7c95278.f68aa","type":"other","name":"DeleteSecurityZoneInstance","xml":"<outcome value='DeleteSecurityZoneInstance'>","comments":"","outputs":1,"x":1038.8888549804688,"y":290.6032180786133,"z":"893326ee.bae438","wires":[["93d6c176.7fe5a"]]},{"id":"c59cbe0b.ae17b","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":981.7936515808105,"y":371.74609756469727,"z":"893326ee.bae438","wires":[["bef0c21f.d802e"]]},{"id":"bef0c21f.d802e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Invalid request-information.request-action \" />\n","comments":"","x":1153.2220573425293,"y":372.7461128234863,"z":"893326ee.bae438","wires":[]},{"id":"36ba5c7b.d8e654","type":"switchNode","name":"switch service-instance-id","xml":"<switch test='`$brg-topology-operation-input.service-information.service-instance-id`'>\n","comments":"","outputs":1,"x":739.984130859375,"y":447.41273498535156,"z":"893326ee.bae438","wires":[["d53e7631.c0fea8"]]},{"id":"d53e7631.c0fea8","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":956.4127197265625,"y":448.41273498535156,"z":"893326ee.bae438","wires":[["2579090b.0e1e76"]]},{"id":"2579090b.0e1e76","type":"returnFailure","name":"return failure","xml":"<return 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":1114.8412475585938,"y":447.41273498535156,"z":"893326ee.bae438","wires":[]},{"id":"f0422740.d800b8","type":"other","name":"create","xml":"<outcome value='create'>","comments":"","outputs":1,"x":913.3332862854004,"y":660.4629507064819,"z":"893326ee.bae438","wires":[["46b3f2f8.0ea61c"]]},{"id":"46b3f2f8.0ea61c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1073.9522857666016,"y":659.8915205001831,"z":"893326ee.bae438","wires":[["52a155fb.f8541c"]]},{"id":"52a155fb.f8541c","type":"switchNode","name":"switch request-action","xml":"<switch test='`$brg-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":1293.9522857666016,"y":659.8915205001831,"z":"893326ee.bae438","wires":[["533f0552.201dac","7340b4fd.0ee38c"]]},{"id":"533f0552.201dac","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1551.285779953003,"y":663.8915729522705,"z":"893326ee.bae438","wires":[["47df574e.a59c98"]]},{"id":"47df574e.a59c98","type":"returnFailure","name":"return failure","xml":"<return 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 to be CreateSecurityZoneInstance for svc-action=create\" />\n","comments":"","x":1716.9522857666016,"y":663.8915405273438,"z":"893326ee.bae438","wires":[]},{"id":"7340b4fd.0ee38c","type":"other","name":"CreateSecurityZoneInstance","xml":"<outcome value='CreateSecurityZoneInstance'>","comments":"","outputs":1,"x":1623.3332061767578,"y":628.7962646484375,"z":"893326ee.bae438","wires":[["e6d64f7d.65b1e"]]},{"id":"e6d64f7d.65b1e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1859.3332061767578,"y":627.7962646484375,"z":"893326ee.bae438","wires":[["c43eb58f.69d438","fb13eb4d.718288"]]},{"id":"12034d41.71a063","type":"other","name":"CreateSecurityZoneInstance","xml":"<outcome value='CreateSecurityZoneInstance'>","comments":"","outputs":1,"x":1608.3332595825195,"y":762.1296367645264,"z":"893326ee.bae438","wires":[["619f5f72.2ac62"]]},{"id":"f1ddac97.f2155","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":926.6666564941406,"y":937.1295366287231,"z":"893326ee.bae438","wires":[["d42c764.9db5b88"]]},{"id":"d42c764.9db5b88","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1108.6666870117188,"y":933.1295595169067,"z":"893326ee.bae438","wires":[["9fad38e8.eba248"]]},{"id":"9fad38e8.eba248","type":"switchNode","name":"switch request-action","xml":"<switch test='`$brg-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":1325.6666870117188,"y":933.1295595169067,"z":"893326ee.bae438","wires":[["3f661399.88316c","fb7e534f.3179a"]]},{"id":"3f661399.88316c","type":"other","name":"DeleteSecurityZoneInstance","xml":"<outcome value='DeleteSecurityZoneInstance'>","comments":"","outputs":1,"x":1606.6665573120117,"y":934.1295766830444,"z":"893326ee.bae438","wires":[["18534a5c.e61196"]]},{"id":"fb7e534f.3179a","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1549.6666870117188,"y":974.1295595169067,"z":"893326ee.bae438","wires":[["c5006813.200e48"]]},{"id":"c5006813.200e48","type":"returnFailure","name":"return failure","xml":"<return 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 to be DeleteSecurityZoneInstance for svc-action=delete\" />\n","comments":"","x":1718.6666870117188,"y":974.1295595169067,"z":"893326ee.bae438","wires":[]},{"id":"18534a5c.e61196","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1865.6666870117188,"y":935.1295595169067,"z":"893326ee.bae438","wires":[["c43eb58f.69d438","fb13eb4d.718288"]]},{"id":"93d6c176.7fe5a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1254.9999656677246,"y":284.499981880188,"z":"893326ee.bae438","wires":[[]]},{"id":"c43eb58f.69d438","type":"switchNode","name":"switch allotted-resource-id","xml":"<switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n","comments":"","outputs":1,"x":2236.349380493164,"y":148.09522247314453,"z":"893326ee.bae438","wires":[["95717a57.0e1fc8"]]},{"id":"95717a57.0e1fc8","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2436.8850631713867,"y":146.66665077209473,"z":"893326ee.bae438","wires":[["7ad0865a.9d5808"]]},{"id":"7ad0865a.9d5808","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"allotted-resource-information.allotted-resource-id is a required input\" />\n","comments":"","x":2588.3135299682617,"y":145.66665077209473,"z":"893326ee.bae438","wires":[]},{"id":"474a1931.cb3468","type":"switchNode","name":"switch allotted-resource-type","xml":"<switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type`'>\n","comments":"","outputs":1,"x":2242.7779235839844,"y":183.29363822937012,"z":"893326ee.bae438","wires":[["78aa6b52.fbc154"]]},{"id":"78aa6b52.fbc154","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2443.3134689331055,"y":181.86506843566895,"z":"893326ee.bae438","wires":[["d2e8d08f.df20e"]]},{"id":"d2e8d08f.df20e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"allotted-resource-information.allotted-resource-type is a required input\" />\n","comments":"","x":2594.7419357299805,"y":180.86506843566895,"z":"893326ee.bae438","wires":[]},{"id":"fb13eb4d.718288","type":"switchNode","name":"switch parent-service-instance-id","xml":"<switch test='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`'>\n","comments":"","outputs":1,"x":2255.63516998291,"y":219.0079231262207,"z":"893326ee.bae438","wires":[["dec9289b.c35878"]]},{"id":"dec9289b.c35878","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2471.349319458008,"y":216.1507797241211,"z":"893326ee.bae438","wires":[["45bd6332.b157fc"]]},{"id":"45bd6332.b157fc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"allotted-resource-information.parent-service-instance-id is a required input\" />\n","comments":"","x":2622.777786254883,"y":215.1507797241211,"z":"893326ee.bae438","wires":[]},{"id":"beb405ab.4654d8","type":"switchNode","name":"switch trusted-network-role","xml":"<switch test='`$brg-topology-operation-input.brg-request-input.trusted-network-role`'>\n","comments":"","outputs":1,"x":2231.984031677246,"y":412.1983833312988,"z":"893326ee.bae438","wires":[["20e7c9ab.48a486"]]},{"id":"20e7c9ab.48a486","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2494.174690246582,"y":408.5793528556824,"z":"893326ee.bae438","wires":[["a43fc0ee.20e45"]]},{"id":"a43fc0ee.20e45","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"brg-topology-operation-input.brg-request-input.trusted-network-role is a required input\" />\n","comments":"","x":2659.174835205078,"y":408.57931327819824,"z":"893326ee.bae438","wires":[]},{"id":"9bbcec2b.09769","type":"switchNode","name":"switch untrusted-network-role","xml":"<switch test='`$brg-topology-operation-input.brg-request-input.untrusted-network-role`'>\n","comments":"","outputs":1,"x":2249.2224464416504,"y":446.74599266052246,"z":"893326ee.bae438","wires":[["d404d9bd.d65288"]]},{"id":"d404d9bd.d65288","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":2494.22261428833,"y":446.7459878921509,"z":"893326ee.bae438","wires":[["a2180ae0.fe41f8"]]},{"id":"a2180ae0.fe41f8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"brg-operation-input.brg-request-input.untrusted-network-role is a required input\" />\n","comments":"","x":2660.651081085205,"y":446.74595737457275,"z":"893326ee.bae438","wires":[]}]
+[{"id":"2df7d5ad.a996d2","type":"dgstart","name":"DGSTART","outputs":1,"x":128,"y":289,"z":"dc39d835.96bdd8","wires":[["32cfd219.1ac396"]]},{"id":"32cfd219.1ac396","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":226.78570556640625,"y":363.23810386657715,"z":"dc39d835.96bdd8","wires":[["b7a659a2.b86cd"]]},{"id":"b7a659a2.b86cd","type":"method","name":"validate-brg-input","xml":"<method rpc='validate-brg-input' mode='sync'>\n","comments":"","outputs":1,"x":255.67861938476562,"y":434.16669368743896,"z":"dc39d835.96bdd8","wires":[["41e552e1.a4407c"]]},{"id":"41e552e1.a4407c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":297.7500457763672,"y":707.4434947967529,"z":"dc39d835.96bdd8","wires":[["d73d8f31.4e4d78","39929335.256ed4","eb58928.4059af","ae7d7c34.52484","86acd43a.96ddb"]]},{"id":"d73d8f31.4e4d78","type":"switchNode","name":"switch svc-request-id","xml":"<switch test='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`'>\n","comments":"","outputs":1,"x":632.8095703125,"y":192.09528064727783,"z":"dc39d835.96bdd8","wires":[["28205195.f4b4c6"]]},{"id":"28205195.f4b4c6","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":862.5238554818288,"y":190.09527737753706,"z":"dc39d835.96bdd8","wires":[["3fbfa39d.851dc4"]]},{"id":"3fbfa39d.851dc4","type":"returnFailure","name":"return failure","xml":"<return 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":1013.9523620605469,"y":186.76194381713867,"z":"dc39d835.96bdd8","wires":[]},{"id":"39929335.256ed4","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$brg-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":625.3809204101562,"y":145.66667938232422,"z":"dc39d835.96bdd8","wires":[["24ca7000.682678"]]},{"id":"24ca7000.682678","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":861.0952758789062,"y":147.23810291290283,"z":"dc39d835.96bdd8","wires":[["8817c69.4b47638"]]},{"id":"8817c69.4b47638","type":"returnFailure","name":"return failure","xml":"<return 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":1011.0952491760254,"y":147.238112449646,"z":"dc39d835.96bdd8","wires":[]},{"id":"509b53b0.695fbc","type":"comment","name":"validate-brg-input - CHANGELOG","info":"3/22: Initial release 1.0.0","comments":"","x":141,"y":193,"z":"dc39d835.96bdd8","wires":[]},{"id":"eb58928.4059af","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$brg-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":537.6666603088379,"y":713.000036239624,"z":"dc39d835.96bdd8","wires":[["e59d6c66.24b1b8","743a49ba.f7959","7c03ca36.9c9e7c","e4d4185e.a7fa78","2eee7744.0f8348","99d1f53c.f197a"]]},{"id":"e59d6c66.24b1b8","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":798.7143630981445,"y":548.5714664459229,"z":"dc39d835.96bdd8","wires":[["4b627a3b.c4181c"]]},{"id":"743a49ba.f7959","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":818.9999694824219,"y":736.0000305175781,"z":"dc39d835.96bdd8","wires":[["9f7226f9.0b254"]]},{"id":"7c03ca36.9c9e7c","type":"other","name":"deactivate","xml":"<outcome value='deactivate'>","comments":"","outputs":1,"x":825.9999694824219,"y":826.0000305175781,"z":"dc39d835.96bdd8","wires":[["166b6da8.0cb58a"]]},{"id":"e4d4185e.a7fa78","type":"other","name":"unassign","xml":"<outcome value='unassign'>","comments":"","outputs":1,"x":806.9998321533203,"y":993.3333578109741,"z":"dc39d835.96bdd8","wires":[["d9c03934.4c2d6"]]},{"id":"4b627a3b.c4181c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":997.0238189697266,"y":546.7262649536133,"z":"dc39d835.96bdd8","wires":[["d5de95e6.1f17b8","6025b5b8.e34324","e6c0544b.85286","722bdd7c.a195dc","3ea57e4c.be66ca","71ef08e1.c1af6","da6889a0.cd6af","4f44743a.883524"]]},{"id":"9f7226f9.0b254","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":997.2500152587891,"y":735.750072479248,"z":"dc39d835.96bdd8","wires":[["722bdd7c.a195dc","71ef08e1.c1af6"]]},{"id":"166b6da8.0cb58a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":998.2500305175781,"y":827.0000743865967,"z":"dc39d835.96bdd8","wires":[["722bdd7c.a195dc","71ef08e1.c1af6"]]},{"id":"d9c03934.4c2d6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":995.9998931884766,"y":993.8333883285522,"z":"dc39d835.96bdd8","wires":[["722bdd7c.a195dc"]]},{"id":"d5de95e6.1f17b8","type":"switchNode","name":"switch vgmux-bearer-ip","xml":"<switch test='`$brg-topology-operation-input.brg-request-input.vgmux-bearer-ip`'>\n","comments":"","outputs":1,"x":1412.1190185546875,"y":512.2976684570312,"z":"dc39d835.96bdd8","wires":[["8b885207.44625"]]},{"id":"8b885207.44625","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1612.118896484375,"y":518.107177734375,"z":"dc39d835.96bdd8","wires":[["6e682d4f.11086c"]]},{"id":"6e682d4f.11086c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"brg-topology-operation-input.brg-request-input.vlan-tag is a required input\" />\n","comments":"","x":1821.3095703125,"y":518.107177734375,"z":"dc39d835.96bdd8","wires":[]},{"id":"e6c0544b.85286","type":"switchNode","name":"switch onap-model-information.model-customization-uuid","xml":"<switch test='`$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`'>\n","comments":"","outputs":1,"x":1518.1073303222656,"y":449.0000972747803,"z":"dc39d835.96bdd8","wires":[["5066256f.f50d44"]]},{"id":"5066256f.f50d44","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1812.1072387695312,"y":450.00003814697266,"z":"dc39d835.96bdd8","wires":[["4548b150.565ed8"]]},{"id":"4548b150.565ed8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"brg-information.onap-model-information.model-customization-uuid is a required input\" />\n","comments":"","x":1959.5357055664062,"y":450.00003814697266,"z":"dc39d835.96bdd8","wires":[]},{"id":"ae7d7c34.52484","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":564.3571166992188,"y":1134.4999694824219,"z":"dc39d835.96bdd8","wires":[]},{"id":"6025b5b8.e34324","type":"get-resource","name":"get-resource AR_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $brg-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid'\n  pfx='ar-model'>\n\n","comments":"","outputs":1,"x":1390.302146911621,"y":669.2818689346313,"z":"dc39d835.96bdd8","wires":[["a9b64f5d.19e888","814fec12.f3e01"]]},{"id":"d71b9ede.b96fd8","type":"returnFailure","name":"return failure","xml":"<return 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 alloted resource model found for model customization UUID ' + $brg-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`\" />\n","comments":"","x":1837.3854637145996,"y":657.4484224319458,"z":"dc39d835.96bdd8","wires":[]},{"id":"a9b64f5d.19e888","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1638.6355438232422,"y":652.8056383132935,"z":"dc39d835.96bdd8","wires":[["d71b9ede.b96fd8"]]},{"id":"814fec12.f3e01","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1632.3855438232422,"y":685.3056383132935,"z":"dc39d835.96bdd8","wires":[["d71b9ede.b96fd8"]]},{"id":"86acd43a.96ddb","type":"switchNode","name":"switch service-instance-id","xml":"<switch test='`$brg-topology-operation-input.service-information.service-instance-id`'>\n","comments":"","outputs":1,"x":632.4285583496094,"y":420.85719299316406,"z":"dc39d835.96bdd8","wires":[["2a109ee3.4321fa"]]},{"id":"2a109ee3.4321fa","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":848.8571472167969,"y":421.85719299316406,"z":"dc39d835.96bdd8","wires":[["bf2f1ed4.8c53c8"]]},{"id":"bf2f1ed4.8c53c8","type":"returnFailure","name":"return failure","xml":"<return 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":1007.2856750488281,"y":420.85719299316406,"z":"dc39d835.96bdd8","wires":[]},{"id":"2eee7744.0f8348","type":"other","name":"create","xml":"<outcome value='create'>","comments":"","outputs":1,"x":805.7777137756348,"y":633.9074087142944,"z":"dc39d835.96bdd8","wires":[["13a4fe65.3387a2"]]},{"id":"13a4fe65.3387a2","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":998.0276031494141,"y":629.9907321929932,"z":"dc39d835.96bdd8","wires":[["722bdd7c.a195dc","71ef08e1.c1af6"]]},{"id":"99d1f53c.f197a","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":819.111083984375,"y":910.5739946365356,"z":"dc39d835.96bdd8","wires":[["551a872e.64e668"]]},{"id":"551a872e.64e668","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":995.6111068725586,"y":908.5740489959717,"z":"dc39d835.96bdd8","wires":[["722bdd7c.a195dc","71ef08e1.c1af6"]]},{"id":"722bdd7c.a195dc","type":"switchNode","name":"switch allotted-resource-id","xml":"<switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n","comments":"","outputs":1,"x":1486.2938537597656,"y":199.03967714309692,"z":"dc39d835.96bdd8","wires":[["73c8a311.3f8c9c"]]},{"id":"73c8a311.3f8c9c","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1689.3296146392822,"y":203.8611183166504,"z":"dc39d835.96bdd8","wires":[["3bbeca15.da2a7e"]]},{"id":"3bbeca15.da2a7e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"allotted-resource-information.allotted-resource-id is a required input\" />\n","comments":"","x":1874.5080833435059,"y":199.1111183166504,"z":"dc39d835.96bdd8","wires":[]},{"id":"3ea57e4c.be66ca","type":"switchNode","name":"switch allotted-resource-type","xml":"<switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type`'>\n","comments":"","outputs":1,"x":1490.2224349975586,"y":267.98810291290283,"z":"dc39d835.96bdd8","wires":[["a5016867.1b5198"]]},{"id":"a5016867.1b5198","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1685.7578468322754,"y":267.80952644348145,"z":"dc39d835.96bdd8","wires":[["4ca97e80.33e418"]]},{"id":"4ca97e80.33e418","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"allotted-resource-information.allotted-resource-type is a required input\" />\n","comments":"","x":1845.9363174438477,"y":266.80952644348145,"z":"dc39d835.96bdd8","wires":[]},{"id":"71ef08e1.c1af6","type":"switchNode","name":"switch parent-service-instance-id","xml":"<switch test='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`'>\n","comments":"","outputs":1,"x":1505.5796127319336,"y":343.7023983001709,"z":"dc39d835.96bdd8","wires":[["1432cd2c.473a5b"]]},{"id":"1432cd2c.473a5b","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1725.0437355041504,"y":343.3452482223511,"z":"dc39d835.96bdd8","wires":[["de884d35.af1d08"]]},{"id":"de884d35.af1d08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"allotted-resource-information.parent-service-instance-id is a required input\" />\n","comments":"","x":1876.4722023010254,"y":342.3452482223511,"z":"dc39d835.96bdd8","wires":[]},{"id":"da6889a0.cd6af","type":"switchNode","name":"switch vni","xml":"<switch test='`$brg-topology-operation-input.brg-request-input.vni`'>\n","comments":"","outputs":1,"x":1371,"y":553,"z":"dc39d835.96bdd8","wires":[["16230ed2.d49239"]]},{"id":"16230ed2.d49239","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1610.9998779296875,"y":561.8095703125,"z":"dc39d835.96bdd8","wires":[["ec4e0461.9f79b"]]},{"id":"ec4e0461.9f79b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"brg-topology-operation-input.brg-request-input.vlan-tag is a required input\" />\n","comments":"","x":1831.1905517578125,"y":559.8095092773438,"z":"dc39d835.96bdd8","wires":[]},{"id":"4f44743a.883524","type":"switchNode","name":"switch brg-wan-ip-address ","xml":"<switch test='`$brg-topology-operation-input.brg-request-input.brg-wan-ip-address `'>\n","comments":"","outputs":1,"x":1419,"y":606,"z":"dc39d835.96bdd8","wires":[["17e8f38e.f05c54"]]},{"id":"17e8f38e.f05c54","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1626.9998779296875,"y":605.8095397949219,"z":"dc39d835.96bdd8","wires":[["3d499d7a.adc12a"]]},{"id":"3d499d7a.adc12a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"brg-topology-operation-input.brg-request-input.vlan-tag is a required input\" />\n","comments":"","x":1842.1905517578125,"y":601.8095092773438,"z":"dc39d835.96bdd8","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-tunnelxconn-input.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-tunnelxconn-input.json
index 725d7345..f4288821 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-tunnelxconn-input.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-tunnelxconn-input.json
@@ -1 +1 @@
-[{"id":"368b0672.1be432","type":"dgstart","name":"DGSTART","outputs":1,"x":149.5,"y":289,"z":"dc39d835.96bdd8","wires":[["69a98a55.0b046c"]]},{"id":"69a98a55.0b046c","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":248.28570556640625,"y":363.23810386657715,"z":"dc39d835.96bdd8","wires":[["7ab244c3.e46244"]]},{"id":"7ab244c3.e46244","type":"method","name":"validate-tunnelxconn-input","xml":"<method rpc='validate-tunnelxconn-input' mode='sync'>\n","comments":"","outputs":1,"x":277.1786193847656,"y":434.16669368743896,"z":"dc39d835.96bdd8","wires":[["283bbfcd.ed6068"]]},{"id":"283bbfcd.ed6068","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":319.2500457763672,"y":707.4434947967529,"z":"dc39d835.96bdd8","wires":[["59bc0290.c7f034","10ce6be9.70a52c","308b15e6.44da62","147b9b93.45a634","38d40f5d.1f7d9"]]},{"id":"59bc0290.c7f034","type":"switchNode","name":"switch svc-request-id","xml":"<switch test='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`'>\n","comments":"","outputs":1,"x":654.3095703125,"y":192.09528064727783,"z":"dc39d835.96bdd8","wires":[["375a6f82.daaf68"]]},{"id":"375a6f82.daaf68","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":884.0238554818288,"y":190.09527737753706,"z":"dc39d835.96bdd8","wires":[["6294362.5d01a48"]]},{"id":"6294362.5d01a48","type":"returnFailure","name":"return failure","xml":"<return 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":1035.4523620605469,"y":186.76194381713867,"z":"dc39d835.96bdd8","wires":[]},{"id":"10ce6be9.70a52c","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":646.8809204101562,"y":145.66667938232422,"z":"dc39d835.96bdd8","wires":[["79f66b28.48c23c"]]},{"id":"79f66b28.48c23c","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":882.5952758789062,"y":147.23810291290283,"z":"dc39d835.96bdd8","wires":[["1afe2bb9.fad974"]]},{"id":"1afe2bb9.fad974","type":"returnFailure","name":"return failure","xml":"<return 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":1032.5952491760254,"y":147.238112449646,"z":"dc39d835.96bdd8","wires":[]},{"id":"45808300.fdad84","type":"comment","name":"validate-tunnelxconn-input - CHANGELOG","info":"3/22: Initial release 1.0.0","comments":"","x":162.5,"y":193,"z":"dc39d835.96bdd8","wires":[]},{"id":"308b15e6.44da62","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":559.1666603088379,"y":713.000036239624,"z":"dc39d835.96bdd8","wires":[["979e6455.cfc31","5ae75bf1.ec81bc","f24f51df.2e9bf8","3cdf8f95.4923c","9dc2e13c.b38008","5b47f09e.898778"]]},{"id":"979e6455.cfc31","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":820.2143630981445,"y":548.5714664459229,"z":"dc39d835.96bdd8","wires":[["b16e483a.17ddc8"]]},{"id":"5ae75bf1.ec81bc","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":840.4999694824219,"y":736.0000305175781,"z":"dc39d835.96bdd8","wires":[["865a4fc7.17712"]]},{"id":"f24f51df.2e9bf8","type":"other","name":"deactivate","xml":"<outcome value='deactivate'>","comments":"","outputs":1,"x":847.4999694824219,"y":826.0000305175781,"z":"dc39d835.96bdd8","wires":[["919509c2.2756a8"]]},{"id":"3cdf8f95.4923c","type":"other","name":"unassign","xml":"<outcome value='unassign'>","comments":"","outputs":1,"x":828.4998321533203,"y":993.3333578109741,"z":"dc39d835.96bdd8","wires":[["2eb26867.63f26"]]},{"id":"b16e483a.17ddc8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1018.5238189697266,"y":546.7262649536133,"z":"dc39d835.96bdd8","wires":[["bdcd3bcd.70d368","ead921b4.5c7498","7bf99760.d366f8","c994f413.2cb5e8","7840e223.6ecc1c","fc66f195.4287e8","234eec8e.262704","19b1d290.d22cfd"]]},{"id":"865a4fc7.17712","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1018.7500152587891,"y":735.750072479248,"z":"dc39d835.96bdd8","wires":[["c994f413.2cb5e8","fc66f195.4287e8"]]},{"id":"919509c2.2756a8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1019.7500305175781,"y":827.0000743865967,"z":"dc39d835.96bdd8","wires":[["c994f413.2cb5e8","fc66f195.4287e8"]]},{"id":"2eb26867.63f26","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1017.4998931884766,"y":993.8333883285522,"z":"dc39d835.96bdd8","wires":[["c994f413.2cb5e8"]]},{"id":"bdcd3bcd.70d368","type":"switchNode","name":"switch vlan-tag","xml":"<switch test='`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.vlan-tag`'>\n","comments":"","outputs":1,"x":1406.619041442871,"y":502.29764556884766,"z":"dc39d835.96bdd8","wires":[["5e3ed0b0.de93f8"]]},{"id":"5e3ed0b0.de93f8","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1572.6188888549805,"y":502.1071891784668,"z":"dc39d835.96bdd8","wires":[["44e462d3.aeea5c"]]},{"id":"44e462d3.aeea5c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"tunnelxconn-topology-operation-input.tunnelxconn-request-input.vlan-tag is a required input\" />\n","comments":"","x":1728.8096008300781,"y":502.107141494751,"z":"dc39d835.96bdd8","wires":[]},{"id":"7bf99760.d366f8","type":"switchNode","name":"switch onap-model-information.model-customization-uuid","xml":"<switch test='`$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`'>\n","comments":"","outputs":1,"x":1539.6073303222656,"y":449.0000972747803,"z":"dc39d835.96bdd8","wires":[["b24c5015.cd06c"]]},{"id":"b24c5015.cd06c","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1833.6072387695312,"y":450.00003814697266,"z":"dc39d835.96bdd8","wires":[["70386862.b62d78"]]},{"id":"70386862.b62d78","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"tunnelxconn-information.onap-model-information.model-customization-uuid is a required input\" />\n","comments":"","x":1981.0357055664062,"y":450.00003814697266,"z":"dc39d835.96bdd8","wires":[]},{"id":"147b9b93.45a634","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":585.8571166992188,"y":1134.4999694824219,"z":"dc39d835.96bdd8","wires":[]},{"id":"ead921b4.5c7498","type":"get-resource","name":"get-resource AR_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid'\n  pfx='ar-model'>\n\n","comments":"","outputs":1,"x":1411.802146911621,"y":669.2818689346313,"z":"dc39d835.96bdd8","wires":[["35bb9a66.d0adf6","d80653.a0abb1b"]]},{"id":"c80461c8.341ca8","type":"returnFailure","name":"return failure","xml":"<return 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 alloted resource model found for model customization UUID ' + $tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`\" />\n","comments":"","x":1858.8854637145996,"y":657.4484224319458,"z":"dc39d835.96bdd8","wires":[]},{"id":"35bb9a66.d0adf6","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1660.1355438232422,"y":652.8056383132935,"z":"dc39d835.96bdd8","wires":[["c80461c8.341ca8"]]},{"id":"d80653.a0abb1b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1653.8855438232422,"y":685.3056383132935,"z":"dc39d835.96bdd8","wires":[["c80461c8.341ca8"]]},{"id":"38d40f5d.1f7d9","type":"switchNode","name":"switch service-instance-id","xml":"<switch test='`$tunnelxconn-topology-operation-input.service-information.service-instance-id`'>\n","comments":"","outputs":1,"x":653.9285583496094,"y":420.85719299316406,"z":"dc39d835.96bdd8","wires":[["4a734a8.76aa3b4"]]},{"id":"4a734a8.76aa3b4","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":870.3571472167969,"y":421.85719299316406,"z":"dc39d835.96bdd8","wires":[["456b9eb9.070da8"]]},{"id":"456b9eb9.070da8","type":"returnFailure","name":"return failure","xml":"<return 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":1028.7856750488281,"y":420.85719299316406,"z":"dc39d835.96bdd8","wires":[]},{"id":"9dc2e13c.b38008","type":"other","name":"create","xml":"<outcome value='create'>","comments":"","outputs":1,"x":827.2777137756348,"y":633.9074087142944,"z":"dc39d835.96bdd8","wires":[["3adcb6d9.68932a"]]},{"id":"3adcb6d9.68932a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1019.5276031494141,"y":629.9907321929932,"z":"dc39d835.96bdd8","wires":[["c994f413.2cb5e8","fc66f195.4287e8"]]},{"id":"5b47f09e.898778","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":840.611083984375,"y":910.5739946365356,"z":"dc39d835.96bdd8","wires":[["e72f8b82.17d0f"]]},{"id":"e72f8b82.17d0f","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1017.1111068725586,"y":908.5740489959717,"z":"dc39d835.96bdd8","wires":[["c994f413.2cb5e8","fc66f195.4287e8"]]},{"id":"c994f413.2cb5e8","type":"switchNode","name":"switch allotted-resource-id","xml":"<switch test='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n","comments":"","outputs":1,"x":1507.7938537597656,"y":199.03967714309692,"z":"dc39d835.96bdd8","wires":[["323e47dd.ce97d8"]]},{"id":"323e47dd.ce97d8","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1710.8296146392822,"y":203.8611183166504,"z":"dc39d835.96bdd8","wires":[["50ae4b2d.31f91c"]]},{"id":"50ae4b2d.31f91c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"allotted-resource-information.allotted-resource-id is a required input\" />\n","comments":"","x":1896.0080833435059,"y":199.1111183166504,"z":"dc39d835.96bdd8","wires":[]},{"id":"7840e223.6ecc1c","type":"switchNode","name":"switch allotted-resource-type","xml":"<switch test='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`'>\n","comments":"","outputs":1,"x":1511.7224349975586,"y":267.98810291290283,"z":"dc39d835.96bdd8","wires":[["a6f5f0f2.393be"]]},{"id":"a6f5f0f2.393be","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1707.2578468322754,"y":267.80952644348145,"z":"dc39d835.96bdd8","wires":[["292de8a3.586568"]]},{"id":"292de8a3.586568","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"allotted-resource-information.allotted-resource-type is a required input\" />\n","comments":"","x":1867.4363174438477,"y":266.80952644348145,"z":"dc39d835.96bdd8","wires":[]},{"id":"fc66f195.4287e8","type":"switchNode","name":"switch parent-service-instance-id","xml":"<switch test='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`'>\n","comments":"","outputs":1,"x":1527.0796127319336,"y":343.7023983001709,"z":"dc39d835.96bdd8","wires":[["2660b170.94d2fe"]]},{"id":"2660b170.94d2fe","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1746.5437355041504,"y":343.3452482223511,"z":"dc39d835.96bdd8","wires":[["644e2aed.6c16b4"]]},{"id":"644e2aed.6c16b4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"allotted-resource-information.parent-service-instance-id is a required input\" />\n","comments":"","x":1897.9722023010254,"y":342.3452482223511,"z":"dc39d835.96bdd8","wires":[]},{"id":"234eec8e.262704","type":"switchNode","name":"switch trusted-network-role","xml":"<switch test='`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`'>\n","comments":"","outputs":1,"x":1424.6784973144531,"y":543.1428604125977,"z":"dc39d835.96bdd8","wires":[["3fe21e6b.1c92ea"]]},{"id":"3fe21e6b.1c92ea","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1686.869155883789,"y":539.5238299369812,"z":"dc39d835.96bdd8","wires":[["569978c6.ddb04"]]},{"id":"569978c6.ddb04","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role is a required input\" />\n","comments":"","x":1851.8693008422852,"y":539.5237903594971,"z":"dc39d835.96bdd8","wires":[]},{"id":"19b1d290.d22cfd","type":"switchNode","name":"switch untrusted-network-role","xml":"<switch test='`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`'>\n","comments":"","outputs":1,"x":1421.9169006347656,"y":598.9404678344727,"z":"dc39d835.96bdd8","wires":[["54767128.667cc"]]},{"id":"54767128.667cc","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1666.9170684814453,"y":598.9404630661011,"z":"dc39d835.96bdd8","wires":[["cdb945b8.cff3f"]]},{"id":"cdb945b8.cff3f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"tunnelxconn-operation-input.tunnelxconn-request-input.untrusted-network-role is a required input\" />\n","comments":"","x":1833.3455352783203,"y":598.940432548523,"z":"dc39d835.96bdd8","wires":[]}]
\ No newline at end of file
+[{"id":"368b0672.1be432","type":"dgstart","name":"DGSTART","outputs":1,"x":149.5,"y":289,"z":"dc39d835.96bdd8","wires":[["69a98a55.0b046c"]]},{"id":"69a98a55.0b046c","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":248.28570556640625,"y":363.23810386657715,"z":"dc39d835.96bdd8","wires":[["7ab244c3.e46244"]]},{"id":"7ab244c3.e46244","type":"method","name":"validate-tunnelxconn-input","xml":"<method rpc='validate-tunnelxconn-input' mode='sync'>\n","comments":"","outputs":1,"x":277.1786193847656,"y":434.16669368743896,"z":"dc39d835.96bdd8","wires":[["283bbfcd.ed6068"]]},{"id":"283bbfcd.ed6068","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":319.2500457763672,"y":707.4434947967529,"z":"dc39d835.96bdd8","wires":[["59bc0290.c7f034","10ce6be9.70a52c","308b15e6.44da62","147b9b93.45a634","38d40f5d.1f7d9"]]},{"id":"59bc0290.c7f034","type":"switchNode","name":"switch svc-request-id","xml":"<switch test='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`'>\n","comments":"","outputs":1,"x":654.3095703125,"y":192.09528064727783,"z":"dc39d835.96bdd8","wires":[["375a6f82.daaf68"]]},{"id":"375a6f82.daaf68","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":884.0238554818288,"y":190.09527737753706,"z":"dc39d835.96bdd8","wires":[["6294362.5d01a48"]]},{"id":"6294362.5d01a48","type":"returnFailure","name":"return failure","xml":"<return 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":1035.4523620605469,"y":186.76194381713867,"z":"dc39d835.96bdd8","wires":[]},{"id":"10ce6be9.70a52c","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":646.8809204101562,"y":145.66667938232422,"z":"dc39d835.96bdd8","wires":[["79f66b28.48c23c"]]},{"id":"79f66b28.48c23c","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":882.5952758789062,"y":147.23810291290283,"z":"dc39d835.96bdd8","wires":[["1afe2bb9.fad974"]]},{"id":"1afe2bb9.fad974","type":"returnFailure","name":"return failure","xml":"<return 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":1032.5952491760254,"y":147.238112449646,"z":"dc39d835.96bdd8","wires":[]},{"id":"45808300.fdad84","type":"comment","name":"validate-tunnelxconn-input - CHANGELOG","info":"3/22: Initial release 1.0.0","comments":"","x":162.5,"y":193,"z":"dc39d835.96bdd8","wires":[]},{"id":"308b15e6.44da62","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":559.1666603088379,"y":713.000036239624,"z":"dc39d835.96bdd8","wires":[["979e6455.cfc31","5ae75bf1.ec81bc","f24f51df.2e9bf8","3cdf8f95.4923c","9dc2e13c.b38008","5b47f09e.898778"]]},{"id":"979e6455.cfc31","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":820.2143630981445,"y":548.5714664459229,"z":"dc39d835.96bdd8","wires":[["b16e483a.17ddc8"]]},{"id":"5ae75bf1.ec81bc","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":840.4999694824219,"y":736.0000305175781,"z":"dc39d835.96bdd8","wires":[["865a4fc7.17712"]]},{"id":"f24f51df.2e9bf8","type":"other","name":"deactivate","xml":"<outcome value='deactivate'>","comments":"","outputs":1,"x":847.4999694824219,"y":826.0000305175781,"z":"dc39d835.96bdd8","wires":[["919509c2.2756a8"]]},{"id":"3cdf8f95.4923c","type":"other","name":"unassign","xml":"<outcome value='unassign'>","comments":"","outputs":1,"x":828.4998321533203,"y":993.3333578109741,"z":"dc39d835.96bdd8","wires":[["2eb26867.63f26"]]},{"id":"b16e483a.17ddc8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1018.5238189697266,"y":546.7262649536133,"z":"dc39d835.96bdd8","wires":[["bdcd3bcd.70d368","ead921b4.5c7498","7bf99760.d366f8","c994f413.2cb5e8","7840e223.6ecc1c","fc66f195.4287e8"]]},{"id":"865a4fc7.17712","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1018.7500152587891,"y":735.750072479248,"z":"dc39d835.96bdd8","wires":[["c994f413.2cb5e8","fc66f195.4287e8"]]},{"id":"919509c2.2756a8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1019.7500305175781,"y":827.0000743865967,"z":"dc39d835.96bdd8","wires":[["c994f413.2cb5e8","fc66f195.4287e8"]]},{"id":"2eb26867.63f26","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1017.4998931884766,"y":993.8333883285522,"z":"dc39d835.96bdd8","wires":[["c994f413.2cb5e8"]]},{"id":"bdcd3bcd.70d368","type":"switchNode","name":"switch brg-wan-mac-address","xml":"<switch test='`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.brg-wan-mac-address`'>\n","comments":"","outputs":1,"x":1425.6190185546875,"y":541.2976379394531,"z":"dc39d835.96bdd8","wires":[["5e3ed0b0.de93f8"]]},{"id":"5e3ed0b0.de93f8","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1633.618896484375,"y":541.107177734375,"z":"dc39d835.96bdd8","wires":[["44e462d3.aeea5c"]]},{"id":"44e462d3.aeea5c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"tunnelxconn-topology-operation-input.tunnelxconn-request-input.vlan-tag is a required input\" />\n","comments":"","x":1848.8095703125,"y":537.1071472167969,"z":"dc39d835.96bdd8","wires":[]},{"id":"7bf99760.d366f8","type":"switchNode","name":"switch onap-model-information.model-customization-uuid","xml":"<switch test='`$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`'>\n","comments":"","outputs":1,"x":1539.6073303222656,"y":449.0000972747803,"z":"dc39d835.96bdd8","wires":[["b24c5015.cd06c"]]},{"id":"b24c5015.cd06c","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1833.6072387695312,"y":450.00003814697266,"z":"dc39d835.96bdd8","wires":[["70386862.b62d78"]]},{"id":"70386862.b62d78","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"tunnelxconn-information.onap-model-information.model-customization-uuid is a required input\" />\n","comments":"","x":1981.0357055664062,"y":450.00003814697266,"z":"dc39d835.96bdd8","wires":[]},{"id":"147b9b93.45a634","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":585.8571166992188,"y":1134.4999694824219,"z":"dc39d835.96bdd8","wires":[]},{"id":"ead921b4.5c7498","type":"get-resource","name":"get-resource AR_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid'\n  pfx='ar-model'>\n\n","comments":"","outputs":1,"x":1411.802146911621,"y":669.2818689346313,"z":"dc39d835.96bdd8","wires":[["35bb9a66.d0adf6","d80653.a0abb1b"]]},{"id":"c80461c8.341ca8","type":"returnFailure","name":"return failure","xml":"<return 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 alloted resource model found for model customization UUID ' + $tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`\" />\n","comments":"","x":1858.8854637145996,"y":657.4484224319458,"z":"dc39d835.96bdd8","wires":[]},{"id":"35bb9a66.d0adf6","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1660.1355438232422,"y":652.8056383132935,"z":"dc39d835.96bdd8","wires":[["c80461c8.341ca8"]]},{"id":"d80653.a0abb1b","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1653.8855438232422,"y":685.3056383132935,"z":"dc39d835.96bdd8","wires":[["c80461c8.341ca8"]]},{"id":"38d40f5d.1f7d9","type":"switchNode","name":"switch service-instance-id","xml":"<switch test='`$tunnelxconn-topology-operation-input.service-information.service-instance-id`'>\n","comments":"","outputs":1,"x":653.9285583496094,"y":420.85719299316406,"z":"dc39d835.96bdd8","wires":[["4a734a8.76aa3b4"]]},{"id":"4a734a8.76aa3b4","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":870.3571472167969,"y":421.85719299316406,"z":"dc39d835.96bdd8","wires":[["456b9eb9.070da8"]]},{"id":"456b9eb9.070da8","type":"returnFailure","name":"return failure","xml":"<return 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":1028.7856750488281,"y":420.85719299316406,"z":"dc39d835.96bdd8","wires":[]},{"id":"9dc2e13c.b38008","type":"other","name":"create","xml":"<outcome value='create'>","comments":"","outputs":1,"x":827.2777137756348,"y":633.9074087142944,"z":"dc39d835.96bdd8","wires":[["3adcb6d9.68932a"]]},{"id":"3adcb6d9.68932a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1019.5276031494141,"y":629.9907321929932,"z":"dc39d835.96bdd8","wires":[["c994f413.2cb5e8","fc66f195.4287e8"]]},{"id":"5b47f09e.898778","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":840.611083984375,"y":910.5739946365356,"z":"dc39d835.96bdd8","wires":[["e72f8b82.17d0f"]]},{"id":"e72f8b82.17d0f","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1017.1111068725586,"y":908.5740489959717,"z":"dc39d835.96bdd8","wires":[["c994f413.2cb5e8","fc66f195.4287e8"]]},{"id":"c994f413.2cb5e8","type":"switchNode","name":"switch allotted-resource-id","xml":"<switch test='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n","comments":"","outputs":1,"x":1507.7938537597656,"y":199.03967714309692,"z":"dc39d835.96bdd8","wires":[["323e47dd.ce97d8"]]},{"id":"323e47dd.ce97d8","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1710.8296146392822,"y":203.8611183166504,"z":"dc39d835.96bdd8","wires":[["50ae4b2d.31f91c"]]},{"id":"50ae4b2d.31f91c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"allotted-resource-information.allotted-resource-id is a required input\" />\n","comments":"","x":1896.0080833435059,"y":199.1111183166504,"z":"dc39d835.96bdd8","wires":[]},{"id":"7840e223.6ecc1c","type":"switchNode","name":"switch allotted-resource-type","xml":"<switch test='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`'>\n","comments":"","outputs":1,"x":1511.7224349975586,"y":267.98810291290283,"z":"dc39d835.96bdd8","wires":[["a6f5f0f2.393be"]]},{"id":"a6f5f0f2.393be","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1707.2578468322754,"y":267.80952644348145,"z":"dc39d835.96bdd8","wires":[["292de8a3.586568"]]},{"id":"292de8a3.586568","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"allotted-resource-information.allotted-resource-type is a required input\" />\n","comments":"","x":1867.4363174438477,"y":266.80952644348145,"z":"dc39d835.96bdd8","wires":[]},{"id":"fc66f195.4287e8","type":"switchNode","name":"switch parent-service-instance-id","xml":"<switch test='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`'>\n","comments":"","outputs":1,"x":1527.0796127319336,"y":343.7023983001709,"z":"dc39d835.96bdd8","wires":[["2660b170.94d2fe"]]},{"id":"2660b170.94d2fe","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1746.5437355041504,"y":343.3452482223511,"z":"dc39d835.96bdd8","wires":[["644e2aed.6c16b4"]]},{"id":"644e2aed.6c16b4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"allotted-resource-information.parent-service-instance-id is a required input\" />\n","comments":"","x":1897.9722023010254,"y":342.3452482223511,"z":"dc39d835.96bdd8","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
index 163e69b2..1ec0b8a0 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
@@ -2,7 +2,7 @@
 <block atomic="true"><set>

 <parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />

 <parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />

-<parameter name='tmp.ar.sz-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />

+<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />

 

 

 </set><set>

@@ -14,7 +14,7 @@
     <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />

     <parameter name='contextPrefix' value='prop' />

 </execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$prop.restapi.sz-allottedresource`"/>

+    <parameter name="source" value="`$prop.restapi.brg-allottedresource`"/>

     <parameter name="outputPath" value="tmp.ar-url"/>

     <parameter name="target" value="{allotted-resource-id}"/>

     <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>

@@ -29,42 +29,42 @@
 <outcome value='success'>

 <block atomic="true">

 <set>

-<parameter name='bk-sz-ar' value='$mdsal-ar.' />

+<parameter name='bk-brg-ar' value='$mdsal-ar.' />

 </set><switch test='`$mdsal-ar.brg-allotted-resource_length`'>

 <outcome value='1'>

 <block atomic='true'>

 <set>

-<parameter name='sz-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />

-</set><switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

+<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />

+</set><switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

 <outcome value='Created'>

 <block>

 </block></outcome><outcome value='Other'>

 <block>

 </block></outcome></switch><set>

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

 

 </set></block></outcome></switch></block></outcome><outcome value='Other'>

 <block atomic="true">

 </block></outcome></execute><set>

-<parameter name='sz-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

-<parameter name='sz-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />

-<parameter name='sz-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />

-<parameter name='sz-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >

+<parameter name='brg-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

+<parameter name='brg-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />

+<parameter name='brg-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />

+<parameter name='brg-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >

     <parameter name="outputPath" value="tmp.current-time" />

 

 </execute><set>

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

 </set><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

 		resource="allotted-resource" 

 		key="customer.global-customer-id = $service-data.service-information.global-customer-id AND

@@ -84,7 +84,7 @@
 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="AAI failed" />

 </return></outcome></update><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`" />

+    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`" />

     <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />

     <parameter name='restapiUser' value='`$prop.controller.user`' />

     <parameter name='restapiPassword' value='`$prop.controller.pwd`' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
index 1d08a1c1..3c27d549 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
@@ -2,107 +2,73 @@
 <block atomic="true"><set>

 <parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />

 <parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />

-<parameter name='tmp.ar.sz-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />

 

 

 </set><set>

-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'

+<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'

  + $tmp.ar.allotted-resource-id

- + '/allotted-resource-data/brg-topology/'` " />

+ + '/allotted-resource-data/tunnelxconn-topology/'` " />

 

 </set><execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >

     <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />

     <parameter name='contextPrefix' value='prop' />

 </execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$prop.restapi.sz-allottedresource`"/>

+    <parameter name="source" value="`$prop.restapi.brg-allottedresource`"/>

     <parameter name="outputPath" value="tmp.ar-url"/>

     <parameter name="target" value="{allotted-resource-id}"/>

     <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>

-</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$prop.restapi.vnf-provided-allottedresource`" />

-    <parameter name="outputPath" value="tmp.vnf-p-ar-url" />

-    <parameter name="target" value="{service-instance-id}" />

-    <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`" />

-</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$tmp.vnf-p-ar-url`" />

-    <parameter name="outputPath" value="tmp.vnf-p-ar-url" />

-    <parameter name="target" value="{vnf-id}"/>

-    <parameter name="replacement" value="`$tmp.ar.sz-vnf-id`"/>

-</execute><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />

-    <parameter name='restapiUser' value='`$prop.controller.user`' />

-    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />

-    <parameter name='format' value='json' />

-    <parameter name='httpMethod' value='GET' />

-    <parameter name="responsePrefix" value="mdsal-ar" />

-

+</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='brg-allotted-resources/brg-allotted-resource/$brg-topology-operation-input.alloted-resource-information.allotted-resource-id' pfx='mdsal-ar' >

 <outcome value='success'>

-<block atomic="true">

-<set>

-<parameter name='bk-sz-ar' value='$mdsal-ar.' />

-</set><switch test='`$mdsal-ar.brg-allotted-resource_length`'>

-<outcome value='1'>

-<block atomic='true'>

-<set>

-<parameter name='sz-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />

-</set><switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

-<outcome value='Created'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" 

-    value="`'Existing brg-allotted-resource with order status of ' + $sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />

-</return></outcome><outcome value='PendingDelete'>

-<return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" 

-    value="`'Existing brg-allotted-resource with order status of ' + $sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />

-</return></outcome></switch><set>

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

-

-</set></block></outcome></switch></block></outcome><outcome value='Other'>

+    value="`'Existing brg-allotted-resource with order status of ' + $mdsal-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />

+</return></outcome><outcome value='Other'>

 <block atomic="true">

-</block></outcome></execute><set>

-<parameter name='sz-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

-<parameter name='sz-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />

-<parameter name='sz-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />

-<parameter name='sz-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " /></set><set>

-<parameter name='sz-ar-identifiers.consuming-service-instance-id' value="`$brg-topology-operation-input.service-information.service-instance-id` " />

-<parameter name='sz-ar-identifiers.parent-service-instance-id' value="`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />

-<parameter name='sz-ar-identifiers.allotted-resource-type' value="`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` " />

-<parameter name='sz-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

+<set>

+<parameter name='brg-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

+<parameter name='brg-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />

+<parameter name='brg-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />

+<parameter name='brg-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " /></set><set>

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

+

+</set><set>

+<parameter name='brg-ar-identifiers.consuming-service-instance-id' value="`$brg-topology-operation-input.service-information.service-instance-id` " />

+<parameter name='brg-ar-identifiers.parent-service-instance-id' value="`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />

+<parameter name='brg-ar-identifiers.allotted-resource-type' value="`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` " />

+<parameter name='brg-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

 

 </set><set>

-<parameter name='sz-ar.allotted-resource-data.brg-topology.onap-model-information.' 

+<parameter name='tx-ar.allotted-resource-data.brg-topology.onap-model-information.' 

 value="`$brg-topology-operation-input.allotted-resource-information.onap-model-information.`" />

 

 

 </set><switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>

 <outcome value=''>

 <set>

-<parameter name='sz-ar.allotted-resource-data.brg-topology.onap-model-information.model-invariant-uuid' 

+<parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-invariant-uuid' 

 value="`$ar-model.invariant-uuid`" />

 

 

 </set></outcome></switch><switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>

 <outcome value=''>

 <set>

-<parameter name='sz-ar.allotted-resource-data.brg-topology.onap-model-information.model-uuid' 

+<parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-uuid' 

 value="`$ar-model.uuid`" />

 

 

 </set></outcome></switch><switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>

 <outcome value=''>

 <set>

-<parameter name='sz-ar.allotted-resource-data.brg-topology.onap-model-information.model-version' 

+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version' 

 value="`$ar-model.version`" />

 

 

@@ -110,7 +76,7 @@ value="`$ar-model.version`" />
 <outcome value='Y'>

 <block atomic="true">

 <switch test='`$ar-model.naming-policy`'>

-<outcome value='oam_security_zone_name'>

+<outcome value='oam_network_policy'>

 <block atomic='true'>

 <set>

 <parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />

@@ -118,16 +84,16 @@ value="`$ar-model.version`" />
     <parameter name="source" value="`$tmp.ar-name`"/>

     <parameter name="outputPath" value="tmp.ar-name"/>

     <parameter name="target" value="$TenantOAMNetworkRole"/>

-    <parameter name="replacement" value="`$brg-topology-operation-input.brg-request-input.untrusted-network-role`"/>

+    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`"/>

 

 </execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

     <parameter name="source" value="`$tmp.ar-name`"/>

     <parameter name="outputPath" value="tmp.ar-name"/>

     <parameter name="target" value="$LandingNetworkRole"/>

-    <parameter name="replacement" value="`$brg-topology-operation-input.brg-request-input.trusted-network-role`"/>

+    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`"/>

 

 </execute><set>

-<parameter name='sz-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />

+<parameter name='brg-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />

 </set></block></outcome><outcome value='Other'>

 <block atomic='true'>

 <set>

@@ -136,16 +102,16 @@ value="`$ar-model.version`" />
     <parameter name="source" value="`$tmp.ar-name`"/>

     <parameter name="outputPath" value="tmp.ar-name"/>

     <parameter name="target" value="$TenantOAMNetworkRole"/>

-    <parameter name="replacement" value="`$brg-topology-operation-input.brg-request-input.untrusted-network-role`"/>

+    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`"/>

 

 </execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

     <parameter name="source" value="`$tmp.ar-name`"/>

     <parameter name="outputPath" value="tmp.ar-name"/>

     <parameter name="target" value="$LandingNetworkRole"/>

-    <parameter name="replacement" value="`$brg-topology-operation-input.brg-request-input.trusted-network-role`"/>

+    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`"/>

 

 </execute><set>

-<parameter name='sz-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />

+<parameter name='brg-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />

 </set></block></outcome></switch></block></outcome><outcome value='Other'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

@@ -153,25 +119,15 @@ value="`$ar-model.version`" />
     <parameter name="error-message" value="Error in allotted-resource-model data.  Ecomp-generated-naming should be true" />

 

 </return></outcome></switch><set>

-<parameter name='sz-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.' 

-value="`$sz-ar-identifiers.`" />

+<parameter name='brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.' 

+value="`$brg-ar-identifiers.`" />

 

 

 </set><set>

-<parameter name='sz-ar-assignments.vlan-tag' value="`$brg-topology-operation-input.brg-request-input.vlan-tag` " />

-<parameter name='sz-ar-assignments.trusted-network-role' value="`$brg-topology-operation-input.brg-request-input.trusted-network-role` " />

-<parameter name='sz-ar-assignments.untrusted-network-role' value="`$brg-topology-operation-input.brg-request-input.untrusted-network-role` " />

-<parameter name='sz-ar-assignments.brg-service-instance-id' value="`$tmp.ar.parent-service-instance-id` " />

-

-</set><call module='GENERIC-RESOURCE-API' rpc='generate-panorama-name' mode='sync' >

-</call><set>

-<parameter name='sz-ar-assignments.brg-name-untrusted' value="`$tmp.untrust-sz` " />

-<parameter name='sz-ar-assignments.brg-name-trusted' value="`$tmp.trust-sz` " />

-

-

+<parameter name='brg-ar-assignments.vbrg-wan-ip' value='`$brg-topology-operation-input.brg-request-input.brg-wan-ip-address`'/>

 </set><set>

-<parameter name='sz-ar.allotted-resource-data.brg-topology.brg-assignments.' 

-value="`$sz-ar-assignments.`" />

+<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.' 

+value="`$brg-ar-assignments.`" />

 

 

 </set><switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>

@@ -204,11 +160,11 @@ value="`$sz-ar-assignments.`" />
     <parameter name="outputPath" value="tmp.current-time" />

 

 </execute><set>

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

 </set><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

 		resource="allotted-resource" 

 		key="customer.global-customer-id = $service-data.service-information.global-customer-id AND

@@ -216,7 +172,7 @@ value="`$sz-ar-assignments.`" />
 			service-instance.service-instance-id = $service-data.service-information.service-instance-id AND

 			allotted-resource.id = $tmp.ar.allotted-resource-id"

         pfx='pfx' local-only='false' force='false'>

-	<parameter name="description" value="`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type`" />

+	<parameter name="description" value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`" />

 	<parameter name="selflink" value="`$tmp.ar.self-link`" />

 	<parameter name="model-invariant-id" value="`$ar-model.invariant-uuid`" />

 	<parameter name="model-version-id" value="`$ar-model.uuid`" />

@@ -232,7 +188,7 @@ value="`$sz-ar-assignments.`" />
 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="AAI failed" />

 </return></outcome></update><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`" />

+    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`" />

     <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />

     <parameter name='restapiUser' value='`$prop.controller.user`' />

     <parameter name='restapiPassword' value='`$prop.controller.pwd`' />

@@ -261,15 +217,15 @@ value="`$sz-ar-assignments.`" />
 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />

+    <parameter name="error-message" value="Error updating md-sal for tunnelxconn-allotted-resource" />

 </return></outcome><outcome value='not-found'>

 <return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />

+    <parameter name="error-message" value="Error updating md-sal for tunnelxconn-allotted-resource" />

 </return></outcome></execute><set>

 <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />

-<parameter name='brg-object-path' value="`$tmp.ar.self-link`"/>

+<parameter name='tunnelxconn-object-path' value="`$tmp.ar.self-link`"/>

 <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'

  + $brg-topology-operation-input.service-information.service-instance-id

  + '/service-data/service-topology/'`"/>

@@ -278,4 +234,4 @@ value="`$sz-ar-assignments.`" />
 <parameter name="ack-final-indicator" value="Y" />

 <parameter name="error-code" value="200" />

 <parameter name="error-message" value="`$error-message`" />

-</return></block></method></service-logic>
\ No newline at end of file
+</return></block></outcome></get-resource></block></method></service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-create.xml
index 7a2751a0..e8edc573 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-create.xml
@@ -2,7 +2,7 @@
 <block atomic="true"><set>

 <parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />

 <parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />

-<parameter name='tmp.ar.sz-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />

+<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />

 

 

 </set><set>

@@ -14,7 +14,7 @@
     <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />

     <parameter name='contextPrefix' value='prop' />

 </execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$prop.restapi.sz-allottedresource`"/>

+    <parameter name="source" value="`$prop.restapi.brg-allottedresource`"/>

     <parameter name="outputPath" value="tmp.ar-url"/>

     <parameter name="target" value="{allotted-resource-id}"/>

     <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>

@@ -29,44 +29,44 @@
 <outcome value='success'>

 <block atomic="true">

 <set>

-<parameter name='bk-sz-ar' value='$mdsal-ar.' />

+<parameter name='bk-brg-ar' value='$mdsal-ar.' />

 </set><switch test='`$mdsal-ar.brg-allotted-resource_length`'>

 <outcome value='1'>

 <block atomic='true'>

 <set>

-<parameter name='sz-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />

-</set><switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

+<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />

+</set><switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

 <outcome value='PendingCreate'>

 <block>

 </block></outcome><outcome value='Other'>

 <block>

 </block></outcome></switch><set>

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

 

 </set></block></outcome></switch></block></outcome><outcome value='Other'>

 <block atomic="true">

 </block></outcome></execute><set>

-<parameter name='sz-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

-<parameter name='sz-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />

-<parameter name='sz-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />

-<parameter name='sz-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >

+<parameter name='brg-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

+<parameter name='brg-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />

+<parameter name='brg-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />

+<parameter name='brg-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >

     <parameter name="outputPath" value="tmp.current-time" />

 

 </execute><set>

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

 </set><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`" />

+    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`" />

     <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />

     <parameter name='restapiUser' value='`$prop.controller.user`' />

     <parameter name='restapiPassword' value='`$prop.controller.pwd`' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml
index 8d5eb77f..af9e9190 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml
@@ -2,7 +2,7 @@
 <block atomic="true"><set>

 <parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />

 <parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />

-<parameter name='tmp.ar.sz-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />

+<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />

 

 

 </set><set>

@@ -14,7 +14,7 @@
     <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />

     <parameter name='contextPrefix' value='prop' />

 </execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$prop.restapi.sz-allottedresource`"/>

+    <parameter name="source" value="`$prop.restapi.brg-allottedresource`"/>

     <parameter name="outputPath" value="tmp.ar-url"/>

     <parameter name="target" value="{allotted-resource-id}"/>

     <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>

@@ -29,42 +29,42 @@
 <outcome value='success'>

 <block atomic="true">

 <set>

-<parameter name='bk-sz-ar' value='$mdsal-ar.' />

+<parameter name='bk-brg-ar' value='$mdsal-ar.' />

 </set><switch test='`$mdsal-ar.brg-allotted-resource_length`'>

 <outcome value='1'>

 <block atomic='true'>

 <set>

-<parameter name='sz-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />

-</set><switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

+<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />

+</set><switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

 <outcome value='Created'>

 <block>

 </block></outcome><outcome value='Other'>

 <block>

 </block></outcome></switch><set>

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

 

 </set></block></outcome></switch></block></outcome><outcome value='Other'>

 <block atomic="true">

 </block></outcome></execute><set>

-<parameter name='sz-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

-<parameter name='sz-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />

-<parameter name='sz-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />

-<parameter name='sz-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >

+<parameter name='brg-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

+<parameter name='brg-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />

+<parameter name='brg-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />

+<parameter name='brg-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >

     <parameter name="outputPath" value="tmp.current-time" />

 

 </execute><set>

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

 </set><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

 		resource="allotted-resource" 

 		key="customer.global-customer-id = $service-data.service-information.global-customer-id AND

@@ -84,7 +84,7 @@
 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="AAI failed" />

 </return></outcome></update><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`" />

+    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`" />

     <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />

     <parameter name='restapiUser' value='`$prop.controller.user`' />

     <parameter name='restapiPassword' value='`$prop.controller.pwd`' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml
index 6610dfd7..cb4eac98 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml
@@ -2,7 +2,7 @@
 <block atomic="true"><set>

 <parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />

 <parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />

-<parameter name='tmp.ar.sz-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />

+<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />

 

 

 </set><set>

@@ -14,7 +14,7 @@
     <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />

     <parameter name='contextPrefix' value='prop' />

 </execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$prop.restapi.sz-allottedresource`"/>

+    <parameter name="source" value="`$prop.restapi.brg-allottedresource`"/>

     <parameter name="outputPath" value="tmp.ar-url"/>

     <parameter name="target" value="{allotted-resource-id}"/>

     <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>

@@ -29,49 +29,49 @@
 <outcome value='success'>

 <block atomic="true">

 <set>

-<parameter name='bk-sz-ar' value='$mdsal-ar.' />

+<parameter name='bk-brg-ar' value='$mdsal-ar.' />

 </set><switch test='`$mdsal-ar.brg-allotted-resource_length`'>

 <outcome value='1'>

 <block atomic='true'>

 <set>

-<parameter name='sz-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />

-</set><switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

+<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />

+</set><switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

 <outcome value='Created'>

 <block>

 </block></outcome><outcome value='Other'>

 <block>

 </block></outcome></switch><set>

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

 

 </set></block></outcome></switch></block></outcome><outcome value='Other'>

 <block atomic="true">

 </block></outcome></execute><set>

-<parameter name='sz-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

-<parameter name='sz-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />

-<parameter name='sz-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />

-<parameter name='sz-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >

+<parameter name='brg-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

+<parameter name='brg-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />

+<parameter name='brg-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />

+<parameter name='brg-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >

     <parameter name="outputPath" value="tmp.current-time" />

 

 </execute><set>

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

 </set><set>

-<parameter name='sz-ar-assignments.' value="" />

+<parameter name='brg-ar-assignments.' value="" />

 

 

 

 </set><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`" />

+    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`" />

     <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />

     <parameter name='restapiUser' value='`$prop.controller.user`' />

     <parameter name='restapiPassword' value='`$prop.controller.pwd`' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml
index 52dbdc33..74cc16b0 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml
@@ -2,7 +2,7 @@
 <block atomic="true"><set>

 <parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />

 <parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />

-<parameter name='tmp.ar.sz-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />

+<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />

 

 

 </set><set>

@@ -14,7 +14,7 @@
     <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />

     <parameter name='contextPrefix' value='prop' />

 </execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$prop.restapi.sz-allottedresource`"/>

+    <parameter name="source" value="`$prop.restapi.brg-allottedresource`"/>

     <parameter name="outputPath" value="tmp.ar-url"/>

     <parameter name="target" value="{allotted-resource-id}"/>

     <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>

@@ -29,21 +29,21 @@
 <outcome value='success'>

 <block atomic="true">

 <set>

-<parameter name='bk-sz-ar' value='$mdsal-ar.' />

+<parameter name='bk-brg-ar' value='$mdsal-ar.' />

 </set><switch test='`$mdsal-ar.brg-allotted-resource_length`'>

 <outcome value='1'>

 <block atomic='true'>

 <set>

-<parameter name='sz-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />

-</set><switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

+<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />

+</set><switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

 <outcome value='Created'>

 <block>

 </block></outcome><outcome value='Other'>

 <block>

 </block></outcome></switch><set>

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />

+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

 

 </set></block></outcome></switch></block></outcome><outcome value='Other'>

 <block atomic="true">

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml
index fffee127..cb4fffe7 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml
@@ -2,7 +2,7 @@
 <block atomic="true"><set>

 <parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />

 <parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />

-<parameter name='tmp.ar.sz-vnf-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.tunnelxconn-vnf-id`' />

+<parameter name='tmp.ar.brg-vnf-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.tunnelxconn-vnf-id`' />

 

 

 </set><set>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
index 7eeb3741..3c85b1b9 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
@@ -38,9 +38,9 @@
 <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$tunnelxconn-topology-operation-input.service-information.` " />

 <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.` " />

 <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` " /></set><set>

-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />

-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

 

 </set><set>

 <parameter name='tx-ar-identifiers.consuming-service-instance-id' value="`$tunnelxconn-topology-operation-input.service-information.service-instance-id` " />

@@ -178,11 +178,11 @@ value="`$tx-ar-assignments.`" />
     <parameter name="outputPath" value="tmp.current-time" />

 

 </execute><set>

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

 </set><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

 		resource="allotted-resource" 

 		key="customer.global-customer-id = $service-data.service-information.global-customer-id AND

@@ -206,7 +206,7 @@ value="`$tx-ar-assignments.`" />
 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="AAI failed" />

 </return></outcome></update><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`" />

+    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`" />

     <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />

     <parameter name='restapiUser' value='`$prop.controller.user`' />

     <parameter name='restapiPassword' value='`$prop.controller.pwd`' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml
index 94ad4ebe..4db2f611 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml
@@ -28,44 +28,44 @@
 <outcome value='success'>

 <block atomic="true">

 <set>

-<parameter name='bk-sz-ar' value='$mdsal-ar.' />

+<parameter name='bk-tx-ar' value='$mdsal-ar.' />

 </set><switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>

 <outcome value='1'>

 <block atomic='true'>

 <set>

-<parameter name='sz-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />

-</set><switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

+<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />

+</set><switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>

 <outcome value='PendingCreate'>

 <block>

 </block></outcome><outcome value='Other'>

 <block>

 </block></outcome></switch><set>

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />

 

 </set></block></outcome></switch></block></outcome><outcome value='Other'>

 <block atomic="true">

 </block></outcome></execute><set>

-<parameter name='sz-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

-<parameter name='sz-ar.allotted-resource-status.action' value="`$tunnelxconn-topology-operation-input.request-information.request-action` " />

-<parameter name='sz-ar.allotted-resource-status.rpc-name' value="tunnelxconn-topology-operation" />

-<parameter name='sz-ar.allotted-resource-status.rpc-action' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$tunnelxconn-topology-operation-input.request-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$tunnelxconn-topology-operation-input.service-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.` " />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` " /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >

+<parameter name='tx-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />

+<parameter name='tx-ar.allotted-resource-status.action' value="`$tunnelxconn-topology-operation-input.request-information.request-action` " />

+<parameter name='tx-ar.allotted-resource-status.rpc-name' value="tunnelxconn-topology-operation" />

+<parameter name='tx-ar.allotted-resource-status.rpc-action' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` " />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$tunnelxconn-topology-operation-input.request-information.` " />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.` " />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$tunnelxconn-topology-operation-input.service-information.` " />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.` " />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` " /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >

     <parameter name="outputPath" value="tmp.current-time" />

 

 </execute><set>

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />

-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />

+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />

 </set><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`" />

+    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`" />

     <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />

     <parameter name='restapiUser' value='`$prop.controller.user`' />

     <parameter name='restapiPassword' value='`$prop.controller.pwd`' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml
index 93154652..935d925f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml
@@ -13,7 +13,7 @@
     <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />

     <parameter name='contextPrefix' value='prop' />

 </execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$prop.restapi.sz-allottedresource`"/>

+    <parameter name="source" value="`$prop.restapi.tx-allottedresource`"/>

     <parameter name="outputPath" value="tmp.ar-url"/>

     <parameter name="target" value="{allotted-resource-id}"/>

     <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml
index 64b82b4b..c92fa402 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml
@@ -13,7 +13,7 @@
     <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />

     <parameter name='contextPrefix' value='prop' />

 </execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$prop.restapi.sz-allottedresource`"/>

+    <parameter name="source" value="`$prop.restapi.tx-allottedresource`"/>

     <parameter name="outputPath" value="tmp.ar-url"/>

     <parameter name="target" value="{allotted-resource-id}"/>

     <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml
index 0685f64f..c5755e95 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml
@@ -28,7 +28,7 @@
 <outcome value='success'>

 <block atomic="true">

 <set>

-<parameter name='bk-sz-ar' value='$mdsal-ar.' />

+<parameter name='bk-tx-ar' value='$mdsal-ar.' />

 </set><switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>

 <outcome value='1'>

 <block atomic='true'>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml
index 131405ed..3486129d 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml
@@ -9,25 +9,13 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="sdnc-request-header.svc-request-id is a required input" />

-</return></outcome></switch><switch test='`$brg-topology-operation-input.request-information.request-action`'>

-<outcome value='CreateSecurityZoneInstance'><block>

-</block></outcome><outcome value='DeleteSecurityZoneInstance'><block>

-</block></outcome><outcome value=''><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="request-information.request-action is a required input" />

-</return></outcome><outcome value='Other'><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="Invalid request-information.request-action " />

 </return></outcome></switch><switch test='`$brg-topology-operation-input.service-information.service-instance-id`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="service-information.service-instance-id is a required input" />

 </return></outcome></switch><switch test='`$brg-topology-operation-input.sdnc-request-header.svc-action`'>

-<outcome value='assign'><block atomic="true"><switch test='`$brg-topology-operation-input.request-information.request-action`'>

-<outcome value='CreateSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

+<outcome value='assign'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

@@ -47,21 +35,21 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="brg-information.onap-model-information.model-customization-uuid is a required input" />

-</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.vlan-tag`'>

+</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.vgmux-bearer-ip`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="brg-topology-operation-input.brg-request-input.vlan-tag is a required input" />

-</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.trusted-network-role`'>

+</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.vni`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="brg-topology-operation-input.brg-request-input.trusted-network-role is a required input" />

-</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.untrusted-network-role`'>

+    <parameter name="error-message" value="brg-topology-operation-input.brg-request-input.vlan-tag is a required input" />

+</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.brg-wan-ip-address `'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="brg-operation-input.brg-request-input.untrusted-network-role is a required input" />

+    <parameter name="error-message" value="brg-topology-operation-input.brg-request-input.vlan-tag is a required input" />

 </return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

   key='SELECT * from ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $brg-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid'

   pfx='ar-model'>

@@ -76,12 +64,7 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="`'No alloted resource model found for model customization UUID ' + $brg-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid`" />

-</return></outcome></get-resource></block></outcome><outcome value='Other'><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="request-information.request-action is a required to be CreateSecurityZoneInstance for svc-action=assign" />

-</return></outcome></switch></block></outcome><outcome value='create'><block atomic="true"><switch test='`$brg-topology-operation-input.request-information.request-action`'>

-<outcome value='CreateSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

+</return></outcome></get-resource></block></outcome><outcome value='create'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

@@ -91,12 +74,7 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="allotted-resource-information.parent-service-instance-id is a required input" />

-</return></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="request-information.request-action is a required to be CreateSecurityZoneInstance for svc-action=create" />

-</return></outcome></switch></block></outcome><outcome value='activate'><block atomic="true"><switch test='`$brg-topology-operation-input.request-information.request-action`'>

-<outcome value='CreateSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

+</return></outcome></switch></block></outcome><outcome value='activate'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

@@ -106,12 +84,7 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="allotted-resource-information.parent-service-instance-id is a required input" />

-</return></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="request-information.request-action is a required to be CreateSecurityZoneInstance for svc-action=activate" />

-</return></outcome></switch></block></outcome><outcome value='deactivate'><block atomic="true"><switch test='`$brg-topology-operation-input.request-information.request-action`'>

-<outcome value='DeleteSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

+</return></outcome></switch></block></outcome><outcome value='deactivate'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

@@ -121,12 +94,7 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="allotted-resource-information.parent-service-instance-id is a required input" />

-</return></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="request-information.request-action is a required to be DeleteSecurityZoneInstance for svc-action=deactivate" />

-</return></outcome></switch></block></outcome><outcome value='delete'><block atomic="true"><switch test='`$brg-topology-operation-input.request-information.request-action`'>

-<outcome value='DeleteSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

+</return></outcome></switch></block></outcome><outcome value='delete'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

@@ -136,20 +104,11 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="allotted-resource-information.parent-service-instance-id is a required input" />

-</return></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="request-information.request-action is a required to be DeleteSecurityZoneInstance for svc-action=delete" />

-</return></outcome></switch></block></outcome><outcome value='unassign'><block atomic="true"><switch test='`$brg-topology-operation-input.request-information.request-action`'>

-<outcome value='DeleteSecurityZoneInstance'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

+</return></outcome></switch></block></outcome><outcome value='unassign'><block atomic="true"><switch test='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="allotted-resource-information.allotted-resource-id is a required input" />

-</return></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="request-information.request-action is a required to be DeleteSecurityZoneInstance for svc-action=unassign" />

 </return></outcome></switch></block></outcome></switch><return status='success'>

 <parameter name="ack-final-indicator" value="Y" />

 <parameter name="error-code" value="200" />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml
index f020d51d..6db0fd57 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml
@@ -35,21 +35,11 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="tunnelxconn-information.onap-model-information.model-customization-uuid is a required input" />

-</return></outcome></switch><switch test='`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.vlan-tag`'>

+</return></outcome></switch><switch test='`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.brg-wan-mac-address`'>

 <outcome value=''><return status='failure'>

 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="tunnelxconn-topology-operation-input.tunnelxconn-request-input.vlan-tag is a required input" />

-</return></outcome></switch><switch test='`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`'>

-<outcome value=''><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role is a required input" />

-</return></outcome></switch><switch test='`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`'>

-<outcome value=''><return status='failure'>

-	<parameter name='ack-final' value='Y'/>

-	<parameter name="error-code" value="500" />

-    <parameter name="error-message" value="tunnelxconn-operation-input.tunnelxconn-request-input.untrusted-network-role is a required input" />

 </return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

   key='SELECT * from ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid'

   pfx='ar-model'>