Merge "Update brg topo activate DG"

Former-commit-id: 851f35dc112b7e7bc3106c73c7589ad75a920f95

4 files changed, 684 insertions, 430 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 073762cc..13cd485e 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":"9714cec7.1c4c",
+    "id":"d9e7e1c2.493d3",
     "type":"dgstart",
     "name":"DGSTART",
     "outputs":1,
-    "x":217.99998474121094,
-    "y":153.59999084472656,
-    "z":"862ed298.34c67",
+    "x":103,
+    "y":46,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "740711e8.2f0a3"
+        "9a1b0b6b.996428"
       ]
     ]
   },
   {
-    "id":"740711e8.2f0a3",
+    "id":"9a1b0b6b.996428",
     "type":"service-logic",
     "name":"GENERIC-RESOURCE-API ${project.version}",
     "module":"GENERIC-RESOURCE-API",
@@ -22,144 +22,149 @@
     "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":314.23806381225586,
-    "y":214.55238151550293,
-    "z":"862ed298.34c67",
+    "x":199.23807907104492,
+    "y":106.95239067077637,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "98c97074.b0862"
+        "1b80fdb3.e51d42"
       ]
     ]
   },
   {
-    "id":"98c97074.b0862",
+    "id":"1b80fdb3.e51d42",
     "type":"method",
     "name":"brg-topology-operation-activate",
     "xml":"<method rpc='brg-topology-operation-activate' mode='sync'>\n",
     "comments":"",
     "outputs":1,
-    "x":360.154842376709,
-    "y":249.79043674468994,
-    "z":"862ed298.34c67",
+    "x":245.15485763549805,
+    "y":142.19044589996338,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "2804280a.93bf08"
+        "b9ef2573.e57c88"
       ]
     ]
   },
   {
-    "id":"2804280a.93bf08",
+    "id":"b9ef2573.e57c88",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":268.4761772155762,
-    "y":393.12377882003784,
-    "z":"862ed298.34c67",
+    "x":153.47619247436523,
+    "y":285.5237879753113,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "630ab7ec.b2f0d8",
-        "7e4ae814.209b28",
-        "2357e7c9.48bf08",
-        "ed4c6941.aa8be8",
-        "fc236776.686848",
-        "4451f783.4736a8",
-        "696c9ae0.fd9424",
-        "76055be0.805a24",
-        "fc290b65.76c018",
-        "b2a43c5b.9bcb5",
-        "624fd076.69a64",
-        "f79aa33.e64036",
-        "df8cc0e.bcffc4",
-        "bc6ed59e.4e1728",
-        "9b6d7ee4.10e23",
-        "a6207934.86f518",
-        "77b9bf2c.b44d5",
-        "7e8c5cfa.726864",
-        "a9b802e0.3c87a",
-        "9b340dbc.c3cb9",
-        "5a18305b.6de8e",
-        "570d3d0b.27f934"
+        "b4a1686c.6724e8",
+        "377fb8b4.251228",
+        "d661220d.d848d",
+        "c5c60948.27fc28",
+        "c4711874.0ee758",
+        "aceb1a27.11b7a8",
+        "a5137e71.81a65",
+        "5972a9da.16e978",
+        "50e72018.6624",
+        "b3b13e68.d59bb",
+        "ef8d3b6f.8c3c58",
+        "531893c6.c405dc",
+        "7c4bd318.44ab8c",
+        "14b435e1.73803a",
+        "b8e9e857.b4d5e8",
+        "970b23d4.8d05e",
+        "815c3841.72ff98",
+        "a9cc06ef.aed3d8",
+        "17504c2b.5ecc04",
+        "13ddb22.203944e",
+        "75aa4c7c.d1f814",
+        "173f16cf.2f6b79",
+        "5bcb3869.fa6198",
+        "60d1bf52.ad3d6",
+        "ac82543e.0a2288",
+        "4a0f8ea5.474a2",
+        "5f66c498.33c76c"
       ]
     ]
   },
   {
-    "id":"7e4ae814.209b28",
+    "id":"377fb8b4.251228",
     "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":528.0001068115234,
-    "y":1964.4814386367798,
-    "z":"862ed298.34c67",
+    "x":405.0001220703125,
+    "y":1954.8816022872925,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"630ab7ec.b2f0d8",
+    "id":"b4a1686c.6724e8",
     "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":556.754020690918,
-    "y":1928.6039848327637,
-    "z":"862ed298.34c67",
+    "x":433.75403594970703,
+    "y":1919.0041484832764,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"b2a43c5b.9bcb5",
+    "id":"b3b13e68.d59bb",
     "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":574.7542037963867,
-    "y":773.6513910293579,
-    "z":"862ed298.34c67",
+    "x":459.7542190551758,
+    "y":666.0514001846313,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"ed4c6941.aa8be8",
+    "id":"c5c60948.27fc28",
     "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":530.7380485534668,
-    "y":366.9333162307739,
-    "z":"862ed298.34c67",
+    "x":415.73806381225586,
+    "y":259.33332538604736,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"2357e7c9.48bf08",
+    "id":"d661220d.d848d",
     "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":577.9973106384277,
-    "y":333.19258213043213,
-    "z":"862ed298.34c67",
+    "x":462.9973258972168,
+    "y":225.59259128570557,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"fc236776.686848",
+    "id":"c4711874.0ee758",
     "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":536.9934043884277,
-    "y":402.8315153121948,
-    "z":"862ed298.34c67",
+    "x":421.9934196472168,
+    "y":295.23152446746826,
+    "z":"f97ade34.d219f",
     "wires":[
       [
 
@@ -167,32 +172,32 @@
     ]
   },
   {
-    "id":"696c9ae0.fd9424",
+    "id":"a5137e71.81a65",
     "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":599.5187377929688,
-    "y":564.0594825744629,
-    "z":"862ed298.34c67",
+    "x":484.5187530517578,
+    "y":456.4594917297363,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "aa88cd52.d9ee2",
-        "9c39ee65.4e4a7"
+        "edb9e1fa.046de",
+        "d98ea5a4.989128"
       ]
     ]
   },
   {
-    "id":"4451f783.4736a8",
+    "id":"aceb1a27.11b7a8",
     "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":565.0648384094238,
-    "y":462.61721992492676,
-    "z":"862ed298.34c67",
+    "x":450.0648536682129,
+    "y":355.0172290802002,
+    "z":"f97ade34.d219f",
     "wires":[
       [
 
@@ -200,307 +205,307 @@
     ]
   },
   {
-    "id":"aa88cd52.d9ee2",
+    "id":"edb9e1fa.046de",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":856.8148765563965,
-    "y":562.8672430515289,
-    "z":"862ed298.34c67",
+    "x":741.8148918151855,
+    "y":455.26725220680237,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "6411ad19.c5cdf4"
+        "52d019c0.82c438"
       ]
     ]
   },
   {
-    "id":"76055be0.805a24",
+    "id":"5972a9da.16e978",
     "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":607.529296875,
-    "y":917.034122467041,
-    "z":"862ed298.34c67",
+    "x":492.52931213378906,
+    "y":809.4341316223145,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "524852fa.5809ec",
-        "45984ad.2c61db4",
-        "f284d2b.77bd73"
+        "854bd044.7a222",
+        "8243312c.4fc6e",
+        "a02378bd.a2d368"
       ]
     ]
   },
   {
-    "id":"524852fa.5809ec",
+    "id":"854bd044.7a222",
     "type":"not-found",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":1131.8373680114746,
-    "y":942.0324144363403,
-    "z":"862ed298.34c67",
+    "x":1016.8373832702637,
+    "y":834.4324235916138,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "1f14fd6.cfd5303"
+        "981caf01.1190d"
       ]
     ]
   },
   {
-    "id":"45984ad.2c61db4",
+    "id":"8243312c.4fc6e",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":1122.837417602539,
-    "y":910.5324401855469,
-    "z":"862ed298.34c67",
+    "x":1007.8374328613281,
+    "y":802.9324493408203,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "1f14fd6.cfd5303"
+        "981caf01.1190d"
       ]
     ]
   },
   {
-    "id":"f284d2b.77bd73",
+    "id":"a02378bd.a2d368",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":1126.5874557495117,
-    "y":880.8895450606942,
-    "z":"862ed298.34c67",
+    "x":1011.5874710083008,
+    "y":773.2895542159677,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "5e98e0e7.a8f18"
+        "9efe8414.91ed18"
       ]
     ]
   },
   {
-    "id":"1f14fd6.cfd5303",
+    "id":"981caf01.1190d",
     "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":1292.5874557495117,
-    "y":911.2824640274048,
-    "z":"862ed298.34c67",
+    "x":1177.5874710083008,
+    "y":803.6824731826782,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"6411ad19.c5cdf4",
+    "id":"52d019c0.82c438",
     "type":"block",
     "name":"block: atomic",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1037.8148307800293,
-    "y":563.3671925067902,
-    "z":"862ed298.34c67",
+    "x":922.8148460388184,
+    "y":455.7672016620636,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "b10b50e5.999b7",
-        "733a431f.52145c"
+        "515d911f.70f65",
+        "388539de.469206"
       ]
     ]
   },
   {
-    "id":"b10b50e5.999b7",
+    "id":"515d911f.70f65",
     "type":"switchNode",
     "name":"switch brg length",
     "xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n",
     "comments":"",
     "outputs":1,
-    "x":1283.672077178955,
-    "y":597.6529557704926,
-    "z":"862ed298.34c67",
+    "x":1168.6720924377441,
+    "y":490.052964925766,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "1e55cba1.58e264"
+        "a34fd934.5de948"
       ]
     ]
   },
   {
-    "id":"1e55cba1.58e264",
+    "id":"a34fd934.5de948",
     "type":"other",
     "name":"outcome 1",
     "xml":"<outcome value='1'>\n",
     "comments":"",
     "outputs":1,
-    "x":1474.6720809936523,
-    "y":597.6529533863068,
-    "z":"862ed298.34c67",
+    "x":1359.6720962524414,
+    "y":490.0529625415802,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "9832defc.b7dbf"
+        "1534773e.2f1e69"
       ]
     ]
   },
   {
-    "id":"34a64577.34e1ba",
+    "id":"d1c6c306.93b2a",
     "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":1874.5292167663574,
-    "y":598.2243776321411,
-    "z":"862ed298.34c67",
+    "x":1759.5292320251465,
+    "y":490.62438678741455,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"9832defc.b7dbf",
+    "id":"1534773e.2f1e69",
     "type":"block",
     "name":"block: atomic",
     "xml":"<block atomic='true'>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1645.5290641784668,
-    "y":598.224422454834,
-    "z":"862ed298.34c67",
+    "x":1530.5290794372559,
+    "y":490.6244316101074,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "34a64577.34e1ba",
-        "559f0e6b.981e9",
-        "4c4b37a6.f52e48"
+        "d1c6c306.93b2a",
+        "2feb6861.c55048",
+        "834030e7.c71a9"
       ]
     ]
   },
   {
-    "id":"559f0e6b.981e9",
+    "id":"2feb6861.c55048",
     "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":1872.5294609069824,
-    "y":665.6529417037964,
-    "z":"862ed298.34c67",
+    "x":1757.5294761657715,
+    "y":558.0529508590698,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"7ea8f57e.8498ac",
+    "id":"2bb45a1f.a94976",
     "type":"comment",
     "name":"GET brg-allotted-resource from mdsal",
     "info":"",
     "comments":"",
-    "x":624.8148002624512,
-    "y":527.3671834468842,
-    "z":"862ed298.34c67",
+    "x":509.81481552124023,
+    "y":419.7671926021576,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"4c4b37a6.f52e48",
+    "id":"834030e7.c71a9",
     "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":1882.529239654541,
-    "y":631.2243757247925,
-    "z":"862ed298.34c67",
+    "x":1767.52925491333,
+    "y":523.6243848800659,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "bc5b9fe2.1d29b",
-        "1af731a5.1e75de"
+        "930ea57d.0f30f8",
+        "4c055a7a.ab9f24"
       ]
     ]
   },
   {
-    "id":"bc5b9fe2.1d29b",
+    "id":"930ea57d.0f30f8",
     "type":"outcome",
     "name":"outcome Created",
     "xml":"<outcome value='Created'>\n",
     "comments":"",
     "outputs":1,
-    "x":2094.129196166992,
-    "y":592.2243757247925,
-    "z":"862ed298.34c67",
+    "x":1979.1292114257812,
+    "y":484.6243848800659,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "6d467f9b.08848"
+        "56b9c5ed.fb1fec"
       ]
     ]
   },
   {
-    "id":"1af731a5.1e75de",
+    "id":"4c055a7a.ab9f24",
     "type":"outcome",
     "name":"outcome Other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":2119.8435707092285,
-    "y":627.6529664993286,
-    "z":"862ed298.34c67",
+    "x":2004.8435859680176,
+    "y":520.052975654602,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "6d467f9b.08848"
+        "56b9c5ed.fb1fec"
       ]
     ]
   },
   {
-    "id":"6005dffd.1f2f8",
+    "id":"77c5ca77.4678d4",
     "type":"comment",
     "name":"Set allotted-resource-identifiers",
     "info":"",
     "comments":"",
-    "x":580.338623046875,
-    "y":617.9386367797852,
-    "z":"862ed298.34c67",
+    "x":465.33863830566406,
+    "y":510.3386459350586,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"733a431f.52145c",
+    "id":"388539de.469206",
     "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":1363.3864097595215,
-    "y":563.3672845363617,
-    "z":"862ed298.34c67",
+    "x":1248.3864250183105,
+    "y":455.76729369163513,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"40eb8f67.e7464",
+    "id":"ddaea4c6.1d9aa8",
     "type":"comment",
     "name":"Create urls for restapi",
     "info":"",
     "comments":"",
-    "x":535.9576454162598,
-    "y":432.224347114563,
-    "z":"862ed298.34c67",
+    "x":420.9576606750488,
+    "y":324.6243562698364,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"5e98e0e7.a8f18",
+    "id":"9efe8414.91ed18",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1268.243423461914,
-    "y":877.0817142501473,
-    "z":"862ed298.34c67",
+    "x":1153.2434387207031,
+    "y":769.4817234054208,
+    "z":"f97ade34.d219f",
     "wires":[
       [
 
@@ -508,28 +513,28 @@
     ]
   },
   {
-    "id":"234bb7ec.13fd38",
+    "id":"ff41987d.46ce18",
     "type":"comment",
     "name":"TO DO: vnf/put parent",
     "info":"",
     "comments":"",
-    "x":538.2433624267578,
-    "y":805.7481861114502,
-    "z":"862ed298.34c67",
+    "x":423.2433776855469,
+    "y":698.1481952667236,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"fc290b65.76c018",
+    "id":"50e72018.6624",
     "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":522.2433662414551,
-    "y":735.081545829773,
-    "z":"862ed298.34c67",
+    "x":407.24338150024414,
+    "y":627.4815549850464,
+    "z":"f97ade34.d219f",
     "wires":[
       [
 
@@ -537,32 +542,32 @@
     ]
   },
   {
-    "id":"9c39ee65.4e4a7",
+    "id":"d98ea5a4.989128",
     "type":"other",
     "name":"other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":856.5766716003418,
-    "y":599.0814158916473,
-    "z":"862ed298.34c67",
+    "x":741.5766868591309,
+    "y":491.4814250469208,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "ba479039.83567"
+        "838280a9.26353"
       ]
     ]
   },
   {
-    "id":"ba479039.83567",
+    "id":"838280a9.26353",
     "type":"block",
     "name":"block: atomic",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1036.5766220092773,
-    "y":599.7479665279388,
-    "z":"862ed298.34c67",
+    "x":921.5766372680664,
+    "y":492.1479756832123,
+    "z":"f97ade34.d219f",
     "wires":[
       [
 
@@ -570,29 +575,29 @@
     ]
   },
   {
-    "id":"624fd076.69a64",
+    "id":"ef8d3b6f.8c3c58",
     "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":505.243408203125,
-    "y":654.7481575012207,
-    "z":"862ed298.34c67",
+    "x":390.24342346191406,
+    "y":547.1481666564941,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"6d467f9b.08848",
+    "id":"56b9c5ed.fb1fec",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":2308.599712371826,
-    "y":593.6000099182129,
-    "z":"862ed298.34c67",
+    "x":2193.5997276306152,
+    "y":486.0000190734863,
+    "z":"f97ade34.d219f",
     "wires":[
       [
 
@@ -600,157 +605,157 @@
     ]
   },
   {
-    "id":"f79aa33.e64036",
+    "id":"531893c6.c405dc",
     "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":565.8571472167969,
-    "y":838.8380537033081,
-    "z":"862ed298.34c67",
+    "x":450.85716247558594,
+    "y":731.2380628585815,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "3772e0cf.d582a",
-        "e579d939.2bcda8"
+        "35b2a07f.fbd7b",
+        "172a8c52.4cd114"
       ]
     ]
   },
   {
-    "id":"3772e0cf.d582a",
+    "id":"35b2a07f.fbd7b",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":821.6190414428711,
-    "y":821.7905507087708,
-    "z":"862ed298.34c67",
+    "x":706.6190567016602,
+    "y":714.1905598640442,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "bd539ae8.82afb8"
+        "22b0ba82.e21336"
       ]
     ]
   },
   {
-    "id":"bd539ae8.82afb8",
+    "id":"22b0ba82.e21336",
     "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":988.1429214477539,
-    "y":833.4096217155457,
-    "z":"862ed298.34c67",
+    "x":873.142936706543,
+    "y":725.8096308708191,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"e579d939.2bcda8",
+    "id":"172a8c52.4cd114",
     "type":"failure",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":828.7143287658691,
-    "y":854.5525183677673,
-    "z":"862ed298.34c67",
+    "x":713.7143440246582,
+    "y":746.9525275230408,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "bd539ae8.82afb8"
+        "22b0ba82.e21336"
       ]
     ]
   },
   {
-    "id":"df8cc0e.bcffc4",
+    "id":"7c4bd318.44ab8c",
     "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":682.6666412353516,
-    "y":1250.2666578292847,
-    "z":"862ed298.34c67",
+    "x":563.0000610351562,
+    "y":1300.6668300628662,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "d7f7d75a.4c4868",
-        "3486dace.a913f6",
-        "b9738ec8.10f4e"
+        "37688fbb.e25e1",
+        "ac4b28e5.62c318",
+        "12690113.8980bf"
       ]
     ]
   },
   {
-    "id":"d7f7d75a.4c4868",
+    "id":"37688fbb.e25e1",
     "type":"not-found",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":1016.641429901123,
-    "y":1309.598269842565,
-    "z":"862ed298.34c67",
+    "x":896.9748497009277,
+    "y":1359.9984420761466,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "882ff805.77cb38"
+        "5f4a9e0d.9b39c"
       ]
     ]
   },
   {
-    "id":"3486dace.a913f6",
+    "id":"ac4b28e5.62c318",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":1007.6414794921875,
-    "y":1278.0982955917716,
-    "z":"862ed298.34c67",
+    "x":887.9748992919922,
+    "y":1328.4984678253531,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "882ff805.77cb38"
+        "5f4a9e0d.9b39c"
       ]
     ]
   },
   {
-    "id":"b9738ec8.10f4e",
+    "id":"12690113.8980bf",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":1011.3915176391602,
-    "y":1248.455400466919,
-    "z":"862ed298.34c67",
+    "x":891.7249374389648,
+    "y":1298.8555727005005,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "f51263c3.6ba25"
+        "2f4610c6.cb40f"
       ]
     ]
   },
   {
-    "id":"882ff805.77cb38",
+    "id":"5f4a9e0d.9b39c",
     "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":1177.3915176391602,
-    "y":1278.8483194336295,
-    "z":"862ed298.34c67",
+    "x":1057.7249374389648,
+    "y":1329.248491667211,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"f51263c3.6ba25",
+    "id":"2f4610c6.cb40f",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1153.0474853515625,
-    "y":1244.647569656372,
-    "z":"862ed298.34c67",
+    "x":1033.3809051513672,
+    "y":1295.0477418899536,
+    "z":"f97ade34.d219f",
     "wires":[
       [
 
@@ -758,95 +763,95 @@
     ]
   },
   {
-    "id":"bc6ed59e.4e1728",
+    "id":"14b435e1.73803a",
     "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":664.3334045410156,
-    "y":1396.9334523677826,
-    "z":"862ed298.34c67",
+    "x":544.6668243408203,
+    "y":1447.3336246013641,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "fa0c2499.dcc778",
-        "183327f.13d81d8",
-        "c3f0b691.125e48"
+        "3797ac64.379644",
+        "fce58130.bb12a",
+        "6c45ae8b.a4da4"
       ]
     ]
   },
   {
-    "id":"fa0c2499.dcc778",
+    "id":"3797ac64.379644",
     "type":"not-found",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":1012.3080425262451,
-    "y":1472.598369024694,
-    "z":"862ed298.34c67",
+    "x":892.6414623260498,
+    "y":1522.9985412582755,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "f22038a6.365ea8"
+        "5e305e58.bfbe4"
       ]
     ]
   },
   {
-    "id":"183327f.13d81d8",
+    "id":"fce58130.bb12a",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":1003.3080921173096,
-    "y":1441.0983947739005,
-    "z":"862ed298.34c67",
+    "x":883.6415119171143,
+    "y":1491.498567007482,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "f22038a6.365ea8"
+        "5e305e58.bfbe4"
       ]
     ]
   },
   {
-    "id":"c3f0b691.125e48",
+    "id":"6c45ae8b.a4da4",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":1007.0581302642822,
-    "y":1411.4554996490479,
-    "z":"862ed298.34c67",
+    "x":887.3915500640869,
+    "y":1461.8556718826294,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "27dadc9a.d76214"
+        "fb3d8268.ba343"
       ]
     ]
   },
   {
-    "id":"f22038a6.365ea8",
+    "id":"5e305e58.bfbe4",
     "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":1173.0581302642822,
-    "y":1441.8484186157584,
-    "z":"862ed298.34c67",
+    "x":1053.391550064087,
+    "y":1492.24859084934,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"27dadc9a.d76214",
+    "id":"fb3d8268.ba343",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1148.7140979766846,
-    "y":1407.647668838501,
-    "z":"862ed298.34c67",
+    "x":1029.0475177764893,
+    "y":1458.0478410720825,
+    "z":"f97ade34.d219f",
     "wires":[
       [
 
@@ -854,28 +859,28 @@
     ]
   },
   {
-    "id":"77b9bf2c.b44d5",
+    "id":"815c3841.72ff98",
     "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.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` \" />",
+    "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.brg-topology.brg-assignments.vgmux-lan-ip` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` \" />",
     "comments":"",
-    "x":618.7777862548828,
-    "y":1115.2669172286987,
-    "z":"862ed298.34c67",
+    "x":499.1112060546875,
+    "y":1165.6670894622803,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"a6207934.86f518",
+    "id":"970b23d4.8d05e",
     "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":590.4444274902344,
-    "y":1170.2666959762573,
-    "z":"862ed298.34c67",
+    "x":470.77784729003906,
+    "y":1220.6668682098389,
+    "z":"f97ade34.d219f",
     "wires":[
       [
 
@@ -883,15 +888,15 @@
     ]
   },
   {
-    "id":"9b6d7ee4.10e23",
+    "id":"b8e9e857.b4d5e8",
     "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":582.4444427490234,
-    "y":1029.9332246780396,
-    "z":"862ed298.34c67",
+    "x":461.7778778076172,
+    "y":1109.3333940505981,
+    "z":"f97ade34.d219f",
     "wires":[
       [
 
@@ -899,273 +904,260 @@
     ]
   },
   {
-    "id":"7e8c5cfa.726864",
+    "id":"a9cc06ef.aed3d8",
     "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":573.7777404785156,
-    "y":1321.9333276748657,
-    "z":"862ed298.34c67",
+    "x":454.1111602783203,
+    "y":1372.3334999084473,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"f6f2dfd6.852a7",
-    "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":740.0000152587891,
-    "y":979.100019454956,
-    "z":"862ed298.34c67",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"71a3722d.c764ec",
+    "id":"a0257b81.5e78c8",
     "type":"comment",
     "name":"save service data for BRG to md-sal for SO to do GET ",
     "info":"http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/config/GENERIC-RESOURCE-API:services/service/e565bb6b-de14-4a5c-a992-65a681771a7a/service-data/service-topology/\n\n\nservice-instance-id is of the vBRG (in VNF-API data)",
     "comments":"",
-    "x":626.5807056427002,
-    "y":1518.8236003890634,
-    "z":"862ed298.34c67",
+    "x":519.2949829101562,
+    "y":1504.9380531311035,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"9b340dbc.c3cb9",
+    "id":"13ddb22.203944e",
     "type":"execute",
     "name":"execute RestApiCallNode - Get service-data by vnf-id",
     "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.vnf-api-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=\"service-data\" />\n\n",
     "comments":"",
     "outputs":1,
-    "x":639.5014038085938,
-    "y":1639.934621810913,
-    "z":"862ed298.34c67",
+    "x":516.5014190673828,
+    "y":1630.3347854614258,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "4e83fb54.735574",
-        "7c8664e4.3c832c"
+        "855aaba9.6b3aa8",
+        "a699d7fa.a36428"
       ]
     ]
   },
   {
-    "id":"4e83fb54.735574",
+    "id":"855aaba9.6b3aa8",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":928.3213233947754,
-    "y":1637.3139653205872,
-    "z":"862ed298.34c67",
+    "x":805.3213386535645,
+    "y":1627.7141289710999,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "79817d79.711c34"
+        "f2f0f6cf.5680f8"
       ]
     ]
   },
   {
-    "id":"79817d79.711c34",
+    "id":"f2f0f6cf.5680f8",
     "type":"block",
     "name":"block: atomic",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1109.3212776184082,
-    "y":1637.8139147758484,
-    "z":"862ed298.34c67",
+    "x":986.3212928771973,
+    "y":1628.214078426361,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "6046c592.b5db8c",
-        "c9922e86.95618"
+        "4bd61641.b9f8b8",
+        "917b8b10.4cc338"
       ]
     ]
   },
   {
-    "id":"6046c592.b5db8c",
+    "id":"4bd61641.b9f8b8",
     "type":"switchNode",
     "name":"switch brg length",
     "xml":"<switch test='`$service-data.service-data_length`'>\n",
     "comments":"",
     "outputs":1,
-    "x":1355.178524017334,
-    "y":1672.0996780395508,
-    "z":"862ed298.34c67",
+    "x":1232.178539276123,
+    "y":1662.4998416900635,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "c543d4c5.a58778"
+        "8fd40478.4d0058"
       ]
     ]
   },
   {
-    "id":"c543d4c5.a58778",
+    "id":"8fd40478.4d0058",
     "type":"other",
     "name":"outcome 1",
     "xml":"<outcome value='1'>\n",
     "comments":"",
     "outputs":1,
-    "x":1546.1785278320312,
-    "y":1672.099675655365,
-    "z":"862ed298.34c67",
+    "x":1423.1785430908203,
+    "y":1662.4998393058777,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "3876bd15.40e182"
+        "dfcd0278.2218"
       ]
     ]
   },
   {
-    "id":"7a8acdfc.bcdab4",
+    "id":"b0e5cf35.cee86",
     "type":"set",
     "name":"set service-data from get",
     "xml":"<set>\n<parameter name='tmp.service-data.' value='$service-data.service-data[0].' />\n",
     "comments":"",
-    "x":1946.0356636047363,
-    "y":1672.6710999011993,
-    "z":"862ed298.34c67",
+    "x":1823.0356788635254,
+    "y":1663.071263551712,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"3876bd15.40e182",
+    "id":"dfcd0278.2218",
     "type":"block",
     "name":"block: atomic",
     "xml":"<block atomic='true'>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1717.0355110168457,
-    "y":1672.6711447238922,
-    "z":"862ed298.34c67",
+    "x":1594.0355262756348,
+    "y":1663.071308374405,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "7a8acdfc.bcdab4",
-        "b568a24.2ba8a6"
+        "b0e5cf35.cee86",
+        "86e0cd73.efb82"
       ]
     ]
   },
   {
-    "id":"310849e5.8628a6",
+    "id":"e935998f.98c578",
     "type":"comment",
     "name":"GET vnf-api service info",
     "info":"",
     "comments":"",
-    "x":544.8926582336426,
-    "y":1603.2423181533813,
-    "z":"862ed298.34c67",
+    "x":421.89267349243164,
+    "y":1593.642481803894,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"b568a24.2ba8a6",
+    "id":"86e0cd73.efb82",
     "type":"switchNode",
     "name":"switch order-status",
     "xml":"<switch test='`$tmp.service-data.order-status`'>\n",
     "comments":"",
     "outputs":1,
-    "x":1929.7498817443848,
-    "y":1724.242525100708,
-    "z":"862ed298.34c67",
+    "x":1806.7498970031738,
+    "y":1714.6426887512207,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "8af678dd.44f128",
-        "afb48fe3.c1a3e"
+        "80a04a27.27e6e8",
+        "bd91de80.00dd6"
       ]
     ]
   },
   {
-    "id":"8af678dd.44f128",
+    "id":"80a04a27.27e6e8",
     "type":"outcome",
     "name":"outcome Created",
     "xml":"<outcome value='Created'>\n",
     "comments":"",
     "outputs":1,
-    "x":2165.635643005371,
-    "y":1666.6710979938507,
-    "z":"862ed298.34c67",
+    "x":2046.6354598999023,
+    "y":1679.071237564087,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "d2e19aea.143628"
+        "e6bcc367.5fb5e"
       ]
     ]
   },
   {
-    "id":"afb48fe3.c1a3e",
+    "id":"bd91de80.00dd6",
     "type":"outcome",
     "name":"outcome Other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":2191.3500175476074,
-    "y":1702.0996887683868,
-    "z":"862ed298.34c67",
+    "x":2072.3498344421387,
+    "y":1714.499828338623,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "d2e19aea.143628"
+        "e6bcc367.5fb5e"
       ]
     ]
   },
   {
-    "id":"3f5ea151.93eb9e",
+    "id":"ead3daba.b613a8",
     "type":"comment",
     "name":"Set service-data",
     "info":"",
     "comments":"",
-    "x":518.9879188537598,
-    "y":1688.0995111465454,
-    "z":"862ed298.34c67",
+    "x":395.9879341125488,
+    "y":1678.499674797058,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"c9922e86.95618",
+    "id":"917b8b10.4cc338",
     "type":"set",
     "name":"save backup copy of mdsal-ar for rollback",
     "xml":"<set>\n<parameter name='bk-service-data' value='$service-data.' />\n",
     "comments":"",
-    "x":1434.8928565979004,
-    "y":1637.81400680542,
-    "z":"862ed298.34c67",
+    "x":1311.8928718566895,
+    "y":1628.2141704559326,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"7c8664e4.3c832c",
+    "id":"a699d7fa.a36428",
     "type":"other",
     "name":"other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":928.0831184387207,
-    "y":1673.5281381607056,
-    "z":"862ed298.34c67",
+    "x":805.0831336975098,
+    "y":1663.9283018112183,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "d7ef85ba.f3d028"
+        "bcb372d0.e3af8"
       ]
     ]
   },
   {
-    "id":"d7ef85ba.f3d028",
+    "id":"bcb372d0.e3af8",
     "type":"block",
     "name":"block: atomic",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1108.0830688476562,
-    "y":1674.194688796997,
-    "z":"862ed298.34c67",
+    "x":985.0830841064453,
+    "y":1664.5948524475098,
+    "z":"f97ade34.d219f",
     "wires":[
       [
 
@@ -1173,16 +1165,16 @@
     ]
   },
   {
-    "id":"d2e19aea.143628",
+    "id":"e6bcc367.5fb5e",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":2380.106159210205,
-    "y":1668.0467321872711,
-    "z":"862ed298.34c67",
+    "x":2261.1059761047363,
+    "y":1680.4468717575073,
+    "z":"f97ade34.d219f",
     "wires":[
       [
 
@@ -1190,15 +1182,15 @@
     ]
   },
   {
-    "id":"a9b802e0.3c87a",
+    "id":"17504c2b.5ecc04",
     "type":"execute",
     "name":"generate vnf service-info url",
     "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.vnf-api.service-information`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.vnf-api-url\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`\"/>\n",
     "comments":"",
     "outputs":1,
-    "x":565.3108673095703,
-    "y":1561.3633251190186,
-    "z":"862ed298.34c67",
+    "x":442.3108825683594,
+    "y":1551.7634887695312,
+    "z":"f97ade34.d219f",
     "wires":[
       [
 
@@ -1206,95 +1198,95 @@
     ]
   },
   {
-    "id":"570d3d0b.27f934",
+    "id":"173f16cf.2f6b79",
     "type":"execute",
     "name":"execute RestApiCallNode - PUT service into service",
     "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.services.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.services-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":639.5965881347656,
-    "y":1816.6016731262207,
-    "z":"862ed298.34c67",
+    "x":516.5966033935547,
+    "y":1807.0018367767334,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "50cebd0f.3a5ba4",
-        "e6947788.b35638",
-        "3b96374a.556b08"
+        "5cf17dae.c40c44",
+        "35de11e4.9a122e",
+        "95e02b4f.ebd798"
       ]
     ]
   },
   {
-    "id":"50cebd0f.3a5ba4",
+    "id":"5cf17dae.c40c44",
     "type":"not-found",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":1145.8094444274902,
-    "y":1811.123685836792,
-    "z":"862ed298.34c67",
+    "x":1022.8094596862793,
+    "y":1801.5238494873047,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "90f2f682.5d5ec8"
+        "6d015df7.3af934"
       ]
     ]
   },
   {
-    "id":"e6947788.b35638",
+    "id":"35de11e4.9a122e",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":1136.8094940185547,
-    "y":1779.6237115859985,
-    "z":"862ed298.34c67",
+    "x":1013.8095092773438,
+    "y":1770.0238752365112,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "90f2f682.5d5ec8"
+        "6d015df7.3af934"
       ]
     ]
   },
   {
-    "id":"3b96374a.556b08",
+    "id":"95e02b4f.ebd798",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":1140.5595321655273,
-    "y":1749.9808164611459,
-    "z":"862ed298.34c67",
+    "x":1017.5595474243164,
+    "y":1740.3809801116586,
+    "z":"f97ade34.d219f",
     "wires":[
       [
-        "53875c1b.048fd4"
+        "90681ac.479fee8"
       ]
     ]
   },
   {
-    "id":"90f2f682.5d5ec8",
+    "id":"6d015df7.3af934",
     "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":1306.5595321655273,
-    "y":1780.3737354278564,
-    "z":"862ed298.34c67",
+    "x":1183.5595474243164,
+    "y":1770.7738990783691,
+    "z":"f97ade34.d219f",
     "wires":[
 
     ]
   },
   {
-    "id":"53875c1b.048fd4",
+    "id":"90681ac.479fee8",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1282.2154998779297,
-    "y":1746.172985650599,
-    "z":"862ed298.34c67",
+    "x":1159.2155151367188,
+    "y":1736.5731493011117,
+    "z":"f97ade34.d219f",
     "wires":[
       [
 
@@ -1302,19 +1294,90 @@
     ]
   },
   {
-    "id":"5a18305b.6de8e",
+    "id":"75aa4c7c.d1f814",
     "type":"execute",
     "name":"generate services url",
     "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.services`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.services-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.service-data.service-information.service-instance-id`\"/>\n",
     "comments":"",
     "outputs":1,
-    "x":542.929931640625,
-    "y":1776.1254720687866,
-    "z":"862ed298.34c67",
+    "x":419.92994689941406,
+    "y":1766.5256357192993,
+    "z":"f97ade34.d219f",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"5bcb3869.fa6198",
+    "type":"get-resource",
+    "name":"get-resource IPADDR from dmaap DHCP_MAP ",
+    "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='IPADDR' key=\"SELECT min(ip_addr) ip from DHCP_MAP where mac_addr = $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-mac-address\" pfx=\"tmp.brg-wan-ip\" >\n",
+    "comments":"",
+    "outputs":1,
+    "x":507.85716247558594,
+    "y":857.7501087188721,
+    "z":"f97ade34.d219f",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"60d1bf52.ad3d6",
+    "type":"set",
+    "name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip",
+    "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip' value='`$tmp.brg-wan-ip.ip`' />\n",
+    "comments":"",
+    "x":594.0000305175781,
+    "y":907.0000267028809,
+    "z":"f97ade34.d219f",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"ac82543e.0a2288",
+    "type":"set",
+    "name":"set tmp.ar.consuming-service-instance-id to find vgmux-lan-ip",
+    "xml":"<set>\n<parameter name='tmp.ar.consuming-service-instance-id' value='`$allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n",
+    "comments":"",
+    "x":554.9999694824219,
+    "y":954.9998550415039,
+    "z":"f97ade34.d219f",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"4a0f8ea5.474a2",
+    "type":"call",
+    "name":"call GENERIC-RESOURCE-API:get-vgmux-lan-ip",
+    "xml":"<call module='GENERIC-RESOURCE-API' rpc='get-vgmux-lan-ip' mode='sync' >\n",
+    "comments":"",
+    "outputs":1,
+    "x":515.0000152587891,
+    "y":1003.3331918716431,
+    "z":"f97ade34.d219f",
     "wires":[
       [
 
       ]
     ]
+  },
+  {
+    "id":"5f66c498.33c76c",
+    "type":"set",
+    "name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip",
+    "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip' value='`$tmp.vgmux-lan-ip`' />\n",
+    "comments":"",
+    "x":593.3332672119141,
+    "y":1056.6665697097778,
+    "z":"f97ade34.d219f",
+    "wires":[
+
+    ]
   }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-vgmux-lan-ip.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-vgmux-lan-ip.json
new file mode 100644
index 00000000..75b0fac8
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-vgmux-lan-ip.json
@@ -0,0 +1,162 @@
+[
+  {
+    "id":"39f3ae67.7e9242",
+    "type":"dgstart",
+    "name":"DGSTART",
+    "outputs":1,
+    "x":186.66665649414062,
+    "y":111.66666412353516,
+    "z":"e0aca357.6f32a",
+    "wires":[
+      [
+        "a29ec69.164b938"
+      ]
+    ]
+  },
+  {
+    "id":"a29ec69.164b938",
+    "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":282.90473556518555,
+    "y":172.61905479431152,
+    "z":"e0aca357.6f32a",
+    "wires":[
+      [
+        "4705cb34.a0c174"
+      ]
+    ]
+  },
+  {
+    "id":"4705cb34.a0c174",
+    "type":"method",
+    "name":"get-vgmux-lan-ip",
+    "xml":"<method rpc='get-vgmux-lan-ip' mode='sync'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":303.82152938842773,
+    "y":241.1904535293579,
+    "z":"e0aca357.6f32a",
+    "wires":[
+      [
+        "7864ada9.710574"
+      ]
+    ]
+  },
+  {
+    "id":"7864ada9.710574",
+    "type":"block",
+    "name":"block : atomic",
+    "xml":"<block atomic=\"true\">",
+    "atomic":"true",
+    "comments":"",
+    "outputs":1,
+    "x":237.14284896850586,
+    "y":351.19045209884644,
+    "z":"e0aca357.6f32a",
+    "wires":[
+      [
+        "2c32d527.ae06da",
+        "9e578822.5550a8"
+      ]
+    ]
+  },
+  {
+    "id":"9e578822.5550a8",
+    "type":"for",
+    "name":"for tmp.tunnel-ar",
+    "xml":"<for index='tunnelidx' start='0' end='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource_length`' >\n\n\n",
+    "comments":"",
+    "outputs":1,
+    "x":421.66666412353516,
+    "y":359.9999370574951,
+    "z":"e0aca357.6f32a",
+    "wires":[
+      [
+        "4655d18f.1efdc"
+      ]
+    ]
+  },
+  {
+    "id":"2c32d527.ae06da",
+    "type":"get-resource",
+    "name":"get-resource tunnelxconn-ar",
+    "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='tunnelxconn-allotted-resources' pfx='tmp.tunnel-ar.data' >\n",
+    "comments":"",
+    "outputs":1,
+    "x":499.99998474121094,
+    "y":301.33330726623535,
+    "z":"e0aca357.6f32a",
+    "wires":[
+      [
+
+      ]
+    ]
+  },
+  {
+    "id":"4655d18f.1efdc",
+    "type":"switchNode",
+    "name":"switch consuming-service-instance-id match",
+    "xml":"<switch test='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$tunnelidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id == $tmp.ar.consuming-service-instance-id`'>\n\n\n",
+    "comments":"",
+    "outputs":1,
+    "x":706.3333587646484,
+    "y":358.9999713897705,
+    "z":"e0aca357.6f32a",
+    "wires":[
+      [
+        "d430e328.d45e6"
+      ]
+    ]
+  },
+  {
+    "id":"d430e328.d45e6",
+    "type":"success",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":900.3333625793457,
+    "y":299.99995613098145,
+    "z":"e0aca357.6f32a",
+    "wires":[
+      [
+        "bbaf2c6f.a5b81"
+      ]
+    ]
+  },
+  {
+    "id":"bbaf2c6f.a5b81",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":1124.9999465942383,
+    "y":333.6666135787964,
+    "z":"e0aca357.6f32a",
+    "wires":[
+      [
+        "885aaec0.195b"
+      ]
+    ]
+  },
+  {
+    "id":"885aaec0.195b",
+    "type":"set",
+    "name":"set  tmp.vgmux-lan-ip",
+    "xml":"<set>\n<parameter name='tmp.vgmux-lan-ip' value='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$tunnelidx].allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip`' />\n",
+    "comments":"",
+    "x":1310.6668128967285,
+    "y":330.3332872390747,
+    "z":"e0aca357.6f32a",
+    "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 ff5ba3e3..991d22f8 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
@@ -129,6 +129,17 @@
                     </return>

                 </outcome>

             </execute>

+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='IPADDR' key="SELECT min(ip_addr) ip from DHCP_MAP where mac_addr = $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-mac-address" pfx="tmp.brg-wan-ip" ></get-resource>

+            <set>

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

+            </set>

+            <set>

+                <parameter name='tmp.ar.consuming-service-instance-id' value='`$allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />

+            </set>

+            <call module='GENERIC-RESOURCE-API' rpc='get-vgmux-lan-ip' mode='sync' ></call>

+            <set>

+                <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip' value='`$tmp.vgmux-lan-ip`' />

+            </set>

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

@@ -137,8 +148,8 @@
             </execute>

             <set>

                 <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-dest-ip' value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip` " />

+                <parameter name='tmp.tunnel-src-ip' value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-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' >

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vgmux-lan-ip.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vgmux-lan-ip.xml
new file mode 100644
index 00000000..563e4bf8
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vgmux-lan-ip.xml
@@ -0,0 +1,18 @@
+<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='get-vgmux-lan-ip' mode='sync'>
+        <block atomic="true">
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='tunnelxconn-allotted-resources' pfx='tmp.tunnel-ar.data' ></get-resource>
+            <for index='tunnelidx' start='0' end='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource_length`' >
+                <switch test='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$tunnelidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id == $tmp.ar.consuming-service-instance-id`'>
+                    <outcome value='true'>
+                        <block>
+                            <set>
+                                <parameter name='tmp.vgmux-lan-ip' value='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$tunnelidx].allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip`' />
+                            </set>
+                        </block>
+                    </outcome>
+                </switch>
+            </for>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file