Update brg topo activate

Issue-Id: SDNC-164
Change-Id: If58891e63601d7a2352d36f183230c27b5c71300
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>

Former-commit-id: 0665236357387cf06005528796fbd3e83bd6af73

2 files changed, 300 insertions, 599 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json
index 3c40e1d3..340c4966 100755
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id":"d67dc318.ce892",
+    "id":"7ca45b72.02b674",
     "type":"dgstart",
     "name":"DGSTART",
     "outputs":1,
-    "x":140,
-    "y":115,
-    "z":"87a856d9.9ec508",
+    "x":200,
+    "y":152.5,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "539ddd05.d9acd4"
+        "a578aa11.1457b8"
       ]
     ]
   },
   {
-    "id":"539ddd05.d9acd4",
+    "id":"a578aa11.1457b8",
     "type":"service-logic",
     "name":"GENERIC-RESOURCE-API ${project.version}",
     "module":"GENERIC-RESOURCE-API",
@@ -22,145 +22,140 @@
     "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":236.23807907104492,
-    "y":175.95239067077637,
-    "z":"87a856d9.9ec508",
+    "x":296.2380790710449,
+    "y":213.45239067077637,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "d3e85090.c0279"
+        "2e4ecb49.4fb304"
       ]
     ]
   },
   {
-    "id":"d3e85090.c0279",
+    "id":"2e4ecb49.4fb304",
     "type":"method",
     "name":"brg-topology-operation-activate",
     "xml":"<method rpc='brg-topology-operation-activate' mode='sync'>\n",
     "comments":"",
     "outputs":1,
-    "x":282.15485763549805,
-    "y":211.19044589996338,
-    "z":"87a856d9.9ec508",
+    "x":342.15485763549805,
+    "y":248.69044589996338,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "a3b5f23e.0b3f1"
+        "a57e9bbb.9e4828"
       ]
     ]
   },
   {
-    "id":"a3b5f23e.0b3f1",
+    "id":"a57e9bbb.9e4828",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":190.47619247436523,
-    "y":354.5237879753113,
-    "z":"87a856d9.9ec508",
+    "x":250.47619247436523,
+    "y":392.0237879753113,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "611e8741.074898",
-        "61b73363.ffb3cc",
-        "a6766796.306768",
-        "5de77c32.eecb94",
-        "3a0be6a.ca51a1a",
-        "a9547492.9c6f28",
-        "e64c58e2.5bad38",
-        "f373e2ec.09689",
-        "eaaae4f9.51d728",
-        "abb42d37.333e9",
-        "b2c6bab8.1fd358",
-        "718e3f93.cd459",
-        "f965b29a.1efa5",
-        "16a55bb0.8c20f4",
-        "aa97b18b.1226d",
-        "ca99974a.a9c178",
-        "d3a78d9e.83f7f",
-        "cdf3b3de.27f5e",
-        "33ab2b01.6cab74",
-        "4de82e6d.f68d1",
-        "39a8ddb.60b2222",
-        "b7b31c06.60266",
-        "a21afe27.1472c"
+        "df593324.23b48",
+        "148d06ba.a72699",
+        "15cc0b7b.f05b85",
+        "546333a0.91ec5c",
+        "5ccc96c6.1580c8",
+        "6b35e255.00322c",
+        "f9d9cb1d.a314a8",
+        "3794d482.d462fc",
+        "b3601577.9dd278",
+        "1ef0694.7965097",
+        "4fe49db6.710ed4",
+        "e5b256f5.b1cce8",
+        "fe630901.ebe978",
+        "cb813dae.148d9",
+        "6f9567d7.ec7dc8",
+        "11753209.20d5ee",
+        "d3a63961.390228",
+        "53cf1cf4.d29134"
       ]
     ]
   },
   {
-    "id":"61b73363.ffb3cc",
+    "id":"148d06ba.a72699",
     "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":447.0001220703125,
-    "y":1739.2145948410034,
-    "z":"87a856d9.9ec508",
+    "x":504.00011444091797,
+    "y":1559.3814134597778,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"611e8741.074898",
+    "id":"df593324.23b48",
     "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":475.75403594970703,
-    "y":1703.3371410369873,
-    "z":"87a856d9.9ec508",
+    "x":532.7540283203125,
+    "y":1523.5039596557617,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"abb42d37.333e9",
+    "id":"1ef0694.7965097",
     "type":"set",
     "name":"set allotted-resource-oper-status",
     "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
     "comments":"",
-    "x":496.7542190551758,
-    "y":735.0514001846313,
-    "z":"87a856d9.9ec508",
+    "x":556.7542190551758,
+    "y":772.5514001846313,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"5de77c32.eecb94",
+    "id":"546333a0.91ec5c",
     "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":452.73806381225586,
-    "y":328.33332538604736,
-    "z":"87a856d9.9ec508",
+    "x":512.7380638122559,
+    "y":365.83332538604736,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"a6766796.306768",
+    "id":"15cc0b7b.f05b85",
     "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":499.9973258972168,
-    "y":294.59259128570557,
-    "z":"87a856d9.9ec508",
+    "x":559.9973258972168,
+    "y":332.09259128570557,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"3a0be6a.ca51a1a",
+    "id":"5ccc96c6.1580c8",
     "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":458.9934196472168,
-    "y":364.23152446746826,
-    "z":"87a856d9.9ec508",
+    "x":518.9934196472168,
+    "y":401.73152446746826,
+    "z":"862ed298.34c67",
     "wires":[
       [
 
@@ -168,32 +163,32 @@
     ]
   },
   {
-    "id":"e64c58e2.5bad38",
+    "id":"f9d9cb1d.a314a8",
     "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":521.5187530517578,
-    "y":525.4594917297363,
-    "z":"87a856d9.9ec508",
+    "x":581.5187530517578,
+    "y":562.9594917297363,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "2fee3ef4.4e3752",
-        "82115602.4aadf8"
+        "604ec1e5.b17c",
+        "80d7a663.b9fd58"
       ]
     ]
   },
   {
-    "id":"a9547492.9c6f28",
+    "id":"6b35e255.00322c",
     "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":487.0648536682129,
-    "y":424.0172290802002,
-    "z":"87a856d9.9ec508",
+    "x":547.0648536682129,
+    "y":461.5172290802002,
+    "z":"862ed298.34c67",
     "wires":[
       [
 
@@ -201,307 +196,307 @@
     ]
   },
   {
-    "id":"2fee3ef4.4e3752",
+    "id":"604ec1e5.b17c",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":778.8148918151855,
-    "y":524.2672522068024,
-    "z":"87a856d9.9ec508",
+    "x":838.8148918151855,
+    "y":561.7672522068024,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "55b821dc.c9096"
+        "9fc7f486.6e8728"
       ]
     ]
   },
   {
-    "id":"f373e2ec.09689",
+    "id":"3794d482.d462fc",
     "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":529.5293121337891,
-    "y":878.4341316223145,
-    "z":"87a856d9.9ec508",
+    "x":589.5293121337891,
+    "y":915.9341316223145,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "ed22c964.b49a28",
-        "76a7310d.9d0cc",
-        "503c908d.2e343"
+        "cb14d559.73ea38",
+        "dc728c86.18e46",
+        "f24f7a44.fa9868"
       ]
     ]
   },
   {
-    "id":"ed22c964.b49a28",
+    "id":"cb14d559.73ea38",
     "type":"not-found",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":799.837329864502,
-    "y":931.432332418859,
-    "z":"87a856d9.9ec508",
+    "x":1113.8373832702637,
+    "y":940.9324235916138,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "b1122f4f.ea076"
+        "4f1a6257.1e90dc"
       ]
     ]
   },
   {
-    "id":"76a7310d.9d0cc",
+    "id":"dc728c86.18e46",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":790.8373794555664,
-    "y":899.9323581680655,
-    "z":"87a856d9.9ec508",
+    "x":1104.8374328613281,
+    "y":909.4324493408203,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "b1122f4f.ea076"
+        "4f1a6257.1e90dc"
       ]
     ]
   },
   {
-    "id":"503c908d.2e343",
+    "id":"f24f7a44.fa9868",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":794.5874176025391,
-    "y":870.2894630432129,
-    "z":"87a856d9.9ec508",
+    "x":1108.5874710083008,
+    "y":879.7895542159677,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "fd568606.5069e8"
+        "fc0b40a6.c8322"
       ]
     ]
   },
   {
-    "id":"b1122f4f.ea076",
+    "id":"4f1a6257.1e90dc",
     "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":960.5874176025391,
-    "y":900.6823820099235,
-    "z":"87a856d9.9ec508",
+    "x":1274.5874710083008,
+    "y":910.1824731826782,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"55b821dc.c9096",
+    "id":"9fc7f486.6e8728",
     "type":"block",
     "name":"block: atomic",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":959.8148460388184,
-    "y":524.7672016620636,
-    "z":"87a856d9.9ec508",
+    "x":1019.8148460388184,
+    "y":562.2672016620636,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "2d8e02e3.cf0fae",
-        "c6e86370.775dc"
+        "b3f7fcbb.cacda",
+        "a23fac13.531f7"
       ]
     ]
   },
   {
-    "id":"2d8e02e3.cf0fae",
+    "id":"b3f7fcbb.cacda",
     "type":"switchNode",
     "name":"switch brg length",
     "xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n",
     "comments":"",
     "outputs":1,
-    "x":1205.6720924377441,
-    "y":559.052964925766,
-    "z":"87a856d9.9ec508",
+    "x":1265.6720924377441,
+    "y":596.552964925766,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "fd01ce34.5cc7e"
+        "35f809be.750916"
       ]
     ]
   },
   {
-    "id":"fd01ce34.5cc7e",
+    "id":"35f809be.750916",
     "type":"other",
     "name":"outcome 1",
     "xml":"<outcome value='1'>\n",
     "comments":"",
     "outputs":1,
-    "x":1396.6720962524414,
-    "y":559.0529625415802,
-    "z":"87a856d9.9ec508",
+    "x":1456.6720962524414,
+    "y":596.5529625415802,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "cd19d423.804d98"
+        "738470b0.e3d3a"
       ]
     ]
   },
   {
-    "id":"cdc77865.0b0c78",
+    "id":"1057cfb.6123c3",
     "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":1796.5292320251465,
-    "y":559.6243867874146,
-    "z":"87a856d9.9ec508",
+    "x":1856.5292320251465,
+    "y":597.1243867874146,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"cd19d423.804d98",
+    "id":"738470b0.e3d3a",
     "type":"block",
     "name":"block: atomic",
     "xml":"<block atomic='true'>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1567.5290794372559,
-    "y":559.6244316101074,
-    "z":"87a856d9.9ec508",
+    "x":1627.5290794372559,
+    "y":597.1244316101074,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "cdc77865.0b0c78",
-        "a7b33ed0.43bdb",
-        "67f4311d.5bfe6"
+        "1057cfb.6123c3",
+        "b64dc780.970328",
+        "9d4982d0.3671"
       ]
     ]
   },
   {
-    "id":"a7b33ed0.43bdb",
+    "id":"b64dc780.970328",
     "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":1794.5294761657715,
-    "y":627.0529508590698,
-    "z":"87a856d9.9ec508",
+    "x":1854.5294761657715,
+    "y":664.5529508590698,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"3e38b8c9.4b9918",
+    "id":"c99d3ef5.d59f5",
     "type":"comment",
     "name":"GET brg-allotted-resource from mdsal",
     "info":"",
     "comments":"",
-    "x":546.8148155212402,
-    "y":488.7671926021576,
-    "z":"87a856d9.9ec508",
+    "x":606.8148155212402,
+    "y":526.2671926021576,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"67f4311d.5bfe6",
+    "id":"9d4982d0.3671",
     "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":1804.52925491333,
-    "y":592.6243848800659,
-    "z":"87a856d9.9ec508",
+    "x":1864.52925491333,
+    "y":630.1243848800659,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "95019c7b.0ff8c",
-        "35eeaddc.1e3b72"
+        "890a6e1c.d1711",
+        "c51cac36.4029d"
       ]
     ]
   },
   {
-    "id":"95019c7b.0ff8c",
+    "id":"890a6e1c.d1711",
     "type":"outcome",
     "name":"outcome Created",
     "xml":"<outcome value='Created'>\n",
     "comments":"",
     "outputs":1,
-    "x":2016.1292114257812,
-    "y":553.6243848800659,
-    "z":"87a856d9.9ec508",
+    "x":2076.1292114257812,
+    "y":591.1243848800659,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "d7fd4783.cc90d8"
+        "acca97a1.9e7328"
       ]
     ]
   },
   {
-    "id":"35eeaddc.1e3b72",
+    "id":"c51cac36.4029d",
     "type":"outcome",
     "name":"outcome Other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":2041.8435859680176,
-    "y":589.052975654602,
-    "z":"87a856d9.9ec508",
+    "x":2101.8435859680176,
+    "y":626.552975654602,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "d7fd4783.cc90d8"
+        "acca97a1.9e7328"
       ]
     ]
   },
   {
-    "id":"44d6b29d.d0815c",
+    "id":"5c12b1cb.7de2f",
     "type":"comment",
     "name":"Set allotted-resource-identifiers",
     "info":"",
     "comments":"",
-    "x":502.33863830566406,
-    "y":579.3386459350586,
-    "z":"87a856d9.9ec508",
+    "x":562.3386383056641,
+    "y":616.8386459350586,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"c6e86370.775dc",
+    "id":"a23fac13.531f7",
     "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":1285.3864250183105,
-    "y":524.7672936916351,
-    "z":"87a856d9.9ec508",
+    "x":1345.3864250183105,
+    "y":562.2672936916351,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"d0fcda95.b5ded8",
+    "id":"9da3c80.8620838",
     "type":"comment",
     "name":"Create urls for restapi",
     "info":"",
     "comments":"",
-    "x":457.9576606750488,
-    "y":393.6243562698364,
-    "z":"87a856d9.9ec508",
+    "x":517.9576606750488,
+    "y":431.1243562698364,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"fd568606.5069e8",
+    "id":"fc0b40a6.c8322",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":936.2433853149414,
-    "y":866.481632232666,
-    "z":"87a856d9.9ec508",
+    "x":1250.2434387207031,
+    "y":875.9817234054208,
+    "z":"862ed298.34c67",
     "wires":[
       [
 
@@ -509,28 +504,28 @@
     ]
   },
   {
-    "id":"65762b87.da2b54",
+    "id":"e38a2e2a.966c",
     "type":"comment",
     "name":"TO DO: vnf/put parent",
     "info":"",
     "comments":"",
-    "x":460.2433776855469,
-    "y":767.1481952667236,
-    "z":"87a856d9.9ec508",
+    "x":520.2433776855469,
+    "y":804.6481952667236,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"eaaae4f9.51d728",
+    "id":"b3601577.9dd278",
     "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":444.24338150024414,
-    "y":696.4815549850464,
-    "z":"87a856d9.9ec508",
+    "x":504.24338150024414,
+    "y":733.9815549850464,
+    "z":"862ed298.34c67",
     "wires":[
       [
 
@@ -538,32 +533,32 @@
     ]
   },
   {
-    "id":"82115602.4aadf8",
+    "id":"80d7a663.b9fd58",
     "type":"other",
     "name":"other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":778.5766868591309,
-    "y":560.4814250469208,
-    "z":"87a856d9.9ec508",
+    "x":838.5766868591309,
+    "y":597.9814250469208,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "9a00f006.cbb78"
+        "75930022.e7b04"
       ]
     ]
   },
   {
-    "id":"9a00f006.cbb78",
+    "id":"75930022.e7b04",
     "type":"block",
     "name":"block: atomic",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":958.5766372680664,
-    "y":561.1479756832123,
-    "z":"87a856d9.9ec508",
+    "x":1018.5766372680664,
+    "y":598.6479756832123,
+    "z":"862ed298.34c67",
     "wires":[
       [
 
@@ -571,29 +566,29 @@
     ]
   },
   {
-    "id":"b2c6bab8.1fd358",
+    "id":"4fe49db6.710ed4",
     "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":427.24342346191406,
-    "y":616.1481666564941,
-    "z":"87a856d9.9ec508",
+    "x":487.24342346191406,
+    "y":653.6481666564941,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"d7fd4783.cc90d8",
+    "id":"acca97a1.9e7328",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":2230.5997276306152,
-    "y":555.0000190734863,
-    "z":"87a856d9.9ec508",
+    "x":2290.5997276306152,
+    "y":592.5000190734863,
+    "z":"862ed298.34c67",
     "wires":[
       [
 
@@ -601,157 +596,157 @@
     ]
   },
   {
-    "id":"718e3f93.cd459",
+    "id":"e5b256f5.b1cce8",
     "type":"update",
     "name":"update AAI allotted-resource",
     "xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"operational-status\" value=\"in-service-path\" />\n",
     "comments":"",
     "outputs":1,
-    "x":487.85716247558594,
-    "y":800.2380628585815,
-    "z":"87a856d9.9ec508",
+    "x":547.8571624755859,
+    "y":837.7380628585815,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "6bf804a4.c0a48c",
-        "138a867a.df171a"
+        "cddc2d29.84eec",
+        "f5df336a.008f2"
       ]
     ]
   },
   {
-    "id":"6bf804a4.c0a48c",
+    "id":"cddc2d29.84eec",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":743.6190567016602,
-    "y":783.1905598640442,
-    "z":"87a856d9.9ec508",
+    "x":803.6190567016602,
+    "y":820.6905598640442,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "418532c6.6b556c"
+        "7dbfd50c.378e0c"
       ]
     ]
   },
   {
-    "id":"418532c6.6b556c",
+    "id":"7dbfd50c.378e0c",
     "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":910.142936706543,
-    "y":794.8096308708191,
-    "z":"87a856d9.9ec508",
+    "x":970.142936706543,
+    "y":832.3096308708191,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"138a867a.df171a",
+    "id":"f5df336a.008f2",
     "type":"failure",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":750.7143440246582,
-    "y":815.9525275230408,
-    "z":"87a856d9.9ec508",
+    "x":810.7143440246582,
+    "y":853.4525275230408,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "418532c6.6b556c"
+        "7dbfd50c.378e0c"
       ]
     ]
   },
   {
-    "id":"f965b29a.1efa5",
+    "id":"fe630901.ebe978",
     "type":"execute",
     "name":"execute RestApiCallNode - setup BRG to vgMux vxlan tunnel port",
     "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.vxlan-tunnel.templatefile`\" />\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='PUT' />\n    <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n",
     "comments":"",
     "outputs":1,
-    "x":606.6666564941406,
-    "y":1121.6666297912598,
-    "z":"87a856d9.9ec508",
+    "x":664.6666564941406,
+    "y":1249.166666984558,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "df90cb56.a03868",
-        "7baef153.70ea4",
-        "5f9ed08a.45811"
+        "c24e108f.00a11",
+        "be44e415.f52208",
+        "b3d9ad69.551df"
       ]
     ]
   },
   {
-    "id":"df90cb56.a03868",
+    "id":"c24e108f.00a11",
     "type":"not-found",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":908.64137840271,
-    "y":1212.9981907829642,
-    "z":"87a856d9.9ec508",
+    "x":998.6414451599121,
+    "y":1308.4982789978385,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "4be7e5a3.743f0c"
+        "9f93ed2a.172f9"
       ]
     ]
   },
   {
-    "id":"7baef153.70ea4",
+    "id":"be44e415.f52208",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":899.6414279937744,
-    "y":1181.4982165321708,
-    "z":"87a856d9.9ec508",
+    "x":989.6414947509766,
+    "y":1276.998304747045,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "4be7e5a3.743f0c"
+        "9f93ed2a.172f9"
       ]
     ]
   },
   {
-    "id":"5f9ed08a.45811",
+    "id":"b3d9ad69.551df",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":903.3914661407471,
-    "y":1151.8553214073181,
-    "z":"87a856d9.9ec508",
+    "x":993.3915328979492,
+    "y":1247.3554096221924,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "be0bec1a.41ef9"
+        "be1da966.f3fdb8"
       ]
     ]
   },
   {
-    "id":"4be7e5a3.743f0c",
+    "id":"9f93ed2a.172f9",
     "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":1069.391466140747,
-    "y":1182.2482403740287,
-    "z":"87a856d9.9ec508",
+    "x":1159.3915328979492,
+    "y":1277.748328588903,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"be0bec1a.41ef9",
+    "id":"be1da966.f3fdb8",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1045.0474338531494,
-    "y":1148.0474905967712,
-    "z":"87a856d9.9ec508",
+    "x":1135.0475006103516,
+    "y":1243.5475788116455,
+    "z":"862ed298.34c67",
     "wires":[
       [
 
@@ -759,95 +754,95 @@
     ]
   },
   {
-    "id":"16a55bb0.8c20f4",
+    "id":"cb813dae.148d9",
     "type":"execute",
     "name":"execute RestApiCallNode - setup BRG vxlan bridge domain",
     "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.bridge-domain.templatefile`\" />\n    <parameter name='restapiUrl' value=\"`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url + '/v3po:l2' `\" />\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='PUT' />\n    <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n",
     "comments":"",
     "outputs":1,
-    "x":588.3334197998047,
-    "y":1268.3334243297577,
-    "z":"87a856d9.9ec508",
+    "x":646.3334197998047,
+    "y":1395.833461523056,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "4f278bf0.7edd54",
-        "6114a132.9f3ff",
-        "14cdadf1.ca4582"
+        "fda405ea.32bd38",
+        "a0de0f27.22318",
+        "713a6065.b61ad"
       ]
     ]
   },
   {
-    "id":"4f278bf0.7edd54",
+    "id":"fda405ea.32bd38",
     "type":"not-found",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":898.6414394378662,
-    "y":1412.9982127174735,
-    "z":"87a856d9.9ec508",
+    "x":994.3080577850342,
+    "y":1471.4983781799674,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "a55fd1dd.4e4de"
+        "eb0aba4d.33d9b8"
       ]
     ]
   },
   {
-    "id":"6114a132.9f3ff",
+    "id":"a0de0f27.22318",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":889.6414890289307,
-    "y":1381.49823846668,
-    "z":"87a856d9.9ec508",
+    "x":985.3081073760986,
+    "y":1439.998403929174,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "a55fd1dd.4e4de"
+        "eb0aba4d.33d9b8"
       ]
     ]
   },
   {
-    "id":"14cdadf1.ca4582",
+    "id":"713a6065.b61ad",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":893.3915271759033,
-    "y":1351.8553433418274,
-    "z":"87a856d9.9ec508",
+    "x":989.0581455230713,
+    "y":1410.3555088043213,
+    "z":"862ed298.34c67",
     "wires":[
       [
-        "ad02893c.a5fb98"
+        "cf6832af.3d346"
       ]
     ]
   },
   {
-    "id":"a55fd1dd.4e4de",
+    "id":"eb0aba4d.33d9b8",
     "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":1059.3915271759033,
-    "y":1382.248262308538,
-    "z":"87a856d9.9ec508",
+    "x":1155.0581455230713,
+    "y":1440.7484277710319,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"ad02893c.a5fb98",
+    "id":"cf6832af.3d346",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1035.0474948883057,
-    "y":1348.0475125312805,
-    "z":"87a856d9.9ec508",
+    "x":1130.7141132354736,
+    "y":1406.5476779937744,
+    "z":"862ed298.34c67",
     "wires":[
       [
 
@@ -855,28 +850,28 @@
     ]
   },
   {
-    "id":"d3a78d9e.83f7f",
+    "id":"d3a63961.390228",
     "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-bearer-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` \" />",
+    "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip` \" />\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":542.7778015136719,
-    "y":986.6668891906738,
-    "z":"87a856d9.9ec508",
+    "x":600.7778015136719,
+    "y":1114.1669263839722,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"ca99974a.a9c178",
+    "id":"11753209.20d5ee",
     "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":514.4444427490234,
-    "y":1041.6666679382324,
-    "z":"87a856d9.9ec508",
+    "x":572.4444427490234,
+    "y":1169.1667051315308,
+    "z":"862ed298.34c67",
     "wires":[
       [
 
@@ -884,15 +879,15 @@
     ]
   },
   {
-    "id":"aa97b18b.1226d",
+    "id":"6f9567d7.ec7dc8",
     "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":504.4444122314453,
-    "y":933.3332271575928,
-    "z":"87a856d9.9ec508",
+    "x":564.4444580078125,
+    "y":1028.833233833313,
+    "z":"862ed298.34c67",
     "wires":[
       [
 
@@ -900,253 +895,29 @@
     ]
   },
   {
-    "id":"cdf3b3de.27f5e",
+    "id":"53cf1cf4.d29134",
     "type":"set",
     "name":"set BRG Bridge Domain Props",
     "xml":"<set>\n<parameter name='tmp.bridge-domain' value=\"bridge-domain-10\" />\n<parameter name='tmp.split-horizon-group' value=\"2\" />",
     "comments":"",
-    "x":497.7777557373047,
-    "y":1193.3332996368408,
-    "z":"87a856d9.9ec508",
+    "x":555.7777557373047,
+    "y":1320.8333368301392,
+    "z":"862ed298.34c67",
     "wires":[
 
     ]
   },
   {
-    "id":"b7b31c06.60266",
-    "type":"execute",
-    "name":"execute RestApiCallNode - setup vgMux to BRG vxlan tunnel port",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.vxlan-tunnel.templatefile`\" />\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='PUT' />\n    <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":605.1625823974609,
-    "y":1510.2343139648438,
-    "z":"87a856d9.9ec508",
-    "wires":[
-      [
-        "aba59524.bc77c8",
-        "e1789de0.06c8d",
-        "f925fc50.89e98"
-      ]
-    ]
-  },
-  {
-    "id":"aba59524.bc77c8",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":977.1372489929199,
-    "y":1564.8991645798087,
-    "z":"87a856d9.9ec508",
-    "wires":[
-      [
-        "59180579.1119ac"
-      ]
-    ]
-  },
-  {
-    "id":"e1789de0.06c8d",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":968.1372985839844,
-    "y":1533.3991903290153,
-    "z":"87a856d9.9ec508",
-    "wires":[
-      [
-        "59180579.1119ac"
-      ]
-    ]
-  },
-  {
-    "id":"f925fc50.89e98",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":971.887336730957,
-    "y":1503.7562952041626,
-    "z":"87a856d9.9ec508",
-    "wires":[
-      [
-        "997a6286.bc8a6"
-      ]
-    ]
-  },
-  {
-    "id":"59180579.1119ac",
-    "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":1137.887336730957,
-    "y":1534.1492141708732,
-    "z":"87a856d9.9ec508",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"997a6286.bc8a6",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1113.5433044433594,
-    "y":1499.9484643936157,
-    "z":"87a856d9.9ec508",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"4de82e6d.f68d1",
-    "type":"set",
-    "name":"set vgMUX to BRG 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.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` \" />",
-    "comments":"",
-    "x":546.273681640625,
-    "y":1391.9011373519897,
-    "z":"87a856d9.9ec508",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"39a8ddb.60b2222",
-    "type":"execute",
-    "name":"generate full vgMUX-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":529.6070098876953,
-    "y":1450.2342700958252,
-    "z":"87a856d9.9ec508",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"33ab2b01.6cab74",
-    "type":"execute",
-    "name":"generate honeycomb-url to vgMUX",
-    "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.allotted-resource-operation-information.brg-request-input.vgmux-bearer-ip`\"/>\n",
-    "comments":"",
-    "outputs":1,
-    "x":516.2736663818359,
-    "y":1336.900857925415,
-    "z":"87a856d9.9ec508",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"a21afe27.1472c",
-    "type":"execute",
-    "name":"execute RestApiCallNode - setup vgMUX to BRG vxlan tunnel xconnect",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.xconnect.templatefile`\" />\n    <parameter name='restapiUrl' value=\"`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url + '/v3po:l2' `\" />\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='PUT' />\n    <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":623.3333129882812,
-    "y":1609.9998779296875,
-    "z":"87a856d9.9ec508",
-    "wires":[
-      [
-        "9f350be0.c73188",
-        "b487c24.98b254",
-        "b0b52d79.1d3db"
-      ]
-    ]
-  },
-  {
-    "id":"9f350be0.c73188",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":974.3080177307129,
-    "y":1690.6647199615836,
-    "z":"87a856d9.9ec508",
-    "wires":[
-      [
-        "6d663e66.14fad"
-      ]
-    ]
-  },
-  {
-    "id":"b487c24.98b254",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":965.3080673217773,
-    "y":1659.1647457107902,
-    "z":"87a856d9.9ec508",
-    "wires":[
-      [
-        "6d663e66.14fad"
-      ]
-    ]
-  },
-  {
-    "id":"b0b52d79.1d3db",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":969.05810546875,
-    "y":1629.5218505859375,
-    "z":"87a856d9.9ec508",
-    "wires":[
-      [
-        "c9430c21.30428"
-      ]
-    ]
-  },
-  {
-    "id":"6d663e66.14fad",
-    "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":1135.05810546875,
-    "y":1659.914769552648,
-    "z":"87a856d9.9ec508",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"c9430c21.30428",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
+    "id":"7968a654.b60c08",
+    "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":"",
-    "outputs":1,
-    "x":1110.7140731811523,
-    "y":1625.7140197753906,
-    "z":"87a856d9.9ec508",
+    "x":722.0000305175781,
+    "y":978.0000286102295,
+    "z":"862ed298.34c67",
     "wires":[
-      [
 
-      ]
     ]
   }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
index 66266542..7536425a 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
@@ -136,8 +136,8 @@
                 <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-bearer-ip` " />

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

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

@@ -203,76 +203,6 @@
                     </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.allotted-resource-operation-information.brg-request-input.vgmux-bearer-ip`"/>

-            </execute>

-            <set>

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

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

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

-                <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='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.vxlan-tunnel.templatefile`" />

-                <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='PUT' />

-                <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>

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

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

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

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

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

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

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

-                <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`"/>