Merge "Update brg topo deactivate"

Former-commit-id: 49bfccc6c1bd60f23646770d54e5266e94207787

2 files changed, 1009 insertions, 116 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.json
index ac466737..4a2921bf 100755
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.json
@@ -1 +1,825 @@
-[{"id":"284e27db.b7e5d8","type":"dgstart","name":"DGSTART","outputs":1,"x":184.2857208251953,"y":55.71428680419922,"z":"65a9f6a1.13f7b8","wires":[["21dc623f.cc352e"]]},{"id":"21dc623f.cc352e","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":280.52379989624023,"y":116.66667747497559,"z":"65a9f6a1.13f7b8","wires":[["eacf77e9.837ad8"]]},{"id":"eacf77e9.837ad8","type":"method","name":"brg-topology-operation-deactivate","xml":"<method rpc='brg-topology-operation-deactivate' mode='sync'>\n","comments":"","outputs":1,"x":326.44057846069336,"y":151.9047327041626,"z":"65a9f6a1.13f7b8","wires":[["509784b4.18024c"]]},{"id":"509784b4.18024c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":234.76191329956055,"y":295.2380747795105,"z":"65a9f6a1.13f7b8","wires":[["e886f0a3.d1a26","29d9b6af.98a21a","8e5a9b8c.613e38","32c0247b.626e1c","de1f88fd.80fcb8","b9651040.0d909","36f9c9aa.1518a6","91736aaa.410ef8","fe89c5c7.b078a8","5c2248b0.cff7c8","f23600d4.282d8","3eb0bb84.9332a4"]]},{"id":"29d9b6af.98a21a","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","x":501.285831451416,"y":964.9287948608398,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"e886f0a3.d1a26","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":530.0397453308105,"y":929.0513410568237,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"5c2248b0.cff7c8","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":541.0399627685547,"y":675.7657089233398,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"32c0247b.626e1c","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n","comments":"","x":497.0237846374512,"y":269.0476121902466,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"8e5a9b8c.613e38","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />\n\n\n","comments":"","x":544.2830467224121,"y":235.30687808990479,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"de1f88fd.80fcb8","type":"execute","name":"execute Properties","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n","comments":"","outputs":1,"x":503.2791404724121,"y":304.9458112716675,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"36f9c9aa.1518a6","type":"execute","name":"execute RestApiCallNode - Get AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":565.8044738769531,"y":466.17377853393555,"z":"65a9f6a1.13f7b8","wires":[["e544ca46.98ecd8","e932d850.0e3608"]]},{"id":"b9651040.0d909","type":"execute","name":"generate allotted-resource url","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.brg-allottedresource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n    <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n","comments":"","outputs":1,"x":531.3505744934082,"y":364.7315158843994,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"e544ca46.98ecd8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":823.1006126403809,"y":464.9815390110016,"z":"65a9f6a1.13f7b8","wires":[["4acc39b.9104dc8"]]},{"id":"91736aaa.410ef8","type":"execute","name":"execute RestApiCallNode - PUT AR by id","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n","comments":"","outputs":1,"x":573.8150329589844,"y":819.1484184265137,"z":"65a9f6a1.13f7b8","wires":[["c7834590.fcdd68","7bc04e80.8eb95","a95d7c62.d143f"]]},{"id":"c7834590.fcdd68","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":844.1230506896973,"y":872.1466192230582,"z":"65a9f6a1.13f7b8","wires":[["7bf6e2d9.60f5ec"]]},{"id":"7bc04e80.8eb95","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":835.1231002807617,"y":840.6466449722648,"z":"65a9f6a1.13f7b8","wires":[["7bf6e2d9.60f5ec"]]},{"id":"a95d7c62.d143f","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":838.8731384277344,"y":811.0037498474121,"z":"65a9f6a1.13f7b8","wires":[["50148bc2.55e4c4"]]},{"id":"7bf6e2d9.60f5ec","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for brg-allotted-resource\" />\n","comments":"","x":1004.8731384277344,"y":841.3966688141227,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"4acc39b.9104dc8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1004.1005668640137,"y":465.4814884662628,"z":"65a9f6a1.13f7b8","wires":[["524c404c.c6e87","712583b3.96568c"]]},{"id":"524c404c.c6e87","type":"switchNode","name":"switch brg length","xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1249.9578132629395,"y":499.7672517299652,"z":"65a9f6a1.13f7b8","wires":[["3ad43779.db66e8"]]},{"id":"3ad43779.db66e8","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1440.9578170776367,"y":499.7672493457794,"z":"65a9f6a1.13f7b8","wires":[["4a46e9c4.f9d128"]]},{"id":"a70a2794.6d9408","type":"set","name":"set brg-ar from get","xml":"<set>\n<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />\n","comments":"","x":1840.8149528503418,"y":500.33867359161377,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"4a46e9c4.f9d128","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1611.8148002624512,"y":500.33871841430664,"z":"65a9f6a1.13f7b8","wires":[["a70a2794.6d9408","b61c60b8.7a4ec","66e00065.03ca4"]]},{"id":"b61c60b8.7a4ec","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1838.8151969909668,"y":567.767237663269,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"ae8a5e82.01315","type":"comment","name":"GET brg-allotted-resource from mdsal","info":"","comments":"","x":591.1005363464355,"y":429.4814794063568,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"66e00065.03ca4","type":"switchNode","name":"switch order-status","xml":"<switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1848.8149757385254,"y":533.3386716842651,"z":"65a9f6a1.13f7b8","wires":[["65fba3ae.02978c","709a0f22.b2207"]]},{"id":"65fba3ae.02978c","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2060.4149322509766,"y":494.33867168426514,"z":"65a9f6a1.13f7b8","wires":[["389e0eec.32fdf2"]]},{"id":"709a0f22.b2207","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2086.129306793213,"y":529.7672624588013,"z":"65a9f6a1.13f7b8","wires":[["389e0eec.32fdf2"]]},{"id":"c232dfd.abca22","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":546.6243591308594,"y":520.0529327392578,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"712583b3.96568c","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-brg-ar' value='$mdsal-ar.' />\n","comments":"","x":1329.6721458435059,"y":465.48158049583435,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"dd477519.74e698","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":502.24338150024414,"y":334.33864307403564,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"50148bc2.55e4c4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":980.5291061401367,"y":807.1959190368652,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"f27feeff.247c1","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":508.81481170654297,"y":712.6244564056396,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"fe89c5c7.b078a8","type":"execute","name":"execute getTime","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n    <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n","comments":"","outputs":1,"x":488.52910232543945,"y":637.1958417892456,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"e932d850.0e3608","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":822.8624076843262,"y":501.19571185112,"z":"65a9f6a1.13f7b8","wires":[["44f65ab4.13daa4"]]},{"id":"44f65ab4.13daa4","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1002.8623580932617,"y":501.8622624874115,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"f23600d4.282d8","type":"set","name":"set id","xml":"<set>\n<parameter name='brg-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='brg-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='brg-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='brg-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />","comments":"","x":471.5291442871094,"y":556.8624534606934,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"389e0eec.32fdf2","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2274.8854484558105,"y":495.71430587768555,"z":"65a9f6a1.13f7b8","wires":[[]]},{"id":"3eb0bb84.9332a4","type":"update","name":"update AAI allotted-resource","xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"operational-status\" value=\"out-of-service-path\" />\n","comments":"","outputs":1,"x":535.7142944335938,"y":754.2857055664062,"z":"65a9f6a1.13f7b8","wires":[["a77d093e.701398","a0e58ee0.5d11b"]]},{"id":"a77d093e.701398","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":791.476203918457,"y":737.2382092475891,"z":"65a9f6a1.13f7b8","wires":[["dce668a3.1b94f8"]]},{"id":"dce668a3.1b94f8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"AAI failed\" />\n","comments":"","x":958.0000839233398,"y":748.857280254364,"z":"65a9f6a1.13f7b8","wires":[]},{"id":"a0e58ee0.5d11b","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":798.5714912414551,"y":770.0001769065857,"z":"65a9f6a1.13f7b8","wires":[["dce668a3.1b94f8"]]}]
+[
+  {
+    "id":"b1368b6a.79f1a8",
+    "type":"dgstart",
+    "name":"DGSTART",
+    "outputs":1,
+    "x":190,
+    "y":152,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "12b1f941.e5c857"
+      ]
+    ]
+  },
+  {
+    "id":"12b1f941.e5c857",
+    "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":286.2380790710449,
+    "y":212.95239067077637,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "ead35ce1.7590c"
+      ]
+    ]
+  },
+  {
+    "id":"ead35ce1.7590c",
+    "type":"method",
+    "name":"brg-topology-operation-deactivate",
+    "xml":"<method rpc='brg-topology-operation-deactivate' mode='sync'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":332.15485763549805,
+    "y":248.19044589996338,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "43ac6a92.ae5614"
+      ]
+    ]
+  },
+  {
+    "id":"43ac6a92.ae5614",
+    "type":"block",
+    "name":"block : atomic",
+    "xml":"<block atomic=\"true\">",
+    "atomic":"true",
+    "comments":"",
+    "outputs":1,
+    "x":240.47619247436523,
+    "y":391.5237879753113,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "5240106e.51f63",
+        "4041ad49.6fc0d4",
+        "8ab3e562.da6e08",
+        "93b0d070.cd7e4",
+        "1ece8431.af7f1c",
+        "ed70c5f.ebd7238",
+        "200bf55c.cf936a",
+        "1b6f2d6b.b6acc3",
+        "2a34aedb.e483f2",
+        "b55b0b52.943508",
+        "5aa308ce.dba788",
+        "626eb0d9.80b5f",
+        "5cd8e25b.be574c",
+        "7f3389ec.e8f508",
+        "eafe9188.1bdec",
+        "cfdbb6d9.39b868"
+      ]
+    ]
+  },
+  {
+    "id":"4041ad49.6fc0d4",
+    "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":499.00007247924805,
+    "y":1351.2144346237183,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"5240106e.51f63",
+    "type":"set",
+    "name":"set output to api handler",
+    "xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
+    "comments":"",
+    "x":527.7539863586426,
+    "y":1315.3369808197021,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"b55b0b52.943508",
+    "type":"set",
+    "name":"set allotted-resource-oper-status",
+    "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
+    "comments":"",
+    "x":546.7542419433594,
+    "y":772.0514221191406,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"93b0d070.cd7e4",
+    "type":"set",
+    "name":"set tmp.ar.self-link",
+    "xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n",
+    "comments":"",
+    "x":502.73806381225586,
+    "y":365.33332538604736,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"8ab3e562.da6e08",
+    "type":"set",
+    "name":"set tmp.ar.allotted-resource-id,etc",
+    "xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />\n\n\n",
+    "comments":"",
+    "x":549.9973258972168,
+    "y":331.59259128570557,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"1ece8431.af7f1c",
+    "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":508.9934196472168,
+    "y":401.23152446746826,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"200bf55c.cf936a",
+    "type":"execute",
+    "name":"execute RestApiCallNode - Get AR by id",
+    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
+    "comments":"",
+    "outputs":1,
+    "x":571.5187530517578,
+    "y":562.4594917297363,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "f39b8deb.2497f",
+        "d49f2a4f.e657d8"
+      ]
+    ]
+  },
+  {
+    "id":"ed70c5f.ebd7238",
+    "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":537.0648536682129,
+    "y":461.0172290802002,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"f39b8deb.2497f",
+    "type":"success",
+    "name":"success",
+    "xml":"<outcome value='success'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":828.8148918151855,
+    "y":561.2672522068024,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "ce9ddc22.dec85"
+      ]
+    ]
+  },
+  {
+    "id":"1b6f2d6b.b6acc3",
+    "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":579.5293121337891,
+    "y":915.4341316223145,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "db318a86.7bd678",
+        "474202ef.7e725c",
+        "926f3792.9db948"
+      ]
+    ]
+  },
+  {
+    "id":"db318a86.7bd678",
+    "type":"not-found",
+    "name":"not-found",
+    "xml":"<outcome value='not-found'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":849.837329864502,
+    "y":968.432332418859,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "5154d5ef.e6843c"
+      ]
+    ]
+  },
+  {
+    "id":"474202ef.7e725c",
+    "type":"failure",
+    "name":"failure",
+    "xml":"<outcome value='failure'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":840.8373794555664,
+    "y":936.9323581680655,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "5154d5ef.e6843c"
+      ]
+    ]
+  },
+  {
+    "id":"926f3792.9db948",
+    "type":"success",
+    "name":"success",
+    "xml":"<outcome value='success'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":844.5874176025391,
+    "y":907.2894630432129,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "8791e6de.a42b98"
+      ]
+    ]
+  },
+  {
+    "id":"5154d5ef.e6843c",
+    "type":"returnFailure",
+    "name":"return failure",
+    "xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for brg-allotted-resource\" />\n",
+    "comments":"",
+    "x":1010.5874176025391,
+    "y":937.6823820099235,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"ce9ddc22.dec85",
+    "type":"block",
+    "name":"block: atomic",
+    "xml":"<block atomic=\"true\">\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":1009.8148460388184,
+    "y":561.7672016620636,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "ff1004f9.28ea78",
+        "19849de2.3d4d92"
+      ]
+    ]
+  },
+  {
+    "id":"ff1004f9.28ea78",
+    "type":"switchNode",
+    "name":"switch brg length",
+    "xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":1255.6720924377441,
+    "y":596.052964925766,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "458ac54.5835d3c"
+      ]
+    ]
+  },
+  {
+    "id":"458ac54.5835d3c",
+    "type":"other",
+    "name":"outcome 1",
+    "xml":"<outcome value='1'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":1446.6720962524414,
+    "y":596.0529625415802,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "136fba4.57e3046"
+      ]
+    ]
+  },
+  {
+    "id":"1ea71bb3.19d8e4",
+    "type":"set",
+    "name":"set brg-ar from get",
+    "xml":"<set>\n<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />\n",
+    "comments":"",
+    "x":1846.5292320251465,
+    "y":596.6243867874146,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"136fba4.57e3046",
+    "type":"block",
+    "name":"block: atomic",
+    "xml":"<block atomic='true'>\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":1617.5290794372559,
+    "y":596.6244316101074,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "1ea71bb3.19d8e4",
+        "15299399.5fe66c",
+        "7d67802a.2315b"
+      ]
+    ]
+  },
+  {
+    "id":"15299399.5fe66c",
+    "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":1844.5294761657715,
+    "y":664.0529508590698,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"6ea9033a.90574c",
+    "type":"comment",
+    "name":"GET brg-allotted-resource from mdsal",
+    "info":"",
+    "comments":"",
+    "x":596.8148155212402,
+    "y":525.7671926021576,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"7d67802a.2315b",
+    "type":"switchNode",
+    "name":"switch order-status",
+    "xml":"<switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":1854.52925491333,
+    "y":629.6243848800659,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "fc9ac41f.bda4b8",
+        "9800dbd8.9df6f8"
+      ]
+    ]
+  },
+  {
+    "id":"fc9ac41f.bda4b8",
+    "type":"outcome",
+    "name":"outcome Created",
+    "xml":"<outcome value='Created'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2066.1292114257812,
+    "y":590.6243848800659,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "4ecdc306.3d668c"
+      ]
+    ]
+  },
+  {
+    "id":"9800dbd8.9df6f8",
+    "type":"outcome",
+    "name":"outcome Other",
+    "xml":"<outcome value='Other'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":2091.8435859680176,
+    "y":626.052975654602,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "4ecdc306.3d668c"
+      ]
+    ]
+  },
+  {
+    "id":"a5baa812.7889a8",
+    "type":"comment",
+    "name":"Set allotted-resource-identifiers",
+    "info":"",
+    "comments":"",
+    "x":552.3386383056641,
+    "y":616.3386459350586,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"19849de2.3d4d92",
+    "type":"set",
+    "name":"save backup copy of mdsal-ar for rollback",
+    "xml":"<set>\n<parameter name='bk-brg-ar' value='$mdsal-ar.' />\n",
+    "comments":"",
+    "x":1335.3864250183105,
+    "y":561.7672936916351,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"2e3d5c7a.18d844",
+    "type":"comment",
+    "name":"Create urls for restapi",
+    "info":"",
+    "comments":"",
+    "x":507.9576606750488,
+    "y":430.6243562698364,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"8791e6de.a42b98",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":986.2433853149414,
+    "y":903.481632232666,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"2006c488.4b571c",
+    "type":"comment",
+    "name":"TO DO: vnf/put parent",
+    "info":"",
+    "comments":"",
+    "x":514.5290908813477,
+    "y":808.9101696014404,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"2a34aedb.e483f2",
+    "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":494.24338150024414,
+    "y":733.4815549850464,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"d49f2a4f.e657d8",
+    "type":"other",
+    "name":"other",
+    "xml":"<outcome value='Other'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":828.5766868591309,
+    "y":597.4814250469208,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "86c72346.242ce"
+      ]
+    ]
+  },
+  {
+    "id":"86c72346.242ce",
+    "type":"block",
+    "name":"block: atomic",
+    "xml":"<block atomic=\"true\">\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":1008.5766372680664,
+    "y":598.1479756832123,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"5aa308ce.dba788",
+    "type":"set",
+    "name":"set id",
+    "xml":"<set>\n<parameter name='brg-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='brg-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='brg-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='brg-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />",
+    "comments":"",
+    "x":477.24342346191406,
+    "y":653.1481666564941,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"4ecdc306.3d668c",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":2280.5997276306152,
+    "y":592.0000190734863,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"626eb0d9.80b5f",
+    "type":"update",
+    "name":"update AAI allotted-resource",
+    "xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"operational-status\" value=\"out-of-service-path\" />\n",
+    "comments":"",
+    "outputs":1,
+    "x":541.4285736083984,
+    "y":850.571418762207,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "55679e7c.9aaca",
+        "9789b3b6.f6b9b"
+      ]
+    ]
+  },
+  {
+    "id":"55679e7c.9aaca",
+    "type":"failure",
+    "name":"failure",
+    "xml":"<outcome value='failure'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":797.1904830932617,
+    "y":833.5239224433899,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "d1259b.54422a68"
+      ]
+    ]
+  },
+  {
+    "id":"d1259b.54422a68",
+    "type":"returnFailure",
+    "name":"return failure",
+    "xml":"<return 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":963.7143630981445,
+    "y":845.1429934501648,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"9789b3b6.f6b9b",
+    "type":"failure",
+    "name":"not-found",
+    "xml":"<outcome value='not-found'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":804.2857704162598,
+    "y":866.2858901023865,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "d1259b.54422a68"
+      ]
+    ]
+  },
+  {
+    "id":"cfdbb6d9.39b868",
+    "type":"execute",
+    "name":"execute RestApiCallNode - delete BRG to vgMux vxlan tunnel port",
+    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url`' />\n    <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\n    <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n",
+    "comments":"",
+    "outputs":1,
+    "x":651.999885559082,
+    "y":1190.9600343704224,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "60fe5d9f.60f184",
+        "12fb290a.532107",
+        "8c68b450.cb4ca8"
+      ]
+    ]
+  },
+  {
+    "id":"60fe5d9f.60f184",
+    "type":"not-found",
+    "name":"not-found",
+    "xml":"<outcome value='not-found'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":1073.9747009277344,
+    "y":1228.2916730865836,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "3f807288.3735ae"
+      ]
+    ]
+  },
+  {
+    "id":"12fb290a.532107",
+    "type":"failure",
+    "name":"failure",
+    "xml":"<outcome value='failure'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":1064.9747505187988,
+    "y":1196.7916988357902,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "3f807288.3735ae"
+      ]
+    ]
+  },
+  {
+    "id":"8c68b450.cb4ca8",
+    "type":"success",
+    "name":"success",
+    "xml":"<outcome value='success'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":1068.7247886657715,
+    "y":1167.1488037109375,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+        "c8426dda.6a34f"
+      ]
+    ]
+  },
+  {
+    "id":"3f807288.3735ae",
+    "type":"returnFailure",
+    "name":"return failure",
+    "xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for brg-allotted-resource\" />\n",
+    "comments":"",
+    "x":1234.7247886657715,
+    "y":1197.541722677648,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"c8426dda.6a34f",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":1210.3807563781738,
+    "y":1163.3409729003906,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"7f3389ec.e8f508",
+    "type":"set",
+    "name":"set BRG to vgMUX VXLAN Tunnel Port Props",
+    "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`'vxlanTun' + $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-lan-ip` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` \" />",
+    "comments":"",
+    "x":590.1111335754395,
+    "y":1089.9602737426758,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"eafe9188.1bdec",
+    "type":"execute",
+    "name":"generate full brg-vpp-honeycomb url",
+    "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.vpp-honeycomb`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.vpp-honeycomb-url\"/>\n    <parameter name=\"target\" value=\"{tunnel-name}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.tunnel-name`\"/>\n",
+    "comments":"",
+    "outputs":1,
+    "x":559.7776985168457,
+    "y":1134.9600372314453,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"5cd8e25b.be574c",
+    "type":"execute",
+    "name":"generate honeycomb-url to vBRG",
+    "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.honeycomb.url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.honeycomb.url\"/>\n    <parameter name=\"target\" value=\"{honeycomb-instance-ip}\"/>\n    <parameter name=\"replacement\" value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip`\"/>\n",
+    "comments":"",
+    "outputs":1,
+    "x":553.777774810791,
+    "y":1046.6264476776123,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"696d020f.3bfa3c",
+    "type":"comment",
+    "name":"TO DO: assign brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip",
+    "info":"need to quary mdsal-ar and get information assigned in tunnelxconn DG?",
+    "comments":"",
+    "x":715.3333206176758,
+    "y":1003.79332447052,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"e67f5695.27f668",
+    "type":"comment",
+    "name":"<---  TO DO: vgmux-bearer-ip is part of brg-requiest-input but need vgmux-lan-ip",
+    "info":"",
+    "comments":"",
+    "x":1038.0000305175781,
+    "y":1088.0000324249268,
+    "z":"cfbd0a6c.d9ad88",
+    "wires":[
+
+    ]
+  }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml
index 671882ad..40bfb673 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml
@@ -1,118 +1,187 @@
-<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}'><method rpc='brg-topology-operation-deactivate' mode='sync'>

-<block atomic="true"><set>

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

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

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

-

-

-</set><set>

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

- + $tmp.ar.allotted-resource-id

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

-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-

-<outcome value='success'>

-<block atomic="true">

-<set>

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

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

-<outcome value='1'>

-<block atomic='true'>

-<set>

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

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

-<outcome value='Created'>

-<block>

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

-<block>

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

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

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

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

-

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

-<block atomic="true">

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

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

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

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

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

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

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

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

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

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

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

-

-</execute><set>

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

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

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

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

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

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

-		resource="allotted-resource" 

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

+<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}'>

+    <method rpc='brg-topology-operation-deactivate' mode='sync'>

+        <block atomic="true">

+            <set>

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

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

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

+            </set>

+            <set>

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

+            </set>

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

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

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

+            </execute>

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

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

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

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

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

+            </execute>

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

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

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

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

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

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

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

+                <outcome value='success'>

+                    <block atomic="true">

+                        <set>

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

+                        </set>

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

+                            <outcome value='1'>

+                                <block atomic='true'>

+                                    <set>

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

+                                    </set>

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

+                                        <outcome value='Created'>

+                                            <block></block>

+                                        </outcome>

+                                        <outcome value='Other'>

+                                            <block></block>

+                                        </outcome>

+                                    </switch>

+                                    <set>

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

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

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

+                                    </set>

+                                </block>

+                            </outcome>

+                        </switch>

+                    </block>

+                </outcome>

+                <outcome value='Other'>

+                    <block atomic="true"></block>

+                </outcome>

+            </execute>

+            <set>

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

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

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

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

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

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

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

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

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

+            </set>

+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >

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

+            </execute>

+            <set>

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

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

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

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

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

+            </set>

+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"

+                    resource="allotted-resource"

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

 			service-subscription.service-type = $service-data.service-information.subscription-service-type AND

 			service-instance.service-instance-id = $service-data.service-information.service-instance-id AND

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

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

-	<parameter name="operational-status" value="out-of-service-path" />

-<outcome value='failure'>

-<return status='failure'>

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

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

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

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

-<return status='failure'>

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

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

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

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

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

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

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

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

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

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

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

-

-<outcome value='success'>

-<block>

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

-<return status='failure'>

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

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

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

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

-<return status='failure'>

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

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

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

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

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

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

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

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

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

- 

-</set><return status='success'>

-<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>
+                    pfx='pfx' local-only='false' force='false'>

+                <parameter name="operational-status" value="out-of-service-path" />

+                <outcome value='failure'>

+                    <return status='failure'>

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

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

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

+                    </return>

+                </outcome>

+                <outcome value='not-found'>

+                    <return status='failure'>

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

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

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

+                    </return>

+                </outcome>

+            </update>

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

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

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

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

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

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

+                <parameter name='httpMethod' value='PUT' />

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

+                <outcome value='success'>

+                    <block></block>

+                </outcome>

+                <outcome value='failure'>

+                    <return status='failure'>

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

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

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

+                    </return>

+                </outcome>

+                <outcome value='not-found'>

+                    <return status='failure'>

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

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

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

+                    </return>

+                </outcome>

+            </execute>

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

+                <parameter name="source" value="`$prop.honeycomb.url`"/>

+                <parameter name="outputPath" value="tmp.honeycomb.url"/>

+                <parameter name="target" value="{honeycomb-instance-ip}"/>

+                <parameter name="replacement" value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip`"/>

+            </execute>

+            <set>

+                <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` " />

+                <parameter name='tmp.tunnel-dest-ip' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-lan-ip` " />

+                <parameter name='tmp.tunnel-src-ip' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` " />

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

+            </set>

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

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

+                <parameter name="outputPath" value="tmp.vpp-honeycomb-url"/>

+                <parameter name="target" value="{tunnel-name}"/>

+                <parameter name="replacement" value="`$tmp.tunnel-name`"/>

+            </execute>

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

+                <parameter name='restapiUrl' value='`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url`' />

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

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

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

+                <parameter name='httpMethod' value='DELETE' />

+                <parameter name="responsePrefix" value="honeycomb-vnf" />

+                <outcome value='success'>

+                    <block></block>

+                </outcome>

+                <outcome value='failure'>

+                    <return status='failure'>

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

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

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

+                    </return>

+                </outcome>

+                <outcome value='not-found'>

+                    <return status='failure'>

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

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

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

+                    </return>

+                </outcome>

+            </execute>

+            <set>

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

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

+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $brg-topology-operation-input.service-information.service-instance-id + '/service-data/service-topology/'`"/>

+            </set>

+            <return status='success'>

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

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

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

+            </return>

+        </block>

+    </method>

+</service-logic>
\ No newline at end of file