Fix DG to match yang changes

Fix GENERIC-RESOURCE-API BRG and tunnelxconn DGs to expect input containers Change-Id: I8487a63c1b4db1afdd601cec74d0fc4f58bec2ea Issue-ID: SDNC-166 Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: 89f844835b3867fa5291b468ff2d5c8739cbf45e
author: Dan Timoney <dtimoney@att.com> 2017-11-03 18:09:16 -0400
committer: Dan Timoney <dtimoney@att.com> 2017-11-03 18:09:16 -0400
commit: e9c89799f4c5eaf5eddea7591aefbd5ec666d8da (patch)
tree: ff360bc954f41cfeb6f28d76c81f8b6b14e98c8c /platform-logic/generic-resource-api
parent: 015799def0f582771db21095a51201a84a66dd53 (diff)
6 files changed, 10 insertions, 9 deletions
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 33542cf2..58772cae 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":"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":[[]]}]
+[{"id":"d9b0610c.daab5","type":"dgstart","name":"DGSTART","outputs":1,"x":98,"y":124,"z":"34683002.93fa58","wires":[["a51256d2.da0788"]]},{"id":"a51256d2.da0788","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":194.23807907104492,"y":184.95239067077637,"z":"34683002.93fa58","wires":[["5f4ec3fd.eb5514"]]},{"id":"5f4ec3fd.eb5514","type":"method","name":"brg-topology-operation-assign","xml":"<method rpc='brg-topology-operation-assign' mode='sync'>\n","comments":"","outputs":1,"x":240.15485763549805,"y":220.19044589996338,"z":"34683002.93fa58","wires":[["e254193a.017e"]]},{"id":"e254193a.017e","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":148.47619247436523,"y":363.5237879753113,"z":"34683002.93fa58","wires":[["5fb77d01.817a3c","f6071994.111cd","d8a0f410.448db","855d7843.43be58","74f1d7d6.486668"]]},{"id":"8299b333.c8b2d8","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":991.6666564941406,"y":2290.5477046966553,"z":"34683002.93fa58","wires":[]},{"id":"41623b34.329a4c","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":1028.7540550231934,"y":2169.432439804077,"z":"34683002.93fa58","wires":[]},{"id":"5343f8f4.fa23d8","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":1100.468376159668,"y":1586.6228160858154,"z":"34683002.93fa58","wires":[]},{"id":"f6071994.111cd","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":578.7380676269531,"y":255.33331298828125,"z":"34683002.93fa58","wires":[]},{"id":"5fb77d01.817a3c","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":631.997314453125,"y":217.59259033203125,"z":"34683002.93fa58","wires":[]},{"id":"aeb725a5.a5b128","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":781.8148803710938,"y":403.26727294921875,"z":"34683002.93fa58","wires":[["4fe0372f.66dfa8"]]},{"id":"cd68c7f1.4999","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":1121.8626251220703,"y":1811.1008231639862,"z":"34683002.93fa58","wires":[["4c847424.8b358c","86a93a22.03c0c","293af0e2.711178"]]},{"id":"4c847424.8b358c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1390.5040016174316,"y":1862.4322349056602,"z":"34683002.93fa58","wires":[["92519b59.08de1"]]},{"id":"86a93a22.03c0c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1381.504051208496,"y":1830.9322606548667,"z":"34683002.93fa58","wires":[["92519b59.08de1"]]},{"id":"293af0e2.711178","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1385.2540893554688,"y":1801.289365530014,"z":"34683002.93fa58","wires":[["15eb9e53.57361a"]]},{"id":"92519b59.08de1","type":"returnFailure","name":"return failure","xml":"<return 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":1551.2540893554688,"y":1831.6822844967246,"z":"34683002.93fa58","wires":[]},{"id":"58070b29.179474","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":1131.5294189453125,"y":504.05291748046875,"z":"34683002.93fa58","wires":[]},{"id":"8e73c7db.d1a918","type":"comment","name":"Save consumed-allotted-resources to mdsal","info":"","comments":"","x":1199.2434692382812,"y":1185.7196044921875,"z":"34683002.93fa58","wires":[]},{"id":"cb25b457.59f828","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":504.8148193359375,"y":373.7672119140625,"z":"34683002.93fa58","wires":[]},{"id":"4fe0372f.66dfa8","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":1091.129150390625,"y":399.6243896484375,"z":"34683002.93fa58","wires":[]},{"id":"2cfc4e10.0b476a","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":1141.38623046875,"y":597.6243896484375,"z":"34683002.93fa58","wires":[]},{"id":"b5953569.5d9ac8","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":1168.338623046875,"y":556.338623046875,"z":"34683002.93fa58","wires":[]},{"id":"adad88f2.93a4c","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":1158.38623046875,"y":905.910400390625,"z":"34683002.93fa58","wires":[]},{"id":"41eb4dfa.e90d34","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":1186.957763671875,"y":640.9100952148438,"z":"34683002.93fa58","wires":[]},{"id":"64402bcc.01767c","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":1166.8148193359375,"y":680.19580078125,"z":"34683002.93fa58","wires":[["2e87f323.5f941c"]]},{"id":"2e87f323.5f941c","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1394.9576988220215,"y":681.6243271827698,"z":"34683002.93fa58","wires":[["d6d8495e.509b98"]]},{"id":"d6d8495e.509b98","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":1596.38627243042,"y":681.0528798103333,"z":"34683002.93fa58","wires":[]},{"id":"11fe0137.b12c47","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":1139.2434158325195,"y":714.4815106391907,"z":"34683002.93fa58","wires":[["cc5e4c8c.be41a8"]]},{"id":"cc5e4c8c.be41a8","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1340.6719818115234,"y":715.0529322624207,"z":"34683002.93fa58","wires":[["d7128810.c9612"]]},{"id":"d7128810.c9612","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":1533.529140472412,"y":715.0528540611267,"z":"34683002.93fa58","wires":[]},{"id":"514951c4.54d2d","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":1147.8148193359375,"y":747.3386378288269,"z":"34683002.93fa58","wires":[["f9192bc8.3a2e38"]]},{"id":"f9192bc8.3a2e38","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1397.8148002624512,"y":747.3386225700378,"z":"34683002.93fa58","wires":[["8a1ef8ba.1eaa3"]]},{"id":"8a1ef8ba.1eaa3","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":1590.6719589233398,"y":747.3385443687439,"z":"34683002.93fa58","wires":[]},{"id":"76304eb6.dd916","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.ecomp-generated-naming`'>\n","comments":"","outputs":1,"x":1211.38623046875,"y":849.7672729492188,"z":"34683002.93fa58","wires":[["318a990d.9b4b0e","12d24ac6.b95fb5"]]},{"id":"318a990d.9b4b0e","type":"other","name":"outcome Y","xml":"<outcome value='Y'>\n","comments":"","outputs":1,"x":1497.3862915039062,"y":849.1958618164062,"z":"34683002.93fa58","wires":[["85ab0d4b.6bb518"]]},{"id":"85ab0d4b.6bb518","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":1651.1363525390625,"y":851.69580078125,"z":"34683002.93fa58","wires":[["20a4ab7c.5bee14"]]},{"id":"12d24ac6.b95fb5","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1516.608642578125,"y":938.1958618164062,"z":"34683002.93fa58","wires":[["50d7d0dd.d7f208"]]},{"id":"50d7d0dd.d7f208","type":"returnFailure","name":"return failure","xml":"<return 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":1699.608642578125,"y":943.1958618164062,"z":"34683002.93fa58","wires":[]},{"id":"20a4ab7c.5bee14","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.naming-policy`'>\n","comments":"","outputs":1,"x":1787.38623046875,"y":900.767333984375,"z":"34683002.93fa58","wires":[["61e7f9b4.97e548","6ce2798.5a8cf08"]]},{"id":"61e7f9b4.97e548","type":"other","name":"outcome oam_network_policy","xml":"<outcome value='oam_network_policy'>\n","comments":"","outputs":1,"x":2162.244140625,"y":904.3453369140625,"z":"34683002.93fa58","wires":[["fff96926.4eff4"]]},{"id":"6ce2798.5a8cf08","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2076.671875,"y":981.1958618164062,"z":"34683002.93fa58","wires":[["fff96926.4eff4"]]},{"id":"bebe63bc.ed835","type":"set","name":"set ar_name","xml":"<set>\n<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />\n","comments":"","x":2468.100830078125,"y":939.7672729492188,"z":"34683002.93fa58","wires":[]},{"id":"e47f2c2b.1a2ae8","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":2612.2437858581543,"y":983.6244196891785,"z":"34683002.93fa58","wires":[[]]},{"id":"8c92870.4ba13f8","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":2599.243896484375,"y":1023.7672729492188,"z":"34683002.93fa58","wires":[[]]},{"id":"fff96926.4eff4","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":2276.5292015075684,"y":979.3387522697449,"z":"34683002.93fa58","wires":[["bebe63bc.ed835","e47f2c2b.1a2ae8","8c92870.4ba13f8","b17756d5.b2bc98"]]},{"id":"b17756d5.b2bc98","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":2557.1005859375,"y":1074.052978515625,"z":"34683002.93fa58","wires":[]},{"id":"5b4b1c86.eeea5c","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":1166.8624572753906,"y":1110.6246919631958,"z":"34683002.93fa58","wires":[]},{"id":"4d3e0d8e.2454cc","type":"set","name":"Handle brg-ar-assignments","xml":"<set>\n<parameter name='brg-ar-assignments.vbrg-wan-ip' value='127.0.0.1'/>\n","comments":"","x":1146.529052734375,"y":1007.0530395507812,"z":"34683002.93fa58","wires":[]},{"id":"ae183f83.ca66","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":2184.8155822753906,"y":1384.0411586761475,"z":"34683002.93fa58","wires":[["8bab4985.de39e"]]},{"id":"cd3a7592.666fd8","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":1215.8148193359375,"y":1271.505126953125,"z":"34683002.93fa58","wires":[["dfcb6e41.cd7518","8af2b908.409588"]]},{"id":"dfcb6e41.cd7518","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1591.2077865600586,"y":1276.1124458312988,"z":"34683002.93fa58","wires":[["a76a6077.b21e9"]]},{"id":"8af2b908.409588","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1589.9577865600586,"y":1366.1124477386475,"z":"34683002.93fa58","wires":[["c164e57e.763ac"]]},{"id":"8bab4985.de39e","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":2619.4106826782227,"y":1385.85085105896,"z":"34683002.93fa58","wires":[["97ff749e.8ee2"]]},{"id":"97ff749e.8ee2","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2826.220375061035,"y":1389.064962387085,"z":"34683002.93fa58","wires":[["16c9ff84.8f0b6"]]},{"id":"c164e57e.763ac","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1747.834976196289,"y":1372.4885501861572,"z":"34683002.93fa58","wires":[["ae183f83.ca66","33c77367.72b384"]]},{"id":"16c9ff84.8f0b6","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2994.4817276000977,"y":1393.9222631454468,"z":"34683002.93fa58","wires":[["4e322ead.bd439","274da40f.a12b24"]]},{"id":"a76a6077.b21e9","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":1770.0647735595703,"y":1278.3266830444336,"z":"34683002.93fa58","wires":[]},{"id":"4e322ead.bd439","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":3240.3391876220703,"y":1388.4937419891357,"z":"34683002.93fa58","wires":[]},{"id":"6ab52ff7.ff8868","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":1126.6720123291016,"y":1436.826681137085,"z":"34683002.93fa58","wires":[]},{"id":"15eb9e53.57361a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1526.910057067871,"y":1797.4815347194672,"z":"34683002.93fa58","wires":[["d7264475.abe18"]]},{"id":"98997a5a.1fd828","type":"comment","name":"Add BRG AR to mdsal","info":"","comments":"","x":1051.148208618164,"y":1772.1957080364227,"z":"34683002.93fa58","wires":[]},{"id":"f4897a14.99bb58","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":1067.4814224243164,"y":1510.671986579895,"z":"34683002.93fa58","wires":[[]]},{"id":"48675dba.11d884","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":787.57666015625,"y":454.4814453125,"z":"34683002.93fa58","wires":[["4a4ef057.917098"]]},{"id":"4a4ef057.917098","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":735.57666015625,"y":950.2908325195312,"z":"34683002.93fa58","wires":[["a54cb6b9.691908","2cfc4e10.0b476a","41eb4dfa.e90d34","64402bcc.01767c","11fe0137.b12c47","514951c4.54d2d","58070b29.179474","76304eb6.dd916","adad88f2.93a4c","4d3e0d8e.2454cc","5b4b1c86.eeea5c","cd3a7592.666fd8","6ab52ff7.ff8868","f4897a14.99bb58","5343f8f4.fa23d8","76d669a1.18de7","cd68c7f1.4999","41623b34.329a4c","8299b333.c8b2d8"]]},{"id":"a54cb6b9.691908","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":1106.2434387207031,"y":460.433837890625,"z":"34683002.93fa58","wires":[]},{"id":"76d669a1.18de7","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":1088.0529327392578,"y":1678.5767517089844,"z":"34683002.93fa58","wires":[["834dc35d.457848","10580400.60fa14"]]},{"id":"834dc35d.457848","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1343.814842224121,"y":1661.5292553901672,"z":"34683002.93fa58","wires":[["5cfd95cc.60c8fc"]]},{"id":"5cfd95cc.60c8fc","type":"returnFailure","name":"return failure","xml":"<return 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":1510.338722229004,"y":1673.1483263969421,"z":"34683002.93fa58","wires":[]},{"id":"10580400.60fa14","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1350.9101295471191,"y":1694.2912230491638,"z":"34683002.93fa58","wires":[["5cfd95cc.60c8fc"]]},{"id":"33c77367.72b384","type":"switchNode","name":"switch tmp.found-cidx","xml":"<switch test='`$tmp.found-cidx`'>\n","comments":"","outputs":1,"x":1999.743423461914,"y":1630.2315921783447,"z":"34683002.93fa58","wires":[["23f71de6.c99c72"]]},{"id":"23f71de6.c99c72","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2189.743377685547,"y":1630.2315292358398,"z":"34683002.93fa58","wires":[["c2e158a2.5bfd"]]},{"id":"c2e158a2.5bfd","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2355.743377685547,"y":1630.2315292358398,"z":"34683002.93fa58","wires":[["b2a1b6ca.2854f"]]},{"id":"b2a1b6ca.2854f","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":2601.600706100464,"y":1630.8030033111572,"z":"34683002.93fa58","wires":[]},{"id":"274da40f.a12b24","type":"break","name":"break","xml":"<break/>\n","comments":"","x":3159.243408203125,"y":1433.731689453125,"z":"34683002.93fa58","wires":[]},{"id":"d7264475.abe18","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":1877.9521980285645,"y":1797.1904199123383,"z":"34683002.93fa58","wires":[["5569a020.56d34","a6ee2298.75fb98","427f67f6.078bb"]]},{"id":"f6498a51.c6afa8","type":"comment","name":"Rollback parent","info":"","comments":"","x":1721.9521255493164,"y":1766.8570504188538,"z":"34683002.93fa58","wires":[]},{"id":"5569a020.56d34","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2249.2602462768555,"y":1857.8553862571716,"z":"34683002.93fa58","wires":[["711424da.d0685c"]]},{"id":"a6ee2298.75fb98","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2240.26029586792,"y":1826.3554120063782,"z":"34683002.93fa58","wires":[["711424da.d0685c"]]},{"id":"427f67f6.078bb","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2244.0103340148926,"y":1796.7125168815255,"z":"34683002.93fa58","wires":[["711424da.d0685c"]]},{"id":"711424da.d0685c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2385.666301727295,"y":1792.9046860709786,"z":"34683002.93fa58","wires":[[]]},{"id":"f6b60316.f50b58","type":"comment","name":"Generate naming","info":"","comments":"","x":1142.3862762451172,"y":807.7672252655029,"z":"34683002.93fa58","wires":[]},{"id":"d8a0f410.448db","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":487,"y":408,"z":"34683002.93fa58","wires":[["aeb725a5.a5b128","48675dba.11d884"]]},{"id":"855d7843.43be58","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":563,"y":297,"z":"34683002.93fa58","wires":[[]]},{"id":"74f1d7d6.486668","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":570,"y":337,"z":"34683002.93fa58","wires":[[]]}]
+\ No newline at end of file
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 fd42500b..fb55882e 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":"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.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":[]}]
+[{"id":"4030c923.2b0638","type":"dgstart","name":"DGSTART","outputs":1,"x":153,"y":180.33332061767578,"z":"a36563f1.0ad948","wires":[["232a3784.702ad8"]]},{"id":"232a3784.702ad8","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":251.78570556640625,"y":254.57142448425293,"z":"a36563f1.0ad948","wires":[["c31f4ddf.1134"]]},{"id":"c31f4ddf.1134","type":"method","name":"validate-brg-input","xml":"<method rpc='validate-brg-input' mode='sync'>\n","comments":"","outputs":1,"x":280.6786193847656,"y":325.50001430511475,"z":"a36563f1.0ad948","wires":[["ea01ba8c.352078"]]},{"id":"ea01ba8c.352078","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":322.7500457763672,"y":598.7768154144287,"z":"a36563f1.0ad948","wires":[["453ef264.5585d4","506f96ca.9026e8","8750668f.37f25","ea98aac1.995a4","2b04d10e.4f29de"]]},{"id":"453ef264.5585d4","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":657.8095703125,"y":83.42860126495361,"z":"a36563f1.0ad948","wires":[["9c796d89.458af"]]},{"id":"9c796d89.458af","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":887.5238554818288,"y":81.42859799521284,"z":"a36563f1.0ad948","wires":[["a0bb007c.967d3"]]},{"id":"a0bb007c.967d3","type":"returnFailure","name":"return failure","xml":"<return 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":1038.9523620605469,"y":78.09526443481445,"z":"a36563f1.0ad948","wires":[]},{"id":"506f96ca.9026e8","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$brg-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":650.3809204101562,"y":37,"z":"a36563f1.0ad948","wires":[["722e018f.fd36e8"]]},{"id":"722e018f.fd36e8","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":886.0952758789062,"y":38.57142353057861,"z":"a36563f1.0ad948","wires":[["ae3db492.dea2"]]},{"id":"ae3db492.dea2","type":"returnFailure","name":"return failure","xml":"<return 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":1036.0952491760254,"y":38.57143306732178,"z":"a36563f1.0ad948","wires":[]},{"id":"6e12c726.fb47e","type":"comment","name":"validate-brg-input - CHANGELOG","info":"3/22: Initial release 1.0.0","comments":"","x":166,"y":84.33332061767578,"z":"a36563f1.0ad948","wires":[]},{"id":"8750668f.37f25","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$brg-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":562.6666603088379,"y":604.3333568572998,"z":"a36563f1.0ad948","wires":[["75e5a26e.8bbc1c","2139f95e.1444f6","d541942a.c645c","52ed858c.7fc904","c357fd26.93d77","a22f16cf.8b48b8"]]},{"id":"75e5a26e.8bbc1c","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":823.7143630981445,"y":439.90478706359863,"z":"a36563f1.0ad948","wires":[["b60b376b.c3b408"]]},{"id":"2139f95e.1444f6","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":843.9999694824219,"y":627.3333511352539,"z":"a36563f1.0ad948","wires":[["9d06a845.ab6b78"]]},{"id":"d541942a.c645c","type":"other","name":"deactivate","xml":"<outcome value='deactivate'>","comments":"","outputs":1,"x":850.9999694824219,"y":717.3333511352539,"z":"a36563f1.0ad948","wires":[["55258e57.83aa4"]]},{"id":"52ed858c.7fc904","type":"other","name":"unassign","xml":"<outcome value='unassign'>","comments":"","outputs":1,"x":831.9998321533203,"y":884.6666784286499,"z":"a36563f1.0ad948","wires":[["54954882.a91a7"]]},{"id":"b60b376b.c3b408","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1022.0238189697266,"y":438.05958557128906,"z":"a36563f1.0ad948","wires":[["d4cb145f.3b29d8","dbd0163e.1668b","a74acd1b.b2ef78","1551962.10999ea","be865110.8c5cc8","b7c65dae.5d181","88921e9.f4a5a6","9cdfba09.f3278"]]},{"id":"9d06a845.ab6b78","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1022.2500152587891,"y":627.0833930969238,"z":"a36563f1.0ad948","wires":[["1551962.10999ea","b7c65dae.5d181"]]},{"id":"55258e57.83aa4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1023.2500305175781,"y":718.3333950042725,"z":"a36563f1.0ad948","wires":[["1551962.10999ea","b7c65dae.5d181"]]},{"id":"54954882.a91a7","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1020.9998931884766,"y":885.166708946228,"z":"a36563f1.0ad948","wires":[["1551962.10999ea"]]},{"id":"d4cb145f.3b29d8","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":1437.1190185546875,"y":403.63098907470703,"z":"a36563f1.0ad948","wires":[["41d55853.b58218"]]},{"id":"41d55853.b58218","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1637.118896484375,"y":409.4404983520508,"z":"a36563f1.0ad948","wires":[["f03be371.faa07"]]},{"id":"f03be371.faa07","type":"returnFailure","name":"return failure","xml":"<return 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":1846.3095703125,"y":409.4404983520508,"z":"a36563f1.0ad948","wires":[]},{"id":"a74acd1b.b2ef78","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":1543.1073303222656,"y":340.33341789245605,"z":"a36563f1.0ad948","wires":[["8914945b.b27388"]]},{"id":"8914945b.b27388","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1837.1072387695312,"y":341.33335876464844,"z":"a36563f1.0ad948","wires":[["24cd3709.a6567"]]},{"id":"24cd3709.a6567","type":"returnFailure","name":"return failure","xml":"<return 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":1984.5357055664062,"y":341.33335876464844,"z":"a36563f1.0ad948","wires":[]},{"id":"ea98aac1.995a4","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":589.3571166992188,"y":1025.8332901000977,"z":"a36563f1.0ad948","wires":[]},{"id":"dbd0163e.1668b","type":"get-resource","name":"get-resource AR_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.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":1415.302146911621,"y":560.6151895523071,"z":"a36563f1.0ad948","wires":[["7a05e016.e5972","cf325cf9.468db"]]},{"id":"1175f74e.db26c9","type":"returnFailure","name":"return failure","xml":"<return 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":1862.3854637145996,"y":548.7817430496216,"z":"a36563f1.0ad948","wires":[]},{"id":"7a05e016.e5972","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1663.6355438232422,"y":544.1389589309692,"z":"a36563f1.0ad948","wires":[["1175f74e.db26c9"]]},{"id":"cf325cf9.468db","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1657.3855438232422,"y":576.6389589309692,"z":"a36563f1.0ad948","wires":[["1175f74e.db26c9"]]},{"id":"2b04d10e.4f29de","type":"switchNode","name":"switch service-instance-id","xml":"<switch test='`$brg-topology-operation-input.service-information.service-instance-id`'>\n","comments":"","outputs":1,"x":657.4285583496094,"y":312.19051361083984,"z":"a36563f1.0ad948","wires":[["d7d48977.6d4e9"]]},{"id":"d7d48977.6d4e9","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":873.8571472167969,"y":313.19051361083984,"z":"a36563f1.0ad948","wires":[["36ec22d8.8e53ae"]]},{"id":"36ec22d8.8e53ae","type":"returnFailure","name":"return failure","xml":"<return 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":1032.2856750488281,"y":312.19051361083984,"z":"a36563f1.0ad948","wires":[]},{"id":"c357fd26.93d77","type":"other","name":"create","xml":"<outcome value='create'>","comments":"","outputs":1,"x":830.7777137756348,"y":525.2407293319702,"z":"a36563f1.0ad948","wires":[["f1c69f47.9fcb8"]]},{"id":"f1c69f47.9fcb8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1023.0276031494141,"y":521.324052810669,"z":"a36563f1.0ad948","wires":[["1551962.10999ea","b7c65dae.5d181"]]},{"id":"a22f16cf.8b48b8","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":844.111083984375,"y":801.9073152542114,"z":"a36563f1.0ad948","wires":[["14f5b4d9.a09003"]]},{"id":"14f5b4d9.a09003","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1020.6111068725586,"y":799.9073696136475,"z":"a36563f1.0ad948","wires":[["1551962.10999ea","b7c65dae.5d181"]]},{"id":"1551962.10999ea","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":1511.2938537597656,"y":90.3729977607727,"z":"a36563f1.0ad948","wires":[["7f78afde.e28488"]]},{"id":"7f78afde.e28488","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1714.3296146392822,"y":95.19443893432617,"z":"a36563f1.0ad948","wires":[["cdbb13f3.95273"]]},{"id":"cdbb13f3.95273","type":"returnFailure","name":"return failure","xml":"<return 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":1899.5080833435059,"y":90.44443893432617,"z":"a36563f1.0ad948","wires":[]},{"id":"be865110.8c5cc8","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":1515.2224349975586,"y":159.3214235305786,"z":"a36563f1.0ad948","wires":[["f26f80f5.97af78"]]},{"id":"f26f80f5.97af78","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1710.7578468322754,"y":159.14284706115723,"z":"a36563f1.0ad948","wires":[["abe4d8bb.62f5e"]]},{"id":"abe4d8bb.62f5e","type":"returnFailure","name":"return failure","xml":"<return 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":1870.9363174438477,"y":158.14284706115723,"z":"a36563f1.0ad948","wires":[]},{"id":"b7c65dae.5d181","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":1530.5796127319336,"y":235.03571891784668,"z":"a36563f1.0ad948","wires":[["189a38c5.265dbf"]]},{"id":"189a38c5.265dbf","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1750.0437355041504,"y":234.67856884002686,"z":"a36563f1.0ad948","wires":[["3a46fa48.f2f996"]]},{"id":"3a46fa48.f2f996","type":"returnFailure","name":"return failure","xml":"<return 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":1901.4722023010254,"y":233.67856884002686,"z":"a36563f1.0ad948","wires":[]},{"id":"88921e9.f4a5a6","type":"switchNode","name":"switch vni","xml":"<switch test='`$brg-topology-operation-input.brg-request-input.vni`'>\n","comments":"","outputs":1,"x":1396,"y":444.3333206176758,"z":"a36563f1.0ad948","wires":[["b400611b.066288"]]},{"id":"b400611b.066288","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1635.9998779296875,"y":453.1428909301758,"z":"a36563f1.0ad948","wires":[["f6806455.7a1aa"]]},{"id":"f6806455.7a1aa","type":"returnFailure","name":"return failure","xml":"<return 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":1856.1905517578125,"y":451.14282989501953,"z":"a36563f1.0ad948","wires":[]},{"id":"9cdfba09.f3278","type":"switchNode","name":"switch brg-wan-ip-address ","xml":"<switch test='`$brg-topology-operation-input.brg-request-input.brg-wan-mac-address `'>\n","comments":"","outputs":1,"x":1444,"y":497.3333206176758,"z":"a36563f1.0ad948","wires":[["ad175cf7.05b3"]]},{"id":"ad175cf7.05b3","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1651.9998779296875,"y":497.14286041259766,"z":"a36563f1.0ad948","wires":[["5f364de9.8a5f74"]]},{"id":"5f364de9.8a5f74","type":"returnFailure","name":"return failure","xml":"<return 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":1867.1905517578125,"y":493.14282989501953,"z":"a36563f1.0ad948","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 03999446..c46f7e3e 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":"2f8b1d9a.ab851a","type":"dgstart","name":"DGSTART","outputs":1,"x":149.5,"y":208,"z":"c08d0361.c1fec","wires":[["bf2ced21.d5c"]]},{"id":"bf2ced21.d5c","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":282.23810386657715,"z":"c08d0361.c1fec","wires":[["da33b929.dd5d48"]]},{"id":"da33b929.dd5d48","type":"method","name":"validate-tunnelxconn-input","xml":"<method rpc='validate-tunnelxconn-input' mode='sync'>\n","comments":"","outputs":1,"x":277.1786193847656,"y":353.16669368743896,"z":"c08d0361.c1fec","wires":[["55b42c99.a5706c"]]},{"id":"55b42c99.a5706c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":319.2500457763672,"y":626.4434947967529,"z":"c08d0361.c1fec","wires":[["28742a55.d311c6","b8f93651.971f88","ff0fbc34.e5202","e6dab746.3ce568","9a056511.a51ba"]]},{"id":"28742a55.d311c6","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":111.09528064727783,"z":"c08d0361.c1fec","wires":[["958c0c61.fda4b"]]},{"id":"958c0c61.fda4b","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":884.0238554818288,"y":109.09527737753706,"z":"c08d0361.c1fec","wires":[["379d0d50.73d9ca"]]},{"id":"379d0d50.73d9ca","type":"returnFailure","name":"return failure","xml":"<return 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":105.76194381713867,"z":"c08d0361.c1fec","wires":[]},{"id":"b8f93651.971f88","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":64.66667938232422,"z":"c08d0361.c1fec","wires":[["ae8ab228.ab1a3"]]},{"id":"ae8ab228.ab1a3","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":882.5952758789062,"y":66.23810291290283,"z":"c08d0361.c1fec","wires":[["cf01cddc.2e1f7"]]},{"id":"cf01cddc.2e1f7","type":"returnFailure","name":"return failure","xml":"<return 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":66.238112449646,"z":"c08d0361.c1fec","wires":[]},{"id":"2b339e36.8a2812","type":"comment","name":"validate-tunnelxconn-input - CHANGELOG","info":"3/22: Initial release 1.0.0","comments":"","x":162.5,"y":112,"z":"c08d0361.c1fec","wires":[]},{"id":"ff0fbc34.e5202","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":632.000036239624,"z":"c08d0361.c1fec","wires":[["c3d0f0a0.39da5","b563c03f.3832f","5fa45c86.c51ac4","bbf811e.7be627","30f25c1d.144b84","93622f83.2756c"]]},{"id":"c3d0f0a0.39da5","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":820.2143630981445,"y":467.57146644592285,"z":"c08d0361.c1fec","wires":[["e8516b3a.0fdb2"]]},{"id":"b563c03f.3832f","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":840.4999694824219,"y":655.0000305175781,"z":"c08d0361.c1fec","wires":[["98b20158.6dbe78"]]},{"id":"5fa45c86.c51ac4","type":"other","name":"deactivate","xml":"<outcome value='deactivate'>","comments":"","outputs":1,"x":847.4999694824219,"y":745.0000305175781,"z":"c08d0361.c1fec","wires":[["fcbd032a.f083d"]]},{"id":"bbf811e.7be627","type":"other","name":"unassign","xml":"<outcome value='unassign'>","comments":"","outputs":1,"x":828.4998321533203,"y":912.3333578109741,"z":"c08d0361.c1fec","wires":[["b62d7269.ffd568"]]},{"id":"e8516b3a.0fdb2","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1018.5238189697266,"y":465.7262649536133,"z":"c08d0361.c1fec","wires":[["4cf017bd.9c50a","ef78b4aa.1786b","23634590.c34862","9f19675f.aa1a1","b8060244.131a7","5bb17440.76108c"]]},{"id":"98b20158.6dbe78","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1018.7500152587891,"y":654.750072479248,"z":"c08d0361.c1fec","wires":[["23634590.c34862","b8060244.131a7"]]},{"id":"fcbd032a.f083d","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1019.7500305175781,"y":746.0000743865967,"z":"c08d0361.c1fec","wires":[["23634590.c34862","b8060244.131a7"]]},{"id":"b62d7269.ffd568","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1017.4998931884766,"y":912.8333883285522,"z":"c08d0361.c1fec","wires":[["23634590.c34862"]]},{"id":"4cf017bd.9c50a","type":"switchNode","name":"switch brg-wan-mac-address","xml":"<switch test='`$tunnelxconn-topology-operation-input.brg-wan-mac-address`'>\n","comments":"","outputs":1,"x":1425.6190185546875,"y":460.2976379394531,"z":"c08d0361.c1fec","wires":[["e9e09452.4fe688"]]},{"id":"e9e09452.4fe688","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1633.618896484375,"y":460.107177734375,"z":"c08d0361.c1fec","wires":[["5dfcedf9.eaa5fc"]]},{"id":"5dfcedf9.eaa5fc","type":"returnFailure","name":"return failure","xml":"<return 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.brg-wan-mac-address is a required input\" />\n","comments":"","x":1848.8095703125,"y":456.1071472167969,"z":"c08d0361.c1fec","wires":[]},{"id":"5bb17440.76108c","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":1581.6072998046875,"y":374.0000915527344,"z":"c08d0361.c1fec","wires":[["f24ac93d.d8461"]]},{"id":"f24ac93d.d8461","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1862.607177734375,"y":374.0000305175781,"z":"c08d0361.c1fec","wires":[["3837b467.eaa36c"]]},{"id":"3837b467.eaa36c","type":"returnFailure","name":"return failure","xml":"<return 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":369.00003814697266,"z":"c08d0361.c1fec","wires":[]},{"id":"e6dab746.3ce568","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":1053.4999694824219,"z":"c08d0361.c1fec","wires":[]},{"id":"ef78b4aa.1786b","type":"get-resource","name":"get-resource AR_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.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":588.2818689346313,"z":"c08d0361.c1fec","wires":[["b392ca6b.8d1418","83f15138.3fb0d8"]]},{"id":"6ca5192.30e0668","type":"returnFailure","name":"return failure","xml":"<return 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":576.4484224319458,"z":"c08d0361.c1fec","wires":[]},{"id":"b392ca6b.8d1418","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1660.1355438232422,"y":571.8056383132935,"z":"c08d0361.c1fec","wires":[["6ca5192.30e0668"]]},{"id":"83f15138.3fb0d8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1653.8855438232422,"y":604.3056383132935,"z":"c08d0361.c1fec","wires":[["6ca5192.30e0668"]]},{"id":"9a056511.a51ba","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":339.85719299316406,"z":"c08d0361.c1fec","wires":[["ba76ef7b.0d7f6"]]},{"id":"ba76ef7b.0d7f6","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":870.3571472167969,"y":340.85719299316406,"z":"c08d0361.c1fec","wires":[["a8acc626.d7a2c"]]},{"id":"a8acc626.d7a2c","type":"returnFailure","name":"return failure","xml":"<return 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":339.85719299316406,"z":"c08d0361.c1fec","wires":[]},{"id":"30f25c1d.144b84","type":"other","name":"create","xml":"<outcome value='create'>","comments":"","outputs":1,"x":827.2777137756348,"y":552.9074087142944,"z":"c08d0361.c1fec","wires":[["ba2778d3.3a60e8"]]},{"id":"ba2778d3.3a60e8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1019.5276031494141,"y":548.9907321929932,"z":"c08d0361.c1fec","wires":[["23634590.c34862","b8060244.131a7"]]},{"id":"93622f83.2756c","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":840.611083984375,"y":829.5739946365356,"z":"c08d0361.c1fec","wires":[["72b18f16.a14f28"]]},{"id":"72b18f16.a14f28","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1017.1111068725586,"y":827.5740489959717,"z":"c08d0361.c1fec","wires":[["23634590.c34862","b8060244.131a7"]]},{"id":"23634590.c34862","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":118.03967714309692,"z":"c08d0361.c1fec","wires":[["458aeb95.6d8efc"]]},{"id":"458aeb95.6d8efc","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1710.8296146392822,"y":122.86111831665039,"z":"c08d0361.c1fec","wires":[["2f7031d7.ca8d76"]]},{"id":"2f7031d7.ca8d76","type":"returnFailure","name":"return failure","xml":"<return 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":118.11111831665039,"z":"c08d0361.c1fec","wires":[]},{"id":"9f19675f.aa1a1","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":186.98810291290283,"z":"c08d0361.c1fec","wires":[["a573df4b.d2b7a8"]]},{"id":"a573df4b.d2b7a8","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1707.2578468322754,"y":186.80952644348145,"z":"c08d0361.c1fec","wires":[["d6dc873d.36537"]]},{"id":"d6dc873d.36537","type":"returnFailure","name":"return failure","xml":"<return 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":185.80952644348145,"z":"c08d0361.c1fec","wires":[]},{"id":"b8060244.131a7","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":262.7023983001709,"z":"c08d0361.c1fec","wires":[["b38c7be2.1435f8"]]},{"id":"b38c7be2.1435f8","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1746.5437355041504,"y":262.3452482223511,"z":"c08d0361.c1fec","wires":[["e78ac273.3df9f"]]},{"id":"e78ac273.3df9f","type":"returnFailure","name":"return failure","xml":"<return 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":261.3452482223511,"z":"c08d0361.c1fec","wires":[]}]
-\ No newline at end of file
+[{"id":"b5d823fd.7aecd8","type":"dgstart","name":"DGSTART","outputs":1,"x":277,"y":231.33332061767578,"z":"f8bd12f.b396cf","wires":[["6e521d4c.c8568c"]]},{"id":"6e521d4c.c8568c","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":375.78570556640625,"y":305.57142448425293,"z":"f8bd12f.b396cf","wires":[["b8160df1.2602f"]]},{"id":"b8160df1.2602f","type":"method","name":"validate-tunnelxconn-input","xml":"<method rpc='validate-tunnelxconn-input' mode='sync'>\n","comments":"","outputs":1,"x":404.6786193847656,"y":376.50001430511475,"z":"f8bd12f.b396cf","wires":[["94d9cfb6.819148"]]},{"id":"94d9cfb6.819148","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":446.7500457763672,"y":649.7768154144287,"z":"f8bd12f.b396cf","wires":[["d455ef78.1d6598","c59c08c5.9e1d28","89097d35.bba9a8","5137004e.8046f","4ef641b2.88622"]]},{"id":"d455ef78.1d6598","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":781.8095703125,"y":134.4286012649536,"z":"f8bd12f.b396cf","wires":[["1677921a.244246"]]},{"id":"1677921a.244246","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1011.5238554818288,"y":132.42859799521284,"z":"f8bd12f.b396cf","wires":[["f70a4626.6b8008"]]},{"id":"f70a4626.6b8008","type":"returnFailure","name":"return failure","xml":"<return 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":1162.9523620605469,"y":129.09526443481445,"z":"f8bd12f.b396cf","wires":[]},{"id":"c59c08c5.9e1d28","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":774.3809204101562,"y":88,"z":"f8bd12f.b396cf","wires":[["9bf5b798.389e88"]]},{"id":"9bf5b798.389e88","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1010.0952758789062,"y":89.57142353057861,"z":"f8bd12f.b396cf","wires":[["358e5ae0.ec086e"]]},{"id":"358e5ae0.ec086e","type":"returnFailure","name":"return failure","xml":"<return 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":1160.0952491760254,"y":89.57143306732178,"z":"f8bd12f.b396cf","wires":[]},{"id":"7d1a58d7.ff8ef","type":"comment","name":"validate-tunnelxconn-input - CHANGELOG","info":"3/22: Initial release 1.0.0","comments":"","x":290,"y":135.33332061767578,"z":"f8bd12f.b396cf","wires":[]},{"id":"89097d35.bba9a8","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":686.6666603088379,"y":655.3333568572998,"z":"f8bd12f.b396cf","wires":[["52a3ca72.39a0d4","edd735a8.344048","385d4044.9b32e","f6365d4e.03ea3","33745c85.f01734","b81789f9.0a9b5"]]},{"id":"52a3ca72.39a0d4","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":947.7143630981445,"y":490.90478706359863,"z":"f8bd12f.b396cf","wires":[["59acb47.2b0fccc"]]},{"id":"edd735a8.344048","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":967.9999694824219,"y":678.3333511352539,"z":"f8bd12f.b396cf","wires":[["a738b59f.50a53"]]},{"id":"385d4044.9b32e","type":"other","name":"deactivate","xml":"<outcome value='deactivate'>","comments":"","outputs":1,"x":974.9999694824219,"y":768.3333511352539,"z":"f8bd12f.b396cf","wires":[["f55bfd08.6c8a7"]]},{"id":"f6365d4e.03ea3","type":"other","name":"unassign","xml":"<outcome value='unassign'>","comments":"","outputs":1,"x":955.9998321533203,"y":935.6666784286499,"z":"f8bd12f.b396cf","wires":[["1e5b3ae5.5059e5"]]},{"id":"59acb47.2b0fccc","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1146.0238189697266,"y":489.05958557128906,"z":"f8bd12f.b396cf","wires":[["8e59346d.9fe89","3fa9f650.04461a","9e8069fd.cb145","111c545d.ab113c","be2f1214.6804a","f79569f8.dbee3"]]},{"id":"a738b59f.50a53","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1146.250015258789,"y":678.0833930969238,"z":"f8bd12f.b396cf","wires":[["9e8069fd.cb145","be2f1214.6804a"]]},{"id":"f55bfd08.6c8a7","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1147.2500305175781,"y":769.3333950042725,"z":"f8bd12f.b396cf","wires":[["9e8069fd.cb145","be2f1214.6804a"]]},{"id":"1e5b3ae5.5059e5","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1144.9998931884766,"y":936.166708946228,"z":"f8bd12f.b396cf","wires":[["9e8069fd.cb145"]]},{"id":"8e59346d.9fe89","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":1553.1190185546875,"y":483.6309585571289,"z":"f8bd12f.b396cf","wires":[["90bd782.9309f88"]]},{"id":"90bd782.9309f88","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1761.118896484375,"y":483.4404983520508,"z":"f8bd12f.b396cf","wires":[["c04d13fe.02c76"]]},{"id":"c04d13fe.02c76","type":"returnFailure","name":"return failure","xml":"<return 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.brg-wan-mac-address is a required input\" />\n","comments":"","x":1976.3095703125,"y":479.44046783447266,"z":"f8bd12f.b396cf","wires":[]},{"id":"f79569f8.dbee3","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":1709.1072998046875,"y":397.33341217041016,"z":"f8bd12f.b396cf","wires":[["589e1791.76a778"]]},{"id":"589e1791.76a778","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1990.107177734375,"y":397.3333511352539,"z":"f8bd12f.b396cf","wires":[["5420fa60.f9fd94"]]},{"id":"5420fa60.f9fd94","type":"returnFailure","name":"return failure","xml":"<return 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":2108.5357055664062,"y":392.33335876464844,"z":"f8bd12f.b396cf","wires":[]},{"id":"5137004e.8046f","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":713.3571166992188,"y":1076.8332901000977,"z":"f8bd12f.b396cf","wires":[]},{"id":"3fa9f650.04461a","type":"get-resource","name":"get-resource AR_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.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":1539.302146911621,"y":611.6151895523071,"z":"f8bd12f.b396cf","wires":[["342a2062.3016f","3c94fe8c.f9c48a"]]},{"id":"ac2ca07c.8f157","type":"returnFailure","name":"return failure","xml":"<return 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":1986.3854637145996,"y":599.7817430496216,"z":"f8bd12f.b396cf","wires":[]},{"id":"342a2062.3016f","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1787.6355438232422,"y":595.1389589309692,"z":"f8bd12f.b396cf","wires":[["ac2ca07c.8f157"]]},{"id":"3c94fe8c.f9c48a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1781.3855438232422,"y":627.6389589309692,"z":"f8bd12f.b396cf","wires":[["ac2ca07c.8f157"]]},{"id":"4ef641b2.88622","type":"switchNode","name":"switch service-instance-id","xml":"<switch test='`$tunnelxconn-topology-operation-input.service-information.service-instance-id`'>\n","comments":"","outputs":1,"x":781.4285583496094,"y":363.19051361083984,"z":"f8bd12f.b396cf","wires":[["5c2101ed.68426"]]},{"id":"5c2101ed.68426","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":997.8571472167969,"y":364.19051361083984,"z":"f8bd12f.b396cf","wires":[["e8805a43.764d7"]]},{"id":"e8805a43.764d7","type":"returnFailure","name":"return failure","xml":"<return 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":1156.2856750488281,"y":363.19051361083984,"z":"f8bd12f.b396cf","wires":[]},{"id":"33745c85.f01734","type":"other","name":"create","xml":"<outcome value='create'>","comments":"","outputs":1,"x":954.7777137756348,"y":576.2407293319702,"z":"f8bd12f.b396cf","wires":[["27b1a5c9.703fb2"]]},{"id":"27b1a5c9.703fb2","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1147.027603149414,"y":572.324052810669,"z":"f8bd12f.b396cf","wires":[["9e8069fd.cb145","be2f1214.6804a"]]},{"id":"b81789f9.0a9b5","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":968.111083984375,"y":852.9073152542114,"z":"f8bd12f.b396cf","wires":[["5be27043.6b85f"]]},{"id":"5be27043.6b85f","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1144.6111068725586,"y":850.9073696136475,"z":"f8bd12f.b396cf","wires":[["9e8069fd.cb145","be2f1214.6804a"]]},{"id":"9e8069fd.cb145","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":1635.2938537597656,"y":141.3729977607727,"z":"f8bd12f.b396cf","wires":[["637ba4be.9495e4"]]},{"id":"637ba4be.9495e4","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1838.3296146392822,"y":146.19443893432617,"z":"f8bd12f.b396cf","wires":[["c80adb0c.bf9c4"]]},{"id":"c80adb0c.bf9c4","type":"returnFailure","name":"return failure","xml":"<return 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":2023.5080833435059,"y":141.44443893432617,"z":"f8bd12f.b396cf","wires":[]},{"id":"111c545d.ab113c","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":1639.2224349975586,"y":210.3214235305786,"z":"f8bd12f.b396cf","wires":[["cf5ac7f9.65d6a"]]},{"id":"cf5ac7f9.65d6a","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1834.7578468322754,"y":210.14284706115723,"z":"f8bd12f.b396cf","wires":[["90dc41a5.b5f198"]]},{"id":"90dc41a5.b5f198","type":"returnFailure","name":"return failure","xml":"<return 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":1994.9363174438477,"y":209.14284706115723,"z":"f8bd12f.b396cf","wires":[]},{"id":"be2f1214.6804a","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":1654.5796127319336,"y":286.0357189178467,"z":"f8bd12f.b396cf","wires":[["fb65b1f0.8c6598"]]},{"id":"fb65b1f0.8c6598","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1874.0437355041504,"y":285.67856884002686,"z":"f8bd12f.b396cf","wires":[["d1d452a4.07303"]]},{"id":"d1d452a4.07303","type":"returnFailure","name":"return failure","xml":"<return 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":2025.4722023010254,"y":284.67856884002686,"z":"f8bd12f.b396cf","wires":[]}]
+\ No newline at end of file
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 191556db..442e66be 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
@@ -124,7 +124,7 @@ value="`$brg-ar-identifiers.`" />
 
 
 </set><set>
-<parameter name='brg-ar-assignments.vbrg-wan-ip' value='`$brg-topology-operation-input.brg-request-input.brg-wan-ip-address`'/>
+<parameter name='brg-ar-assignments.vbrg-wan-ip' value='127.0.0.1'/>
 </set><set>
 <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.' 
 value="`$brg-ar-assignments.`" />
@@ -145,7 +145,8 @@ value="`$brg-ar-assignments.`" />
 <block atomic="true"><set>
 <parameter name='tmp.cidx' value='`$cidx`' />
 <parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />
-<parameter name='tmp.found-cidx' value='true' /></set><break/></block></outcome></switch></for><switch test='`$tmp.found-cidx`'>
+<parameter name='tmp.found-cidx' value='true' /></set><break/>
+</break></block></outcome></switch></for><switch test='`$tmp.found-cidx`'>
 <outcome value='false'>
 <block atomic="true"><set>
 <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
@@ -233,4 +234,4 @@ value="`$brg-ar-assignments.`" />
 <parameter name="ack-final-indicator" value="Y" />
 <parameter name="error-code" value="200" />
 <parameter name="error-message" value="`$error-message`" />
-</return></block></outcome></get-resource></block></method></service-logic>
+</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_validate-brg-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml
index a695f198..c63efde9 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
@@ -45,7 +45,7 @@
 	<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.brg-wan-ip-address `'>
+</return></outcome></switch><switch test='`$brg-topology-operation-input.brg-request-input.brg-wan-mac-address `'>
 <outcome value=''><return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
@@ -113,4 +113,4 @@
 <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>
+</return></block></method></service-logic>
+\ No newline at end of file
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 907f7342..3cf8e6ed 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,7 +35,7 @@
 	<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.brg-wan-mac-address`'>
+</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" />
author	Dan Timoney <dtimoney@att.com>	2017-11-03 18:09:16 -0400
committer	Dan Timoney <dtimoney@att.com>	2017-11-03 18:09:16 -0400
commit	e9c89799f4c5eaf5eddea7591aefbd5ec666d8da (patch)
tree	ff360bc954f41cfeb6f28d76c81f8b6b14e98c8c /platform-logic/generic-resource-api
parent	015799def0f582771db21095a51201a84a66dd53 (diff)