From f2db952b664008867d2095dd9c9f85882afa924b Mon Sep 17 00:00:00 2001
From: Brian Freeman <bf1936@att.com>
Date: Thu, 16 Nov 2017 17:27:30 -0500
Subject: [PATCH] Fixes from Integration 11-16

Issue-ID: SDNC-201
Change-Id: I0fce48872828e5c38b37588eae7c5a000099d96d
Signed-off-by: Brian Freeman <bf1936@att.com>
(cherry picked from commit 2c45a4ec0ef8d95f8f1817e6b65768c61065c55c [formerly 65631026c8f90a2c24be8e7411882bb9599a3b87])

Former-commit-id: 1ed63a4350cff6c4b6c4ee8ee36f412153ba3d06
---
 ...SOURCE-API_brg-topology-operation-activate.json | 1941 +-------------------
 ...RESOURCE-API_brg-topology-operation-assign.json | 1277 +------------
 .../GENERIC-RESOURCE-API_get-tunnelxconn-ar.json   |  163 +-
 .../GENERIC-RESOURCE-API_gw-vfmodule-update.json   |    2 +-
 ...ESOURCE-API_brg-topology-operation-activate.xml |  752 ++++----
 ...-RESOURCE-API_brg-topology-operation-assign.xml |  514 +++---
 .../GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml    |   35 +-
 .../GENERIC-RESOURCE-API_gw-vfmodule-update.xml    |   19 +-
 8 files changed, 603 insertions(+), 4100 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 3fa89107..32b7267c 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,1940 +1 @@
-[
-  {
-    "id":"ceb899a7.d341c8",
-    "type":"dgstart",
-    "name":"DGSTART",
-    "outputs":1,
-    "x":153.3333282470703,
-    "y":103.33332824707031,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "18952f76.559ee1"
-      ]
-    ]
-  },
-  {
-    "id":"18952f76.559ee1",
-    "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":249.57140731811523,
-    "y":164.28571891784668,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "179672e8.9c551d"
-      ]
-    ]
-  },
-  {
-    "id":"179672e8.9c551d",
-    "type":"method",
-    "name":"brg-topology-operation-activate",
-    "xml":"<method rpc='brg-topology-operation-activate' mode='sync'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":295.48818588256836,
-    "y":199.5237741470337,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "9f35bd45.8a6a4"
-      ]
-    ]
-  },
-  {
-    "id":"9f35bd45.8a6a4",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":191.30953216552734,
-    "y":1195.357120513916,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "5f6476c7.1116b8",
-        "1fd1cf4d.7fed61",
-        "db740f9d.29312",
-        "ecc54a34.453788",
-        "96b93a8e.8fa738",
-        "89375566.2dec58",
-        "af147a22.52b628",
-        "6f832b94.924d84",
-        "3806a837.de7398",
-        "6323c04e.54628",
-        "dfa3f56.72b5808",
-        "3b2fb4.6046004c",
-        "1375a965.f31cb7",
-        "3545827f.8f7f4e",
-        "27f6106d.5aed4",
-        "d538a2c.85a8a6",
-        "d0da56bf.5622e8",
-        "e3151796.db37b8",
-        "247b453a.8a26fa",
-        "34e00507.e2015a",
-        "7f06ccd3.5f4544",
-        "a690ec81.282ab",
-        "7cd4ecac.c5c874",
-        "afbc0299.7c62f",
-        "a76a910b.2c1fa",
-        "43cd6015.f74aa",
-        "a44bc809.331528",
-        "4ebb5d6e.3b72b4",
-        "94c1462c.043b88",
-        "890a1877.5b6b98",
-        "dad15ca1.13a96",
-        "898815a9.12a638",
-        "ddefeb7c.fde178",
-        "127d8c70.64ae14",
-        "59a607df.c64478",
-        "2b05ed04.a37c82"
-      ]
-    ]
-  },
-  {
-    "id":"1fd1cf4d.7fed61",
-    "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":467.8335380554199,
-    "y":2659.7151918411255,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"5f6476c7.1116b8",
-    "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":496.58745193481445,
-    "y":2623.8377380371094,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"6323c04e.54628",
-    "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":510.0875473022461,
-    "y":723.3847284317017,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ecc54a34.453788",
-    "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":466.0713920593262,
-    "y":316.6666536331177,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"db740f9d.29312",
-    "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":513.3306541442871,
-    "y":282.9259195327759,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"96b93a8e.8fa738",
-    "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":472.3267478942871,
-    "y":352.5648527145386,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"af147a22.52b628",
-    "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":534.8520812988281,
-    "y":513.7928199768066,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "3d9ecb10.c6dbd4",
-        "5a4abfd2.0da15"
-      ]
-    ]
-  },
-  {
-    "id":"89375566.2dec58",
-    "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":500.3981819152832,
-    "y":412.3505573272705,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"3d9ecb10.c6dbd4",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":792.1482200622559,
-    "y":512.6005804538727,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "cb63369d.a052b8"
-      ]
-    ]
-  },
-  {
-    "id":"6f832b94.924d84",
-    "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":542.8626403808594,
-    "y":866.7674598693848,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "39dd55f9.494c7a",
-        "f6c69264.a623a",
-        "622616be.bf16b8"
-      ]
-    ]
-  },
-  {
-    "id":"39dd55f9.494c7a",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1067.170711517334,
-    "y":891.7657518386841,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "7fce7a4f.b0d624"
-      ]
-    ]
-  },
-  {
-    "id":"f6c69264.a623a",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1058.1707611083984,
-    "y":860.2657775878906,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "7fce7a4f.b0d624"
-      ]
-    ]
-  },
-  {
-    "id":"622616be.bf16b8",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1061.920799255371,
-    "y":830.622882463038,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "8786f548.363298"
-      ]
-    ]
-  },
-  {
-    "id":"7fce7a4f.b0d624",
-    "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":1227.920799255371,
-    "y":861.0158014297485,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"cb63369d.a052b8",
-    "type":"block",
-    "name":"block: atomic",
-    "xml":"<block atomic=\"true\">\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":973.1481742858887,
-    "y":513.1005299091339,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "782b0a71.4c38e4",
-        "69401bf8.f87a84"
-      ]
-    ]
-  },
-  {
-    "id":"782b0a71.4c38e4",
-    "type":"switchNode",
-    "name":"switch brg length",
-    "xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1219.0054206848145,
-    "y":547.3862931728363,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "f019bd43.a19cf"
-      ]
-    ]
-  },
-  {
-    "id":"f019bd43.a19cf",
-    "type":"other",
-    "name":"outcome 1",
-    "xml":"<outcome value='1'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1410.0054244995117,
-    "y":547.3862907886505,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "35c3a049.ff966"
-      ]
-    ]
-  },
-  {
-    "id":"7a62d7f0.004398",
-    "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":1809.8625602722168,
-    "y":547.9577150344849,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"35c3a049.ff966",
-    "type":"block",
-    "name":"block: atomic",
-    "xml":"<block atomic='true'>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1580.8624076843262,
-    "y":547.9577598571777,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "7a62d7f0.004398",
-        "66f1e6ab.ccdbe8",
-        "929f975e.19d6c8"
-      ]
-    ]
-  },
-  {
-    "id":"66f1e6ab.ccdbe8",
-    "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":1807.8628044128418,
-    "y":615.3862791061401,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"64c20a9e.a91c44",
-    "type":"comment",
-    "name":"GET brg-allotted-resource from mdsal",
-    "info":"",
-    "comments":"",
-    "x":560.1481437683105,
-    "y":477.1005208492279,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"929f975e.19d6c8",
-    "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":1817.8625831604004,
-    "y":580.9577131271362,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "84ba8f9b.db8be",
-        "29821995.b20746"
-      ]
-    ]
-  },
-  {
-    "id":"84ba8f9b.db8be",
-    "type":"outcome",
-    "name":"outcome Created",
-    "xml":"<outcome value='Created'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2029.4625396728516,
-    "y":541.9577131271362,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "20dc496c.b0ace6"
-      ]
-    ]
-  },
-  {
-    "id":"29821995.b20746",
-    "type":"outcome",
-    "name":"outcome Other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2055.176914215088,
-    "y":577.3863039016724,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "20dc496c.b0ace6"
-      ]
-    ]
-  },
-  {
-    "id":"922a85d1.3ff438",
-    "type":"comment",
-    "name":"Set allotted-resource-identifiers",
-    "info":"",
-    "comments":"",
-    "x":515.6719665527344,
-    "y":567.6719741821289,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"69401bf8.f87a84",
-    "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":1298.7197532653809,
-    "y":513.1006219387054,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"882f991c.81f448",
-    "type":"comment",
-    "name":"Create urls for restapi",
-    "info":"",
-    "comments":"",
-    "x":471.29098892211914,
-    "y":381.95768451690674,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"8786f548.363298",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1203.5767669677734,
-    "y":826.8150516524911,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"c480648b.753518",
-    "type":"comment",
-    "name":"TO DO: vnf/put parent",
-    "info":"",
-    "comments":"",
-    "x":473.5767059326172,
-    "y":755.481523513794,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"3806a837.de7398",
-    "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":457.57670974731445,
-    "y":684.8148832321167,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"5a4abfd2.0da15",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":791.9100151062012,
-    "y":548.8147532939911,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "3c47542c.97d11c"
-      ]
-    ]
-  },
-  {
-    "id":"3c47542c.97d11c",
-    "type":"block",
-    "name":"block: atomic",
-    "xml":"<block atomic=\"true\">\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":971.9099655151367,
-    "y":549.4813039302826,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"dfa3f56.72b5808",
-    "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":440.5767517089844,
-    "y":604.4814949035645,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"20dc496c.b0ace6",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":2243.9330558776855,
-    "y":543.3333473205566,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"3b2fb4.6046004c",
-    "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 = $brg-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $brg-topology-operation-input.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":501.19049072265625,
-    "y":788.5713911056519,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "c7a69233.94f79",
-        "ce83f5c3.d60868"
-      ]
-    ]
-  },
-  {
-    "id":"c7a69233.94f79",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":756.9523849487305,
-    "y":771.5238881111145,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "7c662771.7ce4e8"
-      ]
-    ]
-  },
-  {
-    "id":"7c662771.7ce4e8",
-    "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":923.4762649536133,
-    "y":783.1429591178894,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ce83f5c3.d60868",
-    "type":"failure",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":764.0476722717285,
-    "y":804.2858557701111,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "7c662771.7ce4e8"
-      ]
-    ]
-  },
-  {
-    "id":"1375a965.f31cb7",
-    "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":613.3333892822266,
-    "y":1358.0001583099365,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "fd8e4870.195298",
-        "92c4dc6.6a3982",
-        "86d54efc.3f1a1"
-      ]
-    ]
-  },
-  {
-    "id":"fd8e4870.195298",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":947.308177947998,
-    "y":1417.331770323217,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "4274110.a4e27f"
-      ]
-    ]
-  },
-  {
-    "id":"92c4dc6.6a3982",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":938.3082275390625,
-    "y":1385.8317960724235,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "4274110.a4e27f"
-      ]
-    ]
-  },
-  {
-    "id":"86d54efc.3f1a1",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":942.0582656860352,
-    "y":1356.1889009475708,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "784b51ef.400f4"
-      ]
-    ]
-  },
-  {
-    "id":"4274110.a4e27f",
-    "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 setting up vxlan tunnel\" />\n",
-    "comments":"",
-    "x":1108.0582656860352,
-    "y":1386.5818199142814,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"784b51ef.400f4",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1083.7142333984375,
-    "y":1352.381070137024,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"3545827f.8f7f4e",
-    "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":595.0001525878906,
-    "y":1504.6669528484344,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "71f58f94.4f0b1",
-        "bdcf9d06.49209",
-        "5ea463eb.75999c"
-      ]
-    ]
-  },
-  {
-    "id":"71f58f94.4f0b1",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1016.3080596923828,
-    "y":1560.331881903112,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "9a478018.6afc7"
-      ]
-    ]
-  },
-  {
-    "id":"bdcf9d06.49209",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1007.3081092834473,
-    "y":1528.8319076523185,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "9a478018.6afc7"
-      ]
-    ]
-  },
-  {
-    "id":"5ea463eb.75999c",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1011.0581474304199,
-    "y":1499.1890125274658,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "ccb19ee2.88d68"
-      ]
-    ]
-  },
-  {
-    "id":"9a478018.6afc7",
-    "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 setting up bridge domain\" />\n",
-    "comments":"",
-    "x":1177.05814743042,
-    "y":1529.5819314941764,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ccb19ee2.88d68",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1152.7141151428223,
-    "y":1495.381181716919,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"d0da56bf.5622e8",
-    "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.vgmux-lan-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":549.4445343017578,
-    "y":1223.0004177093506,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"d538a2c.85a8a6",
-    "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":521.1111755371094,
-    "y":1278.0001964569092,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"27f6106d.5aed4",
-    "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":512.1112060546875,
-    "y":1166.6667222976685,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"e3151796.db37b8",
-    "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":504.4444885253906,
-    "y":1429.6668281555176,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ebe53f21.39491",
-    "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":247.12836456298828,
-    "y":2208.1048860549927,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"34e00507.e2015a",
-    "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":579.3348350524902,
-    "y":2335.168375015259,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "f9a3195e.f8ac28",
-        "2f908e03.72ab72"
-      ]
-    ]
-  },
-  {
-    "id":"f9a3195e.f8ac28",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":868.1547546386719,
-    "y":2332.547718524933,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "67a6daca.f23f14"
-      ]
-    ]
-  },
-  {
-    "id":"67a6daca.f23f14",
-    "type":"block",
-    "name":"block: atomic",
-    "xml":"<block atomic=\"true\">\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1049.1547088623047,
-    "y":2333.047667980194,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "7f905621.dda338",
-        "d4baf35f.de2e1"
-      ]
-    ]
-  },
-  {
-    "id":"7f905621.dda338",
-    "type":"switchNode",
-    "name":"switch brg length",
-    "xml":"<switch test='`$service-data.service-data_length`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1295.0119552612305,
-    "y":2367.3334312438965,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "a000e4e8.1af5b8"
-      ]
-    ]
-  },
-  {
-    "id":"a000e4e8.1af5b8",
-    "type":"other",
-    "name":"outcome 1",
-    "xml":"<outcome value='1'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1486.0119590759277,
-    "y":2367.3334288597107,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "999b1e9e.5bfaf"
-      ]
-    ]
-  },
-  {
-    "id":"6e5d66df.97f278",
-    "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":1885.8690948486328,
-    "y":2367.904853105545,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"999b1e9e.5bfaf",
-    "type":"block",
-    "name":"block: atomic",
-    "xml":"<block atomic='true'>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1656.8689422607422,
-    "y":2367.904897928238,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "6e5d66df.97f278",
-        "1332711d.1fdf5f"
-      ]
-    ]
-  },
-  {
-    "id":"3cfd785e.b271f8",
-    "type":"comment",
-    "name":"GET vnf-api service info",
-    "info":"",
-    "comments":"",
-    "x":484.72608947753906,
-    "y":2298.476071357727,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"1332711d.1fdf5f",
-    "type":"switchNode",
-    "name":"switch order-status",
-    "xml":"<switch test='`$tmp.service-data.order-status`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1869.5833129882812,
-    "y":2419.4762783050537,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "5742a527.99787c",
-        "2015a1f1.ad28de"
-      ]
-    ]
-  },
-  {
-    "id":"5742a527.99787c",
-    "type":"outcome",
-    "name":"outcome Created",
-    "xml":"<outcome value='Created'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2109.4688758850098,
-    "y":2383.90482711792,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "bf4dbc1f.29998"
-      ]
-    ]
-  },
-  {
-    "id":"2015a1f1.ad28de",
-    "type":"outcome",
-    "name":"outcome Other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2135.183250427246,
-    "y":2419.333417892456,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "bf4dbc1f.29998"
-      ]
-    ]
-  },
-  {
-    "id":"ab18aec0.ff514",
-    "type":"comment",
-    "name":"Set service-data",
-    "info":"",
-    "comments":"",
-    "x":458.8213348388672,
-    "y":2423.3332872390747,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"d4baf35f.de2e1",
-    "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":1374.7262878417969,
-    "y":2333.0477600097656,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"2f908e03.72ab72",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":867.9165496826172,
-    "y":2368.7618913650513,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "1386528.5f8f8ae"
-      ]
-    ]
-  },
-  {
-    "id":"1386528.5f8f8ae",
-    "type":"block",
-    "name":"block: atomic",
-    "xml":"<block atomic=\"true\">\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1047.9165000915527,
-    "y":2369.428442001343,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"bf4dbc1f.29998",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":2323.9393920898438,
-    "y":2385.2804613113403,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"247b453a.8a26fa",
-    "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":500.14427947998047,
-    "y":2256.5969676971436,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"a690ec81.282ab",
-    "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":579.4300193786621,
-    "y":2511.8354263305664,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "39a87d6f.57f612",
-        "88676ff2.098cf",
-        "3d4681e7.6871ae"
-      ]
-    ]
-  },
-  {
-    "id":"39a87d6f.57f612",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1085.6428756713867,
-    "y":2506.3574390411377,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "2f4ba713.bd1b78"
-      ]
-    ]
-  },
-  {
-    "id":"88676ff2.098cf",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1076.6429252624512,
-    "y":2474.8574647903442,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "2f4ba713.bd1b78"
-      ]
-    ]
-  },
-  {
-    "id":"3d4681e7.6871ae",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1080.3929634094238,
-    "y":2445.2145696654916,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "e4df1de4.99fab"
-      ]
-    ]
-  },
-  {
-    "id":"2f4ba713.bd1b78",
-    "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":1246.3929634094238,
-    "y":2475.607488632202,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"e4df1de4.99fab",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1222.0489311218262,
-    "y":2441.4067388549447,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"7f06ccd3.5f4544",
-    "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":482.7633628845215,
-    "y":2471.3592252731323,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"7cd4ecac.c5c874",
-    "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":558.1904907226562,
-    "y":915.0834369659424,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"afbc0299.7c62f",
-    "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":644.3333587646484,
-    "y":964.3333549499512,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"a76a910b.2c1fa",
-    "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":605.3332977294922,
-    "y":1012.3331832885742,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"43cd6015.f74aa",
-    "type":"call",
-    "name":"call GENERIC-RESOURCE-API:get-tunnelxconn-ar",
-    "xml":"<call module='GENERIC-RESOURCE-API' rpc='get-tunnelxconn-ar' mode='sync' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":565.3333435058594,
-    "y":1060.6665201187134,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"a44bc809.331528",
-    "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.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip`' />\n",
-    "comments":"",
-    "x":643.6665954589844,
-    "y":1113.9998979568481,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"45028fce.bc261",
-    "type":"comment",
-    "name":"Change to POST and just update service?",
-    "info":"",
-    "comments":"",
-    "x":675.6905326843262,
-    "y":2536.261999130249,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ddefeb7c.fde178",
-    "type":"execute",
-    "name":"execute RestApiCallNode - setup vG 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":619.5000534057617,
-    "y":2011.50009059906,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "3f1edea5.6a50d2",
-        "8888b0ab.16315",
-        "3526cde7.569032"
-      ]
-    ]
-  },
-  {
-    "id":"3f1edea5.6a50d2",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":953.4748420715332,
-    "y":2070.8317026123405,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "c0fc11de.72caa"
-      ]
-    ]
-  },
-  {
-    "id":"8888b0ab.16315",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":944.4748916625977,
-    "y":2039.331728361547,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "c0fc11de.72caa"
-      ]
-    ]
-  },
-  {
-    "id":"3526cde7.569032",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":948.2249298095703,
-    "y":2009.6888332366943,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "efec532d.a134e"
-      ]
-    ]
-  },
-  {
-    "id":"c0fc11de.72caa",
-    "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 setting up vxlan tunnel\" />\n",
-    "comments":"",
-    "x":1114.2249298095703,
-    "y":2040.081752203405,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"efec532d.a134e",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1089.8808975219727,
-    "y":2005.8810024261475,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"127d8c70.64ae14",
-    "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":599.5001831054688,
-    "y":2118.167016029358,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "4d574e47.5fa9a",
-        "5d98b669.650688",
-        "d9d3976b.be5808"
-      ]
-    ]
-  },
-  {
-    "id":"4d574e47.5fa9a",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":944.1415214538574,
-    "y":2198.8317607864738,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "414d312.d89cfd"
-      ]
-    ]
-  },
-  {
-    "id":"5d98b669.650688",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":935.1415710449219,
-    "y":2167.3317865356803,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "414d312.d89cfd"
-      ]
-    ]
-  },
-  {
-    "id":"d9d3976b.be5808",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":938.8916091918945,
-    "y":2137.6888914108276,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "ea34928b.af361"
-      ]
-    ]
-  },
-  {
-    "id":"414d312.d89cfd",
-    "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 setting up bridge domain\" />\n",
-    "comments":"",
-    "x":1104.8916091918945,
-    "y":2168.081810377538,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ea34928b.af361",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1080.5475769042969,
-    "y":2133.8810606002808,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"dad15ca1.13a96",
-    "type":"set",
-    "name":"set vG 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.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` \" />",
-    "comments":"",
-    "x":549.2779006958008,
-    "y":1911.500280380249,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"898815a9.12a638",
-    "type":"execute",
-    "name":"generate full vg-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":528.9445419311523,
-    "y":1966.5000591278076,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"890a1877.5b6b98",
-    "type":"execute",
-    "name":"generate honeycomb-url to vG",
-    "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.vg-mgmt-ip`\"/>\n",
-    "comments":"",
-    "outputs":1,
-    "x":508.2779312133789,
-    "y":1851.833254814148,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"4ebb5d6e.3b72b4",
-    "type":"set",
-    "name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip",
-    "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />\n",
-    "comments":"",
-    "x":620.3333740234375,
-    "y":1563.9999618530273,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"94c1462c.043b88",
-    "type":"set",
-    "name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip",
-    "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`' />\n",
-    "comments":"",
-    "x":658.6666717529297,
-    "y":1613.999891281128,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"cf968917.b69b88",
-    "type":"comment",
-    "name":"Setup VXLAN Tunnel - vG to vgMUX",
-    "info":"",
-    "comments":"",
-    "x":205.3333282470703,
-    "y":1567.3331804275513,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"e863c266.46b5f",
-    "type":"comment",
-    "name":"Setup VXLAN Tunnel - vBRG to vgMUX",
-    "info":"",
-    "comments":"",
-    "x":207.5,
-    "y":917.3334655761719,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"80306115.be919",
-    "type":"comment",
-    "name":"Get vg-mgmt-ip",
-    "info":"brg tunnelxconnn consuming-service-instance-id\nfound in services as service-instance-id",
-    "comments":"",
-    "x":203.33334350585938,
-    "y":1761.6669359207153,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"2b05ed04.a37c82",
-    "type":"set",
-    "name":"set tmp.search.consuming-service-instance-id to find vg-mgmt-ip",
-    "xml":"<set>\n<parameter name='tmp.search.consuming-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n",
-    "comments":"",
-    "x":606.4999313354492,
-    "y":1685.6662950515747,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"64e3c820.beeeb8",
-    "type":"for",
-    "name":"for tmp.servicedata.services",
-    "xml":"<for index='serviceidx' start='0' end='`$tmp.servicedata.services.service_length`' >\n\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":1460.666519165039,
-    "y":1628.333200454712,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "437927a8.b53de8"
-      ]
-    ]
-  },
-  {
-    "id":"59a607df.c64478",
-    "type":"get-resource",
-    "name":"get-resource generic-resource-api:services ",
-    "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services' pfx='tmp.servicedata' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":544.0000381469727,
-    "y":1762.9997386932373,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "d452dcaa.3bee9",
-        "6e818aeb.a4aa04",
-        "eac2b2a0.0610f"
-      ]
-    ]
-  },
-  {
-    "id":"437927a8.b53de8",
-    "type":"switchNode",
-    "name":"switch parent-service-instance-id matches",
-    "xml":"<switch test='`$tmp.servicedata.services.service[$serviceidx].service-instance-id == $tmp.search.consuming-service-instance-id`'>\n\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":1545.3333435058594,
-    "y":1709.0000143051147,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "82666621.1fed58"
-      ]
-    ]
-  },
-  {
-    "id":"82666621.1fed58",
-    "type":"success",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1799.3333358764648,
-    "y":1701.6665935516357,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "d33ebff.e8b004"
-      ]
-    ]
-  },
-  {
-    "id":"d452dcaa.3bee9",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1140.6666259765625,
-    "y":1664.999797821045,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "64e3c820.beeeb8"
-      ]
-    ]
-  },
-  {
-    "id":"eac2b2a0.0610f",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1118.999984741211,
-    "y":1731.6664905548096,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "7856f029.11793"
-      ]
-    ]
-  },
-  {
-    "id":"6e818aeb.a4aa04",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1110.0000343322754,
-    "y":1700.166516304016,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "7856f029.11793"
-      ]
-    ]
-  },
-  {
-    "id":"7856f029.11793",
-    "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 getting GENERIC-RESOURCE-API:services\" />\n",
-    "comments":"",
-    "x":1279.750072479248,
-    "y":1700.916540145874,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"d33ebff.e8b004",
-    "type":"for",
-    "name":"for service vnfs",
-    "xml":"<for index='vnfidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf_length`' >\n\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":1937.6664505004883,
-    "y":1549.9999027252197,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "ee53e172.1bc7a"
-      ]
-    ]
-  },
-  {
-    "id":"150fc701.eb64c9",
-    "type":"switchNode",
-    "name":"switch parent-service-instance-id matches",
-    "xml":"<switch test='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].name == vgw_private_ip_1`'>\n\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":2409.666473388672,
-    "y":1631.6666069030762,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "48cef87f.eedc58"
-      ]
-    ]
-  },
-  {
-    "id":"48cef87f.eedc58",
-    "type":"success",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2659.6665573120117,
-    "y":1633.3333415985107,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "f0d4ba11.70cc48"
-      ]
-    ]
-  },
-  {
-    "id":"ee53e172.1bc7a",
-    "type":"for",
-    "name":"for service vnf vf-modules",
-    "xml":"<for index='vfmoduleidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":2074.666603088379,
-    "y":1634.9998846054077,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "e6adb279.1c4ce"
-      ]
-    ]
-  },
-  {
-    "id":"e6adb279.1c4ce",
-    "type":"for",
-    "name":"for service vnfs vf-modules parameters",
-    "xml":"<for index='paramidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":2164.6665802001953,
-    "y":1719.9998531341553,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-      [
-        "150fc701.eb64c9"
-      ]
-    ]
-  },
-  {
-    "id":"f0d4ba11.70cc48",
-    "type":"set",
-    "name":"set vg-mgmt-ip",
-    "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip' value='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].value`' />\n",
-    "comments":"",
-    "x":2841.333106994629,
-    "y":1629.999900817871,
-    "z":"5fc74ec4.a79bd",
-    "wires":[
-
-    ]
-  }
-]
\ No newline at end of file
+[{"id":"365c93f8.67b65c","type":"dgstart","name":"DGSTART","outputs":1,"x":137,"y":110,"z":"18a62ac6.9713a5","wires":[["169d7df0.93c452"]]},{"id":"169d7df0.93c452","type":"service-logic","name":"GENERIC-RESOURCE-API 1.2.0-SNAPSHOT-111602b4-M","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":233.23807907104492,"y":170.95239067077637,"z":"18a62ac6.9713a5","wires":[["37783da7.81e2d2"]]},{"id":"37783da7.81e2d2","type":"method","name":"brg-topology-operation-activate","xml":"<method rpc='brg-topology-operation-activate' mode='sync'>\n","comments":"","outputs":1,"x":279.15485763549805,"y":206.19044589996338,"z":"18a62ac6.9713a5","wires":[["ec733994.d86e28"]]},{"id":"ec733994.d86e28","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":146.9761962890625,"y":2113.02392578125,"z":"18a62ac6.9713a5","wires":[["76888a74.ab17f4","1f22feac.f3b4c1","2fb29eef.4d6022","42d16f76.97199","338a947c.fbfb4c","95ce73fc.e2da1","c12a838c.45d44","52d9aec6.4c672","3d09c51e.7756ea","a2cfcba2.8fa4e8","104fcdf2.664762","56ef84b.a41387c","7d5c50e5.f78f5","1b700479.28334c","bc0b2cc1.a132a","8f3f21c6.12337","2d189fc6.3f48b","c4a8c4dc.ecee78","f658867d.2c6f38","c96c9fc4.ca9e","fc4cba6e.c5fde8","3f657cde.b4a5c4","40795c0d.d10224","197fef59.d47721","aa1291ea.d5213","1a0eab31.418c85","33f5a5f1.69bb3a","3aa67c55.65a524","d1f5d2dc.8c8b6","d19c10c6.e1717","f6439501.9c66a8","52c535ca.3b7a7c","9aa4c9fa.958f98","a0c021e1.707d58","f30cbbcf.ee6ed8","4b54eeb9.9b9a28","d4c6d967.74fbd"]]},{"id":"1f22feac.f3b4c1","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n","comments":"","x":451.5002098083496,"y":2666.381863594055,"z":"18a62ac6.9713a5","wires":[]},{"id":"76888a74.ab17f4","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 + $tmp.service-data.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n <!--\nbrg-topology-operation-input.allotted-resource-information.parent-service-instance-id\n \n brg-topology-operation-input.service-information.service-instance-id\n -->\n","comments":"","x":477.2541198730469,"y":2623.504550933838,"z":"18a62ac6.9713a5","wires":[]},{"id":"a2cfcba2.8fa4e8","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":493.7542190551758,"y":730.0514001846313,"z":"18a62ac6.9713a5","wires":[]},{"id":"42d16f76.97199","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":447.738037109375,"y":342.33331298828125,"z":"18a62ac6.9713a5","wires":[]},{"id":"2fb29eef.4d6022","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<!--\n<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":487.997314453125,"y":257.59259033203125,"z":"18a62ac6.9713a5","wires":[]},{"id":"338a947c.fbfb4c","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":453.9934196472168,"y":380.23152446746826,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"c12a838c.45d44","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":518.5187530517578,"y":520.4594917297363,"z":"18a62ac6.9713a5","wires":[["c6a75b8.41f8ca8","84cd8969.410b78"]]},{"id":"95ce73fc.e2da1","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":482.0648536682129,"y":440.0172290802002,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"c6a75b8.41f8ca8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":775.8148918151855,"y":519.2672522068024,"z":"18a62ac6.9713a5","wires":[["b7ef52bd.d3fa6"]]},{"id":"52d9aec6.4c672","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":526.5293121337891,"y":873.4341316223145,"z":"18a62ac6.9713a5","wires":[["45b09dfd.cbfde4","57dd2e4f.a6dec","c52bd776.1a5058"]]},{"id":"45b09dfd.cbfde4","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1050.8373832702637,"y":898.4324235916138,"z":"18a62ac6.9713a5","wires":[["20c4b5a1.de818a"]]},{"id":"57dd2e4f.a6dec","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1041.8374328613281,"y":866.9324493408203,"z":"18a62ac6.9713a5","wires":[["20c4b5a1.de818a"]]},{"id":"c52bd776.1a5058","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1045.5874710083008,"y":837.2895542159677,"z":"18a62ac6.9713a5","wires":[["60273514.ef34ec"]]},{"id":"20c4b5a1.de818a","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":1211.5874710083008,"y":867.6824731826782,"z":"18a62ac6.9713a5","wires":[]},{"id":"b7ef52bd.d3fa6","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":956.8148460388184,"y":519.7672016620636,"z":"18a62ac6.9713a5","wires":[["284a87e4.4278d8","dc25137f.905be"]]},{"id":"284a87e4.4278d8","type":"switchNode","name":"switch brg length","xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1202.6720924377441,"y":554.052964925766,"z":"18a62ac6.9713a5","wires":[["324a8d88.db8242"]]},{"id":"324a8d88.db8242","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1393.6720962524414,"y":554.0529625415802,"z":"18a62ac6.9713a5","wires":[["641f1fa5.a47fe"]]},{"id":"ce809b2c.dfd4d8","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":1793.5292320251465,"y":554.6243867874146,"z":"18a62ac6.9713a5","wires":[]},{"id":"641f1fa5.a47fe","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1564.5290794372559,"y":554.6244316101074,"z":"18a62ac6.9713a5","wires":[["ce809b2c.dfd4d8","8e46a7f2.0c6588","3aefc57c.315b5a"]]},{"id":"8e46a7f2.0c6588","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":1791.5294761657715,"y":622.0529508590698,"z":"18a62ac6.9713a5","wires":[]},{"id":"ed7dff8.e3acc","type":"comment","name":"GET brg-allotted-resource from mdsal","info":"","comments":"","x":543.8148155212402,"y":483.7671926021576,"z":"18a62ac6.9713a5","wires":[]},{"id":"3aefc57c.315b5a","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":1801.52925491333,"y":587.6243848800659,"z":"18a62ac6.9713a5","wires":[["abdb04fd.2cc288","62315be8.564254"]]},{"id":"abdb04fd.2cc288","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2013.1292114257812,"y":548.6243848800659,"z":"18a62ac6.9713a5","wires":[["f727ed41.8760a"]]},{"id":"62315be8.564254","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2038.8435859680176,"y":584.052975654602,"z":"18a62ac6.9713a5","wires":[["f727ed41.8760a"]]},{"id":"fc060079.fdec8","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":499.33863830566406,"y":574.3386459350586,"z":"18a62ac6.9713a5","wires":[]},{"id":"dc25137f.905be","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":1282.3864250183105,"y":519.7672936916351,"z":"18a62ac6.9713a5","wires":[]},{"id":"c56cf0bd.1e9dc","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":452.9576606750488,"y":409.6243562698364,"z":"18a62ac6.9713a5","wires":[]},{"id":"60273514.ef34ec","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1187.2434387207031,"y":833.4817234054208,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"e7d7a66b.fa9838","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":457.2433776855469,"y":762.1481952667236,"z":"18a62ac6.9713a5","wires":[]},{"id":"3d09c51e.7756ea","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":441.24338150024414,"y":691.4815549850464,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"84cd8969.410b78","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":775.5766868591309,"y":555.4814250469208,"z":"18a62ac6.9713a5","wires":[["7991d5a8.19d38c"]]},{"id":"7991d5a8.19d38c","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":955.5766372680664,"y":556.1479756832123,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"104fcdf2.664762","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":424.24342346191406,"y":611.1481666564941,"z":"18a62ac6.9713a5","wires":[]},{"id":"f727ed41.8760a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2227.5997276306152,"y":550.0000190734863,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"56ef84b.a41387c","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 = $brg-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $brg-topology-operation-input.allotted-resource-information.parent-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":484.85716247558594,"y":795.2380628585815,"z":"18a62ac6.9713a5","wires":[["f4a20a5a.4d8c98","1cbfe5b1.92129a"]]},{"id":"f4a20a5a.4d8c98","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":740.6190567016602,"y":778.1905598640442,"z":"18a62ac6.9713a5","wires":[["ef10ebfc.9e5c08"]]},{"id":"ef10ebfc.9e5c08","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":907.142936706543,"y":789.8096308708191,"z":"18a62ac6.9713a5","wires":[]},{"id":"1cbfe5b1.92129a","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":747.7143440246582,"y":810.9525275230408,"z":"18a62ac6.9713a5","wires":[["ef10ebfc.9e5c08"]]},{"id":"7d5c50e5.f78f5","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":597.0000610351562,"y":1364.6668300628662,"z":"18a62ac6.9713a5","wires":[["2ca4c669.5c49fa","e2daafee.ef521","4eb7df5c.3fef3"]]},{"id":"2ca4c669.5c49fa","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":930.9748497009277,"y":1423.9984420761466,"z":"18a62ac6.9713a5","wires":[["7f5791ac.67684"]]},{"id":"e2daafee.ef521","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":921.9748992919922,"y":1392.4984678253531,"z":"18a62ac6.9713a5","wires":[["7f5791ac.67684"]]},{"id":"4eb7df5c.3fef3","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":925.7249374389648,"y":1362.8555727005005,"z":"18a62ac6.9713a5","wires":[["b21cdd09.f6c39"]]},{"id":"7f5791ac.67684","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 setting up vxlan tunnel\" />\n","comments":"","x":1091.7249374389648,"y":1393.248491667211,"z":"18a62ac6.9713a5","wires":[]},{"id":"b21cdd09.f6c39","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1067.3809051513672,"y":1359.0477418899536,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"1b700479.28334c","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":578.6668243408203,"y":1511.3336246013641,"z":"18a62ac6.9713a5","wires":[["7284360c.605168","8ddf7786.265978","f7e8ea47.905e38"]]},{"id":"7284360c.605168","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":999.9747314453125,"y":1566.9985536560416,"z":"18a62ac6.9713a5","wires":[["4fdc6451.028a2c"]]},{"id":"8ddf7786.265978","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":990.974781036377,"y":1535.4985794052482,"z":"18a62ac6.9713a5","wires":[["4fdc6451.028a2c"]]},{"id":"f7e8ea47.905e38","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":994.7248191833496,"y":1505.8556842803955,"z":"18a62ac6.9713a5","wires":[["91d81f82.509b9"]]},{"id":"4fdc6451.028a2c","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 setting up bridge domain\" />\n","comments":"","x":1160.7248191833496,"y":1536.248603247106,"z":"18a62ac6.9713a5","wires":[]},{"id":"91d81f82.509b9","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1136.380786895752,"y":1502.0478534698486,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"2d189fc6.3f48b","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.vgmux-lan-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":533.1112060546875,"y":1229.6670894622803,"z":"18a62ac6.9713a5","wires":[]},{"id":"8f3f21c6.12337","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":504.77784729003906,"y":1284.6668682098389,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"bc0b2cc1.a132a","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":495.7778778076172,"y":1173.3333940505981,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"c4a8c4dc.ecee78","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":488.1111602783203,"y":1436.3334999084473,"z":"18a62ac6.9713a5","wires":[]},{"id":"a6a8b2c1.8f856","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":230.79503631591797,"y":2214.7715578079224,"z":"18a62ac6.9713a5","wires":[]},{"id":"c96c9fc4.ca9e","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":563.0015068054199,"y":2341.8350467681885,"z":"18a62ac6.9713a5","wires":[["f822a588.1a5c98","d95df392.1987d"]]},{"id":"f822a588.1a5c98","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":851.8214263916016,"y":2339.2143902778625,"z":"18a62ac6.9713a5","wires":[["473d24ff.a9b42c"]]},{"id":"473d24ff.a9b42c","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1032.8213806152344,"y":2339.714339733124,"z":"18a62ac6.9713a5","wires":[["a5e620b6.49938","3fd59db1.35aa72"]]},{"id":"a5e620b6.49938","type":"switchNode","name":"switch brg length","xml":"<switch test='`$service-data.service-data_length`'>\n","comments":"","outputs":1,"x":1278.6786270141602,"y":2374.000102996826,"z":"18a62ac6.9713a5","wires":[["fb4aa2aa.355d5"]]},{"id":"fb4aa2aa.355d5","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1469.6786308288574,"y":2374.0001006126404,"z":"18a62ac6.9713a5","wires":[["29a2aafd.0e61f6"]]},{"id":"a35ce553.1561d8","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":1869.5357666015625,"y":2374.5715248584747,"z":"18a62ac6.9713a5","wires":[]},{"id":"29a2aafd.0e61f6","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1640.5356140136719,"y":2374.5715696811676,"z":"18a62ac6.9713a5","wires":[["a35ce553.1561d8","9129f6ff.19a068"]]},{"id":"37dc6d21.e214a2","type":"comment","name":"GET vnf-api service info","info":"","comments":"","x":468.39276123046875,"y":2305.1427431106567,"z":"18a62ac6.9713a5","wires":[]},{"id":"9129f6ff.19a068","type":"switchNode","name":"switch order-status","xml":"<switch test='`$tmp.service-data.order-status`'>\n","comments":"","outputs":1,"x":1853.249984741211,"y":2426.1429500579834,"z":"18a62ac6.9713a5","wires":[["6564b5f7.1e716c","4e3f2f90.50e22"]]},{"id":"6564b5f7.1e716c","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2093.1355476379395,"y":2390.5714988708496,"z":"18a62ac6.9713a5","wires":[["27659936.9b16a6"]]},{"id":"4e3f2f90.50e22","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2118.849922180176,"y":2426.0000896453857,"z":"18a62ac6.9713a5","wires":[["27659936.9b16a6"]]},{"id":"a417ed65.697e3","type":"comment","name":"Set service-data","info":"","comments":"","x":444.4880065917969,"y":2440.0004692077637,"z":"18a62ac6.9713a5","wires":[]},{"id":"3fd59db1.35aa72","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":1358.3929595947266,"y":2339.7144317626953,"z":"18a62ac6.9713a5","wires":[]},{"id":"d95df392.1987d","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":851.5832214355469,"y":2375.428563117981,"z":"18a62ac6.9713a5","wires":[["893155db.6b0fe8"]]},{"id":"893155db.6b0fe8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1031.5831718444824,"y":2376.0951137542725,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"27659936.9b16a6","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2307.6060638427734,"y":2391.94713306427,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"f658867d.2c6f38","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=\"`$tmp.ar.brg-vnf-id`\"/>\n\n   <!-- \n   <parameter name=\"replacement\" value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`\"/>\n -->\n    <!--\n    <parameter name=\"replacement\" value=\"`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`\"/>\n-->\n<!--\nbrg-ar.allotted-resource-data.brg-topology.brg-assignments\n-->","comments":"","outputs":1,"x":484.8109130859375,"y":2260.263671875,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"3f657cde.b4a5c4","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":563.0966911315918,"y":2518.502098083496,"z":"18a62ac6.9713a5","wires":[["158b7553.e6c0ab","23fdc360.f5c5ec","b2329d47.fddb5"]]},{"id":"158b7553.e6c0ab","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1069.3095474243164,"y":2513.0241107940674,"z":"18a62ac6.9713a5","wires":[["9901f01.23a2d1"]]},{"id":"23fdc360.f5c5ec","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1060.3095970153809,"y":2481.524136543274,"z":"18a62ac6.9713a5","wires":[["9901f01.23a2d1"]]},{"id":"b2329d47.fddb5","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1064.0596351623535,"y":2451.8812414184213,"z":"18a62ac6.9713a5","wires":[["beabb707.b031c8"]]},{"id":"9901f01.23a2d1","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":1230.0596351623535,"y":2482.274160385132,"z":"18a62ac6.9713a5","wires":[]},{"id":"beabb707.b031c8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1205.7156028747559,"y":2448.0734106078744,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"fc4cba6e.c5fde8","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<!--  tmp.service-data.service-information.service-instance-id\nbrg-topology-operation-input.allotted-resource-information.parent-service-instance-id\nbrg-topology-operation-input.service-information.service-instance-id\n\n-->","comments":"","outputs":1,"x":462.4300231933594,"y":2470.02618598938,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"40795c0d.d10224","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":541.8571624755859,"y":921.7501087188721,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"197fef59.d47721","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":628.0000305175781,"y":971.0000267028809,"z":"18a62ac6.9713a5","wires":[]},{"id":"aa1291ea.d5213","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='`$brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n","comments":"","x":588.9999694824219,"y":1018.9998550415039,"z":"18a62ac6.9713a5","wires":[]},{"id":"1a0eab31.418c85","type":"call","name":"call GENERIC-RESOURCE-API:get-tunnelxconn-ar","xml":"<call module='GENERIC-RESOURCE-API' rpc='get-tunnelxconn-ar' mode='sync' >\n","comments":"","outputs":1,"x":549.0000152587891,"y":1067.333191871643,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"33f5a5f1.69bb3a","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.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip`' />\n","comments":"","x":627.3332672119141,"y":1120.6665697097778,"z":"18a62ac6.9713a5","wires":[]},{"id":"6155dc8a.47b934","type":"comment","name":"Change to POST and just update service?","info":"","comments":"","x":742.357177734375,"y":2545.9287109375,"z":"18a62ac6.9713a5","wires":[]},{"id":"4671c454.83b62c","type":"execute","name":"execute RestApiCallNode - setup vG 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":743.166748046875,"y":2036.166748046875,"z":"18a62ac6.9713a5","wires":[["c3e30f3c.69b62","aacf95a1.7f29b8","973c7491.1e4558"]]},{"id":"c3e30f3c.69b62","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1082.141513824463,"y":2075.49837436527,"z":"18a62ac6.9713a5","wires":[["6db5d0f7.79722"]]},{"id":"aacf95a1.7f29b8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1073.1415634155273,"y":2043.9984001144767,"z":"18a62ac6.9713a5","wires":[["6db5d0f7.79722"]]},{"id":"973c7491.1e4558","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1076.8916015625,"y":2014.355504989624,"z":"18a62ac6.9713a5","wires":[["cad549e0.47c898"]]},{"id":"6db5d0f7.79722","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 setting up vxlan tunnel\" />\n","comments":"","x":1242.8916015625,"y":2044.7484239563346,"z":"18a62ac6.9713a5","wires":[]},{"id":"cad549e0.47c898","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1218.5475692749023,"y":2010.5476741790771,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"962bcf79.cf631","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":728.1668548583984,"y":2122.8336877822876,"z":"18a62ac6.9713a5","wires":[["f4596489.8437f8","6b5435d6.b9011c","390b5095.8468b"]]},{"id":"f4596489.8437f8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1072.808193206787,"y":2203.4984325394034,"z":"18a62ac6.9713a5","wires":[["156eac4b.350654"]]},{"id":"6b5435d6.b9011c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1063.8082427978516,"y":2171.99845828861,"z":"18a62ac6.9713a5","wires":[["156eac4b.350654"]]},{"id":"390b5095.8468b","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1067.5582809448242,"y":2142.3555631637573,"z":"18a62ac6.9713a5","wires":[["8c514a9b.da33e8"]]},{"id":"156eac4b.350654","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 setting up bridge domain\" />\n","comments":"","x":1233.5582809448242,"y":2172.748482130468,"z":"18a62ac6.9713a5","wires":[]},{"id":"8c514a9b.da33e8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1209.2142486572266,"y":2138.5477323532104,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"f6439501.9c66a8","type":"set","name":"set vG 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.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` \" />","comments":"","x":532.9445724487305,"y":1918.1669521331787,"z":"18a62ac6.9713a5","wires":[]},{"id":"52c535ca.3b7a7c","type":"execute","name":"generate full vg-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":512.611213684082,"y":1973.1667308807373,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"d19c10c6.e1717","type":"execute","name":"generate honeycomb-url to vG","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.vg-mgmt-ip`\"/>\n","comments":"","outputs":1,"x":491.9446029663086,"y":1858.4999265670776,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"3aa67c55.65a524","type":"set","name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />\n","comments":"","x":604.0000457763672,"y":1570.666633605957,"z":"18a62ac6.9713a5","wires":[]},{"id":"d1f5d2dc.8c8b6","type":"set","name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`' />\n","comments":"","x":642.3333435058594,"y":1620.6665630340576,"z":"18a62ac6.9713a5","wires":[]},{"id":"c542adc.b942a5","type":"comment","name":"Setup VXLAN Tunnel - vG to vgMUX","info":"","comments":"","x":189,"y":1573.999852180481,"z":"18a62ac6.9713a5","wires":[]},{"id":"6f57d567.30fbfc","type":"comment","name":"Setup VXLAN Tunnel - vBRG to vgMUX","info":"","comments":"","x":191.1666717529297,"y":924.0001373291016,"z":"18a62ac6.9713a5","wires":[]},{"id":"b4aea72.b49c158","type":"comment","name":"Get vg-mgmt-ip","info":"brg tunnelxconnn consuming-service-instance-id\nfound in services as service-instance-id","comments":"","x":187.00001525878906,"y":1768.333607673645,"z":"18a62ac6.9713a5","wires":[]},{"id":"9aa4c9fa.958f98","type":"set","name":"set tmp.search.consuming-service-instance-id to find vg-mgmt-ip","xml":"<set>\n<parameter name='tmp.search.consuming-service-instance-id' value='`$brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t","comments":"","x":590.1666030883789,"y":1692.3329668045044,"z":"18a62ac6.9713a5","wires":[]},{"id":"123998f5.c51be7","type":"for","name":"for tmp.preloadvnfdata","xml":"<for index='vnfidx' start='0' end='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list_length`' >\n                               \n\n\n","comments":"","outputs":1,"x":1449.333251953125,"y":1686.9998779296875,"z":"18a62ac6.9713a5","wires":[["8715f7ad.f83878"]]},{"id":"33d4cc93.eac684","type":"get-resource","name":"get-resource generic-resource-api:services ","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services' pfx='tmp.servicedata' >\n","comments":"","outputs":1,"x":526.6667175292969,"y":1754.6663818359375,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"4cf7f570.7cc58c","type":"switchNode","name":"switch parent-service-instance-id matches","xml":"<switch test='`$tmp.preloadvnfdata.vnfs.vnf[$vnfidx].service-instance-id == $tmp.search.consuming-service-instance-id`'>\n\n\n","comments":"","outputs":1,"x":1678,"y":2034.6666259765625,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"fc727137.9eaa","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1904.9999923706055,"y":1745.3332052230835,"z":"18a62ac6.9713a5","wires":[["8a518589.666998"]]},{"id":"9deb72d.caf209","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1124.3332977294922,"y":1671.6664695739746,"z":"18a62ac6.9713a5","wires":[["e273cfe4.5b48e8"]]},{"id":"ba3b2049.c4386","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1102.6666564941406,"y":1738.3331623077393,"z":"18a62ac6.9713a5","wires":[["c97e5262.51d26"]]},{"id":"385890ca.3fc72","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1093.666706085205,"y":1706.8331880569458,"z":"18a62ac6.9713a5","wires":[["c97e5262.51d26"]]},{"id":"c97e5262.51d26","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 getting GENERIC-RESOURCE-API:services\" />\n","comments":"","x":1263.4167442321777,"y":1707.5832118988037,"z":"18a62ac6.9713a5","wires":[]},{"id":"5218fc4a.0b9fe4","type":"switchNode","name":"switch vnf-parameter-name matches vgw_private_ip","xml":"<switch test=\"`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$paramidx].vnf-parameter-name == 'vgw_private_ip_1'`\" >\n\n\n","comments":"","outputs":1,"x":2393.3331451416016,"y":1638.3332786560059,"z":"18a62ac6.9713a5","wires":[["5266f859.ebeaf8"]]},{"id":"5266f859.ebeaf8","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2672.333251953125,"y":1650,"z":"18a62ac6.9713a5","wires":[["538ce914.9ab908"]]},{"id":"8a518589.666998","type":"for","name":"for service vnfs vf-modules parameters","xml":"<for index='paramidx' start='0' end='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters_length`' >\n\n\n","comments":"","outputs":1,"x":2169.333251953125,"y":1728.66650390625,"z":"18a62ac6.9713a5","wires":[["5218fc4a.0b9fe4"]]},{"id":"538ce914.9ab908","type":"set","name":"set vg-mgmt-ip","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip'\n value=\"`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$paramidx].vnf-parameter-value`\" />\n\n","comments":"","x":2821.999755859375,"y":1688.6666259765625,"z":"18a62ac6.9713a5","wires":[]},{"id":"f30cbbcf.ee6ed8","type":"execute","name":"execute print context","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/brg-topo-op-activate.log' />\n","comments":"","outputs":1,"x":469,"y":2577,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"8715f7ad.f83878","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1462,"y":1800,"z":"18a62ac6.9713a5","wires":[["7a100e73.8d8e8"]]},{"id":"2006cbdb.ce9484","type":"set","name":"set debug","xml":"<set>\n<parameter name='tmp.debug.service-instance-id' value='`$tmp.servicedata.services.service[$serviceidx].service-instance-id`' />\n<parameter name='tmp.debug.consuming-service-instance-id' value='`$tmp.search.consuming-service-instance-id`' />\n\n\n\n","comments":"","x":1613,"y":1875,"z":"18a62ac6.9713a5","wires":[]},{"id":"1f725a28.ed9056","type":"execute","name":"execute print context","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/brg-topo-op-activate.log' />\n","comments":"","outputs":1,"x":1442,"y":1619,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"49c119e6.4c4ad8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":1445,"y":1512,"z":"18a62ac6.9713a5","wires":[]},{"id":"e273cfe4.5b48e8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1240,"y":1624,"z":"18a62ac6.9713a5","wires":[["123998f5.c51be7","1f725a28.ed9056","bde6b16b.6406"]]},{"id":"a0c021e1.707d58","type":"get-resource","name":"get-resource vnf-api:vnfs","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='preload-vnfs' pfx='tmp.preloadvnfdata' >\n<!--\ntmp.preloadvnfdata.preload-vnfs.vnf-preload-list[1].preload-data[0].vnf-topology-information.vnf-parameters[16].vnf-parameter-value = 10.0.101.30\n-->","comments":"","outputs":1,"x":562,"y":1802,"z":"18a62ac6.9713a5","wires":[["ba3b2049.c4386","385890ca.3fc72","9deb72d.caf209"]]},{"id":"19ca5c15.87361c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":300,"y":1803,"z":"18a62ac6.9713a5","wires":[]},{"id":"7a100e73.8d8e8","type":"switchNode","name":"switch parent-service-instance-id matches","xml":"<switch test='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].vnf-name == $tmp.brg-match-vnf-name`'>\n\n\n","comments":"","outputs":1,"x":1677,"y":1950,"z":"18a62ac6.9713a5","wires":[["fc727137.9eaa"]]},{"id":"bde6b16b.6406","type":"set","name":"set tmp.brgmatch-vnf-name","xml":"<set>\n<parameter name='tmp.brg-match-vnf-name' value=\"`'VGW2BRG-'+ $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-mac-address`\" />\n\n","comments":"","x":1463,"y":1575,"z":"18a62ac6.9713a5","wires":[]},{"id":"8c51381a.12e268","type":"comment","name":"Disable updates to vGW becuase of race condition","info":"vGW has to reboot to apply its config and sdnc tries to connect soon. \nBeijing will have the sleep utilities to handle this. Use heat.env parameters with vni to resolve","comments":"","x":727,"y":2077,"z":"18a62ac6.9713a5","wires":[]},{"id":"a6a20093.23fd2","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":427,"y":2044,"z":"18a62ac6.9713a5","wires":[]},{"id":"2bd2dbb4.5800fc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":421,"y":2126,"z":"18a62ac6.9713a5","wires":[]},{"id":"73a37392.67696c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":647,"y":2247,"z":"18a62ac6.9713a5","wires":[]},{"id":"4e875cc.4e618a4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":241,"y":313,"z":"18a62ac6.9713a5","wires":[]},{"id":"9aab8f92.6499e8","type":"for","name":"for tmp.vnfs","xml":"<for index='vnfidx' start='0' end='`$tmp.vnfdata.vnfs.vnf-list_length`' >\n\n\n","comments":"","outputs":1,"x":784,"y":340,"z":"18a62ac6.9713a5","wires":[["1035cc67.32f044"]]},{"id":"4b54eeb9.9b9a28","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":431.1429443359375,"y":300.1904296875,"z":"18a62ac6.9713a5","wires":[["3cf47355.04e39c","9aab8f92.6499e8"]]},{"id":"3cf47355.04e39c","type":"get-resource","name":"get-resource vnf-api vnfs","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs' pfx='tmp.vnfdata' >\n","comments":"","outputs":1,"x":863,"y":282.6666259765625,"z":"18a62ac6.9713a5","wires":[[]]},{"id":"1035cc67.32f044","type":"switchNode","name":"switch parent-service-instance-id matches","xml":"<switch test='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.service-information.service-instance-id == $tmp.ar.parent-service-instance-id`'>\n\n\n","comments":"","outputs":1,"x":1052,"y":363.33331298828125,"z":"18a62ac6.9713a5","wires":[["6541c2a7.51e764"]]},{"id":"6541c2a7.51e764","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1350.0001220703125,"y":373.33331298828125,"z":"18a62ac6.9713a5","wires":[["380ce5f.0bb281a"]]},{"id":"380ce5f.0bb281a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1565.0001220703125,"y":383.3333435058594,"z":"18a62ac6.9713a5","wires":[["ef941af1.3f0ab8"]]},{"id":"ef941af1.3f0ab8","type":"set","name":"set  tmp.ar.brg-vnf-id","xml":"<set>\n<parameter name='tmp.ar.brg-vnf-id' \n   value='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].vnf-id`' />\n\n\n\n","comments":"","x":1793,"y":400,"z":"18a62ac6.9713a5","wires":[]},{"id":"680c1f95.266288","type":"comment","name":"Need to use parent service instance id","info":"service-instance id : {\n  \"service-status\": {\n    \"rpc-action\": \"activate\",\n    \"response-code\": \"200\",\n    \"action\": \"CreateVfModuleInstance\",\n    \"request-status\": \"synccomplete\",\n    \"rpc-name\": \"vf-module-topology-operation\",\n    \"response-timestamp\": \"2017-11-16T21:31:31.697Z\",\n    \"final-indicator\": \"Y\",\n    \"response-message\": \"\"\n  }\n}","comments":"","x":191,"y":2607,"z":"18a62ac6.9713a5","wires":[]},{"id":"d4c6d967.74fbd","type":"set","name":"set  service-instance-id ","xml":"<set>\n<parameter name='tmp.service-data.service-information.service-instance-id' value='`$brg-topology-operation-input.service-information.service-instance-id`' />\n","comments":"","x":469.5,"y":2392,"z":"18a62ac6.9713a5","wires":[]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-assign.json
index e0c246b3..53db1d2a 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-assign.json
@@ -1,1276 +1 @@
-[
-  {
-    "id":"e5ee9a68.8f74a8",
-    "type":"dgstart",
-    "name":"DGSTART",
-    "outputs":1,
-    "x":125,
-    "y":52.5,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "393cc04a.70965"
-      ]
-    ]
-  },
-  {
-    "id":"393cc04a.70965",
-    "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":221.23807907104492,
-    "y":113.45239067077637,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "8d790a6c.626248"
-      ]
-    ]
-  },
-  {
-    "id":"8d790a6c.626248",
-    "type":"method",
-    "name":"brg-topology-operation-assign",
-    "xml":"<method rpc='brg-topology-operation-assign' mode='sync'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":267.15485763549805,
-    "y":148.69044589996338,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "709e013b.ec7ed"
-      ]
-    ]
-  },
-  {
-    "id":"709e013b.ec7ed",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":175.47619247436523,
-    "y":292.0237879753113,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "5341126d.beb3cc",
-        "18e0684.02efa98",
-        "3d25a078.5fbfa",
-        "4f907ab1.9b90b4",
-        "8f923afe.9146b8"
-      ]
-    ]
-  },
-  {
-    "id":"3cb0dbf.eb62a24",
-    "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":1018.6666564941406,
-    "y":2219.0477046966553,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"b4a4d9bb.64b1c8",
-    "type":"set",
-    "name":"set output to api handler",
-    "xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
-    "comments":"",
-    "x":1055.7540550231934,
-    "y":2097.932439804077,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"77739892.271138",
-    "type":"set",
-    "name":"set allotted-resource-oper-status",
-    "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
-    "comments":"",
-    "x":1127.468376159668,
-    "y":1515.1228160858154,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"18e0684.02efa98",
-    "type":"set",
-    "name":"set tmp.ar.self-link",
-    "xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n",
-    "comments":"",
-    "x":605.7380676269531,
-    "y":183.83331298828125,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"5341126d.beb3cc",
-    "type":"set",
-    "name":"set tmp.ar.allotted-resource-id,etc",
-    "xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
-    "comments":"",
-    "x":658.997314453125,
-    "y":146.09259033203125,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"2eb376c7.9249fa",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":808.8148803710938,
-    "y":331.76727294921875,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "bfb84d8.6226eb"
-      ]
-    ]
-  },
-  {
-    "id":"98be663.e803998",
-    "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":1148.8626251220703,
-    "y":1739.6008231639862,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "567616cd.4d0bc8",
-        "34674551.1ef96a",
-        "c49baabf.6ac098"
-      ]
-    ]
-  },
-  {
-    "id":"567616cd.4d0bc8",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1417.5040016174316,
-    "y":1790.9322349056602,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "1afb211c.3db5af"
-      ]
-    ]
-  },
-  {
-    "id":"34674551.1ef96a",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1408.504051208496,
-    "y":1759.4322606548667,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "1afb211c.3db5af"
-      ]
-    ]
-  },
-  {
-    "id":"c49baabf.6ac098",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1412.2540893554688,
-    "y":1729.789365530014,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "24c4fc44.bfefd4"
-      ]
-    ]
-  },
-  {
-    "id":"1afb211c.3db5af",
-    "type":"returnFailure",
-    "name":"return failure",
-    "xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n",
-    "comments":"",
-    "x":1578.2540893554688,
-    "y":1760.1822844967246,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"b9913138.178af",
-    "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":1158.5294189453125,
-    "y":432.55291748046875,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"23613fee.e7e3c",
-    "type":"comment",
-    "name":"Save consumed-allotted-resources to mdsal",
-    "info":"",
-    "comments":"",
-    "x":1226.2434692382812,
-    "y":1114.2196044921875,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"c3ce8536.056418",
-    "type":"comment",
-    "name":"GET tunnelxconn-allotted-resource from mdsal",
-    "info":"",
-    "comments":"",
-    "x":531.8148193359375,
-    "y":302.2672119140625,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"bfb84d8.6226eb",
-    "type":"returnFailure",
-    "name":"return failure - tunnelxconn already exists",
-    "xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" \n    value=\"`'Existing brg-allotted-resource with order status of ' + $mdsal-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n",
-    "comments":"",
-    "x":1118.129150390625,
-    "y":328.1243896484375,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"adfbfac.9b9f208",
-    "type":"set",
-    "name":"set brg-ar-identifiers",
-    "xml":"<set>\n<parameter name='brg-ar-identifiers.consuming-service-instance-id' value=\"`$brg-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='brg-ar-identifiers.parent-service-instance-id' value=\"`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='brg-ar-identifiers.allotted-resource-type' value=\"`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='brg-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n",
-    "comments":"",
-    "x":1168.38623046875,
-    "y":526.1243896484375,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"dfee41c5.0d9b3",
-    "type":"comment",
-    "name":"Set allotted-resource-identifiers",
-    "info":"",
-    "comments":"",
-    "x":1195.338623046875,
-    "y":484.838623046875,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ea01d74e.35b878",
-    "type":"set",
-    "name":"set identifiers in overall structure",
-    "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.' \nvalue=\"`$brg-ar-identifiers.`\" />\n\n\n",
-    "comments":"",
-    "x":1185.38623046875,
-    "y":834.410400390625,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"33b72d9b.8a20c2",
-    "type":"set",
-    "name":"set onap model information from input",
-    "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.brg-topology.onap-model-information.' \nvalue=\"`$brg-topology-operation-input.allotted-resource-information.onap-model-information.`\" />\n\n\n",
-    "comments":"",
-    "x":1213.957763671875,
-    "y":569.4100952148438,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"afbfed3a.08159",
-    "type":"switchNode",
-    "name":"switch model-invariant-uuid is null",
-    "xml":"<switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1193.8148193359375,
-    "y":608.69580078125,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "40b2b772.23c3f8"
-      ]
-    ]
-  },
-  {
-    "id":"40b2b772.23c3f8",
-    "type":"outcome",
-    "name":"outcome null",
-    "xml":"<outcome value=''>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1421.9576988220215,
-    "y":610.1243271827698,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "853c921b.506c8"
-      ]
-    ]
-  },
-  {
-    "id":"853c921b.506c8",
-    "type":"set",
-    "name":"set model-invariant-uuid",
-    "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-invariant-uuid' \nvalue=\"`$ar-model.invariant-uuid`\" />\n\n\n",
-    "comments":"",
-    "x":1623.38627243042,
-    "y":609.5528798103333,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"d3ea34e9.368c88",
-    "type":"switchNode",
-    "name":"switch model-uuid is null",
-    "xml":"<switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1166.2434158325195,
-    "y":642.9815106391907,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "e20ffb32.51cf08"
-      ]
-    ]
-  },
-  {
-    "id":"e20ffb32.51cf08",
-    "type":"outcome",
-    "name":"outcome null",
-    "xml":"<outcome value=''>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1367.6719818115234,
-    "y":643.5529322624207,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "3277974f.69b6d8"
-      ]
-    ]
-  },
-  {
-    "id":"3277974f.69b6d8",
-    "type":"set",
-    "name":"set model-uuid",
-    "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-uuid' \nvalue=\"`$ar-model.uuid`\" />\n\n\n",
-    "comments":"",
-    "x":1560.529140472412,
-    "y":643.5528540611267,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"40fda3ea.8add9c",
-    "type":"switchNode",
-    "name":"switch model-version is null",
-    "xml":"<switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1174.8148193359375,
-    "y":675.8386378288269,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "f1c91438.54f678"
-      ]
-    ]
-  },
-  {
-    "id":"f1c91438.54f678",
-    "type":"outcome",
-    "name":"outcome null",
-    "xml":"<outcome value=''>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1424.8148002624512,
-    "y":675.8386225700378,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "dd6dede8.36e8b"
-      ]
-    ]
-  },
-  {
-    "id":"dd6dede8.36e8b",
-    "type":"set",
-    "name":"set model-version",
-    "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version' \nvalue=\"`$ar-model.version`\" />\n\n\n",
-    "comments":"",
-    "x":1617.6719589233398,
-    "y":675.8385443687439,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"c14238e7.7fc528",
-    "type":"switchNode",
-    "name":"switch ar-model.ecomp-generated-naming",
-    "xml":"<switch test='`$ar-model.ecomp-generated-naming`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1238.38623046875,
-    "y":778.2672729492188,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "e1eb2b6.299a9d8",
-        "b14c2617.4ba278"
-      ]
-    ]
-  },
-  {
-    "id":"e1eb2b6.299a9d8",
-    "type":"other",
-    "name":"outcome Y",
-    "xml":"<outcome value='Y'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1524.3862915039062,
-    "y":777.6958618164062,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "cb449102.0bfe4"
-      ]
-    ]
-  },
-  {
-    "id":"cb449102.0bfe4",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">\n",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":1678.1363525390625,
-    "y":780.19580078125,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "6222201e.ef0d1"
-      ]
-    ]
-  },
-  {
-    "id":"b14c2617.4ba278",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1543.608642578125,
-    "y":866.6958618164062,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "ba1cec2.367321"
-      ]
-    ]
-  },
-  {
-    "id":"ba1cec2.367321",
-    "type":"returnFailure",
-    "name":"return failure",
-    "xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error in allotted-resource-model data.  Ecomp-generated-naming should be true\" />\n\n",
-    "comments":"",
-    "x":1726.608642578125,
-    "y":871.6958618164062,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"6222201e.ef0d1",
-    "type":"switchNode",
-    "name":"switch ar-model.ecomp-generated-naming",
-    "xml":"<switch test='`$ar-model.naming-policy`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1814.38623046875,
-    "y":829.267333984375,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "82b261b0.84ccc",
-        "d8af7c81.cbd5"
-      ]
-    ]
-  },
-  {
-    "id":"82b261b0.84ccc",
-    "type":"other",
-    "name":"outcome oam_network_policy",
-    "xml":"<outcome value='oam_network_policy'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2189.244140625,
-    "y":832.8453369140625,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "a16beaa7.a8be68"
-      ]
-    ]
-  },
-  {
-    "id":"d8af7c81.cbd5",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2103.671875,
-    "y":909.6958618164062,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "a16beaa7.a8be68"
-      ]
-    ]
-  },
-  {
-    "id":"b92b0ebd.ec97e",
-    "type":"set",
-    "name":"set ar_name",
-    "xml":"<set>\n<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />\n",
-    "comments":"",
-    "x":2495.100830078125,
-    "y":868.2672729492188,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ff0ac1c6.8d99",
-    "type":"execute",
-    "name":"execute SliStringUtils - replace TenantOAMNetworkRole",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ar-name`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-name\"/>\n    <parameter name=\"target\" value=\"$TenantOAMNetworkRole\"/>\n    <parameter name=\"replacement\" value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`\"/>\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":2639.2437858581543,
-    "y":912.1244196891785,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"11a52a68.e2bc36",
-    "type":"execute",
-    "name":"execute SliStringUtils - replace LandingNetworkRole",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ar-name`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-name\"/>\n    <parameter name=\"target\" value=\"$LandingNetworkRole\"/>\n    <parameter name=\"replacement\" value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`\"/>\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":2626.243896484375,
-    "y":952.2672729492188,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"a16beaa7.a8be68",
-    "type":"block",
-    "name":"block: atomic",
-    "xml":"<block atomic='true'>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":2303.5292015075684,
-    "y":907.8387522697449,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "b92b0ebd.ec97e",
-        "ff0ac1c6.8d99",
-        "11a52a68.e2bc36",
-        "24287aef.ab1756"
-      ]
-    ]
-  },
-  {
-    "id":"24287aef.ab1756",
-    "type":"set",
-    "name":"set identifiers.allotted-resource-name",
-    "xml":"<set>\n<parameter name='brg-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />\n",
-    "comments":"",
-    "x":2584.1005859375,
-    "y":1002.552978515625,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"16a390f2.71716f",
-    "type":"set",
-    "name":"set assignments in overall structure",
-    "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.' \nvalue=\"`$brg-ar-assignments.`\" />\n\n\n",
-    "comments":"",
-    "x":1193.8624572753906,
-    "y":1039.1246919631958,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"57bd8950.360d48",
-    "type":"set",
-    "name":"Handle brg-ar-assignments",
-    "xml":"<set>\n<parameter name='brg-ar-assignments.vbrg-wan-ip' value='127.0.0.1'/>\n",
-    "comments":"",
-    "x":1173.529052734375,
-    "y":935.5530395507812,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ad1d1f47.0fd92",
-    "type":"for",
-    "name":"for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]",
-    "xml":"<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":2211.8155822753906,
-    "y":1312.5411586761475,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "9eff53f5.fba2e"
-      ]
-    ]
-  },
-  {
-    "id":"4ca1ffaf.2765",
-    "type":"switchNode",
-    "name":"switch service-data.consumed-allotted-resources_length",
-    "xml":"<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1242.8148193359375,
-    "y":1200.005126953125,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "44b6b7be.364a78",
-        "d6f3204f.2e124"
-      ]
-    ]
-  },
-  {
-    "id":"44b6b7be.364a78",
-    "type":"other",
-    "name":"outcome Null",
-    "xml":"<outcome value=''>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1618.2077865600586,
-    "y":1204.6124458312988,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "da9136e5.9a43c8"
-      ]
-    ]
-  },
-  {
-    "id":"d6f3204f.2e124",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1616.9577865600586,
-    "y":1294.6124477386475,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "e4b52287.ffa4f"
-      ]
-    ]
-  },
-  {
-    "id":"9eff53f5.fba2e",
-    "type":"switchNode",
-    "name":"switch allotted-resource-id",
-    "xml":"<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":2646.4106826782227,
-    "y":1314.35085105896,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "4247aaf2.34bc24"
-      ]
-    ]
-  },
-  {
-    "id":"4247aaf2.34bc24",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2853.220375061035,
-    "y":1317.564962387085,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "4915e942.23f368"
-      ]
-    ]
-  },
-  {
-    "id":"e4b52287.ffa4f",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":1774.834976196289,
-    "y":1300.9885501861572,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "ad1d1f47.0fd92",
-        "f259b5a9.563638"
-      ]
-    ]
-  },
-  {
-    "id":"4915e942.23f368",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":3021.4817276000977,
-    "y":1322.4222631454468,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "fbb9a58b.3d9f98",
-        "f2f48ed3.1ccda"
-      ]
-    ]
-  },
-  {
-    "id":"da9136e5.9a43c8",
-    "type":"set",
-    "name":"set cidx",
-    "xml":"<set>\n<parameter name='tmp.cidx' value=\"`0`\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value=\"1\" />\n\n\n",
-    "comments":"",
-    "x":1797.0647735595703,
-    "y":1206.8266830444336,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"fbb9a58b.3d9f98",
-    "type":"set",
-    "name":"set tmp.cidx and ctx.consumed-ar",
-    "xml":"<set>\n<parameter name='tmp.cidx' value='`$cidx`' />\n<parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />\n<parameter name='tmp.found-cidx' value='true' />",
-    "comments":"",
-    "x":3267.3391876220703,
-    "y":1316.9937419891357,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"44d4d3b9.bceb9c",
-    "type":"set",
-    "name":"set consumed allotted resources",
-    "xml":"<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n",
-    "comments":"",
-    "x":1153.6720123291016,
-    "y":1365.326681137085,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"24c4fc44.bfefd4",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1553.910057067871,
-    "y":1725.9815347194672,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "ee4c753c.c76778"
-      ]
-    ]
-  },
-  {
-    "id":"d6830d95.f9764",
-    "type":"comment",
-    "name":"Add BRG AR to mdsal",
-    "info":"",
-    "comments":"",
-    "x":1078.148208618164,
-    "y":1700.6957080364227,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"85496e20.c7fce",
-    "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":1094.4814224243164,
-    "y":1439.171986579895,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"5ce074ae.26955c",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":814.57666015625,
-    "y":382.9814453125,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "eac1d1df.4a04c"
-      ]
-    ]
-  },
-  {
-    "id":"eac1d1df.4a04c",
-    "type":"block",
-    "name":"block: atomic",
-    "xml":"<block atomic=\"true\">\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":762.57666015625,
-    "y":878.7908325195312,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "2e500645.0f8a1a",
-        "adfbfac.9b9f208",
-        "33b72d9b.8a20c2",
-        "afbfed3a.08159",
-        "d3ea34e9.368c88",
-        "40fda3ea.8add9c",
-        "b9913138.178af",
-        "c14238e7.7fc528",
-        "ea01d74e.35b878",
-        "57bd8950.360d48",
-        "16a390f2.71716f",
-        "4ca1ffaf.2765",
-        "44d4d3b9.bceb9c",
-        "85496e20.c7fce",
-        "77739892.271138",
-        "c3886b00.abce88",
-        "98be663.e803998",
-        "b4a4d9bb.64b1c8",
-        "3cb0dbf.eb62a24"
-      ]
-    ]
-  },
-  {
-    "id":"2e500645.0f8a1a",
-    "type":"set",
-    "name":"set id",
-    "xml":"<set>\n<parameter name='brg-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='brg-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='brg-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='brg-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />",
-    "comments":"",
-    "x":1133.2434387207031,
-    "y":388.933837890625,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"c3886b00.abce88",
-    "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 = $brg-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $brg-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$ar-model.invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$ar-model.uuid`\" />\n\t<parameter name=\"operational-status\" value=\"null\" />\n",
-    "comments":"",
-    "outputs":1,
-    "x":1115.0529327392578,
-    "y":1607.0767517089844,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "7ca7c810.8af8c8",
-        "27b10af8.032016"
-      ]
-    ]
-  },
-  {
-    "id":"7ca7c810.8af8c8",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1370.814842224121,
-    "y":1590.0292553901672,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "2112b130.25219e"
-      ]
-    ]
-  },
-  {
-    "id":"2112b130.25219e",
-    "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":1537.338722229004,
-    "y":1601.6483263969421,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"27b10af8.032016",
-    "type":"failure",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1377.9101295471191,
-    "y":1622.7912230491638,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "2112b130.25219e"
-      ]
-    ]
-  },
-  {
-    "id":"f259b5a9.563638",
-    "type":"switchNode",
-    "name":"switch tmp.found-cidx",
-    "xml":"<switch test='`$tmp.found-cidx`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2026.743423461914,
-    "y":1558.7315921783447,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "74a25a57.2f53b4"
-      ]
-    ]
-  },
-  {
-    "id":"74a25a57.2f53b4",
-    "type":"outcomeTrue",
-    "name":"false",
-    "xml":"<outcome value='false'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2216.743377685547,
-    "y":1558.7315292358398,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "c642818d.c82e8"
-      ]
-    ]
-  },
-  {
-    "id":"c642818d.c82e8",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":2382.743377685547,
-    "y":1558.7315292358398,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "94c7e089.4dbec"
-      ]
-    ]
-  },
-  {
-    "id":"94c7e089.4dbec",
-    "type":"set",
-    "name":"set tmp.cidx ",
-    "xml":"<set>\n<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\n",
-    "comments":"",
-    "x":2628.600706100464,
-    "y":1559.3030033111572,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ee4c753c.c76778",
-    "type":"execute",
-    "name":"execute RestApiCallNode - Update parent provided service AR",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"parent\" />\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":1904.9521980285645,
-    "y":1725.6904199123383,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "772b0aab.94a794",
-        "cb34fc4a.b6aaa",
-        "18d615d.09d0cea"
-      ]
-    ]
-  },
-  {
-    "id":"633a71f3.b98a8",
-    "type":"comment",
-    "name":"Rollback parent",
-    "info":"",
-    "comments":"",
-    "x":1748.9521255493164,
-    "y":1695.3570504188538,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"772b0aab.94a794",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2276.2602462768555,
-    "y":1786.3553862571716,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "17d2c2c8.78357d"
-      ]
-    ]
-  },
-  {
-    "id":"cb34fc4a.b6aaa",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2267.26029586792,
-    "y":1754.8554120063782,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "17d2c2c8.78357d"
-      ]
-    ]
-  },
-  {
-    "id":"18d615d.09d0cea",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2271.0103340148926,
-    "y":1725.2125168815255,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "17d2c2c8.78357d"
-      ]
-    ]
-  },
-  {
-    "id":"17d2c2c8.78357d",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":2412.666301727295,
-    "y":1721.4046860709786,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"9883554f.db10a8",
-    "type":"comment",
-    "name":"Generate naming",
-    "info":"",
-    "comments":"",
-    "x":1169.3862762451172,
-    "y":736.2672252655029,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"3d25a078.5fbfa",
-    "type":"get-resource",
-    "name":"get-resource tunnelxconn-allotted-resource",
-    "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='brg-allotted-resources/brg-allotted-resource/$brg-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":514,
-    "y":336.5,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-        "2eb376c7.9249fa",
-        "5ce074ae.26955c"
-      ]
-    ]
-  },
-  {
-    "id":"4f907ab1.9b90b4",
-    "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":590,
-    "y":225.5,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"8f923afe.9146b8",
-    "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":597,
-    "y":265.5,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"f2f48ed3.1ccda",
-    "type":"break",
-    "name":"break",
-    "xml":"<break>\n",
-    "comments":"",
-    "x":3180.243507385254,
-    "y":1362.2316856384277,
-    "z":"25bf3deb.2eabd2",
-    "wires":[
-
-    ]
-  }
-]
\ No newline at end of file
+[{"id":"7570f0f1.92a5b","type":"dgstart","name":"DGSTART","outputs":1,"x":151,"y":77,"z":"bf2de7b8.413148","wires":[["d3b5c6d7.62aef"]]},{"id":"d3b5c6d7.62aef","type":"service-logic","name":"GENERIC-RESOURCE-API 1.2.0-SNAPSHOT-111502","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":285.23809814453125,"y":128.952392578125,"z":"bf2de7b8.413148","wires":[["c52f0437.0bb6a8"]]},{"id":"c52f0437.0bb6a8","type":"method","name":"brg-topology-operation-assign","xml":"<method rpc='brg-topology-operation-assign' mode='sync'>\n","comments":"","outputs":1,"x":293.15485763549805,"y":173.19044589996338,"z":"bf2de7b8.413148","wires":[["5d72c5be.42607c"]]},{"id":"5d72c5be.42607c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":201.47619247436523,"y":316.5237879753113,"z":"bf2de7b8.413148","wires":[["ce4415de.9f0f4","d0247918.df4a68","20bd770e.2b589","f626fedf.f8fe98","5de71d7a.6cddd4"]]},{"id":"7d236fa8.ed7de","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":1044.6666564941406,"y":2243.5477046966553,"z":"bf2de7b8.413148","wires":[]},{"id":"410f6b01.d7177c","type":"set","name":"set output to api handler","xml":"<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":1081.7540550231934,"y":2122.432439804077,"z":"bf2de7b8.413148","wires":[]},{"id":"98199cc9.6a499","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":1153.468376159668,"y":1539.6228160858154,"z":"bf2de7b8.413148","wires":[]},{"id":"d0247918.df4a68","type":"set","name":"set tmp.ar.self-link","xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n","comments":"","x":631.7380676269531,"y":208.33331298828125,"z":"bf2de7b8.413148","wires":[]},{"id":"ce4415de.9f0f4","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n","comments":"","x":684.997314453125,"y":170.59259033203125,"z":"bf2de7b8.413148","wires":[]},{"id":"93640943.c5ad8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":834.8148803710938,"y":356.26727294921875,"z":"bf2de7b8.413148","wires":[["87e21149.4f9e4"]]},{"id":"f12334c3.4295d","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":1174.8626251220703,"y":1764.1008231639862,"z":"bf2de7b8.413148","wires":[["fd12f3ff.cf69e","ab1088f2.67d178","b1a1234c.07f858"]]},{"id":"fd12f3ff.cf69e","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1443.5040016174316,"y":1815.4322349056602,"z":"bf2de7b8.413148","wires":[["8a32e9ad.06d778"]]},{"id":"ab1088f2.67d178","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1434.504051208496,"y":1783.9322606548667,"z":"bf2de7b8.413148","wires":[["8a32e9ad.06d778"]]},{"id":"b1a1234c.07f858","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1438.2540893554688,"y":1754.289365530014,"z":"bf2de7b8.413148","wires":[["22dd0dd8.431072"]]},{"id":"8a32e9ad.06d778","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error updating md-sal for tunnelxconn-allotted-resource\" />\n","comments":"","x":1604.2540893554688,"y":1784.6822844967246,"z":"bf2de7b8.413148","wires":[]},{"id":"1f10f3f4.abae94","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":1184.5294189453125,"y":457.05291748046875,"z":"bf2de7b8.413148","wires":[]},{"id":"7cf9af45.cf036","type":"comment","name":"Save consumed-allotted-resources to mdsal","info":"","comments":"","x":1252.2434692382812,"y":1138.7196044921875,"z":"bf2de7b8.413148","wires":[]},{"id":"6194dab8.45fb04","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":557.8148193359375,"y":326.7672119140625,"z":"bf2de7b8.413148","wires":[]},{"id":"87e21149.4f9e4","type":"returnFailure","name":"return failure - tunnelxconn already exists","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" \n    value=\"`'Existing brg-allotted-resource with order status of ' + $mdsal-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n","comments":"","x":1144.129150390625,"y":352.6243896484375,"z":"bf2de7b8.413148","wires":[]},{"id":"d7e419ac.10dda8","type":"set","name":"set brg-ar-identifiers","xml":"<set>\n<parameter name='brg-ar-identifiers.consuming-service-instance-id' value=\"`$brg-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='brg-ar-identifiers.parent-service-instance-id' value=\"`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='brg-ar-identifiers.allotted-resource-type' value=\"`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='brg-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n","comments":"","x":1194.38623046875,"y":550.6243896484375,"z":"bf2de7b8.413148","wires":[]},{"id":"29e4a25b.07caae","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":1221.338623046875,"y":509.338623046875,"z":"bf2de7b8.413148","wires":[]},{"id":"a7fa051c.ec08b8","type":"set","name":"set identifiers in overall structure","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.' \nvalue=\"`$brg-ar-identifiers.`\" />\n\n\n","comments":"","x":1211.38623046875,"y":858.910400390625,"z":"bf2de7b8.413148","wires":[]},{"id":"a1de8aef.82fc18","type":"set","name":"set onap model information from input","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.brg-topology.onap-model-information.' \nvalue=\"`$brg-topology-operation-input.allotted-resource-information.onap-model-information.`\" />\n\n\n","comments":"","x":1239.957763671875,"y":593.9100952148438,"z":"bf2de7b8.413148","wires":[]},{"id":"a718dba2.92623","type":"switchNode","name":"switch model-invariant-uuid is null","xml":"<switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>\n","comments":"","outputs":1,"x":1219.8148193359375,"y":633.19580078125,"z":"bf2de7b8.413148","wires":[["7ca287e7.711478"]]},{"id":"7ca287e7.711478","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1447.9576988220215,"y":634.6243271827698,"z":"bf2de7b8.413148","wires":[["71896d4.b06f794"]]},{"id":"71896d4.b06f794","type":"set","name":"set model-invariant-uuid","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-invariant-uuid' \nvalue=\"`$ar-model.invariant-uuid`\" />\n\n\n","comments":"","x":1649.38627243042,"y":634.0528798103333,"z":"bf2de7b8.413148","wires":[]},{"id":"8606bb79.93a638","type":"switchNode","name":"switch model-uuid is null","xml":"<switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>\n","comments":"","outputs":1,"x":1192.2434158325195,"y":667.4815106391907,"z":"bf2de7b8.413148","wires":[["79f93f5.6db044"]]},{"id":"79f93f5.6db044","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1393.6719818115234,"y":668.0529322624207,"z":"bf2de7b8.413148","wires":[["c81e4cfe.eaa8d8"]]},{"id":"c81e4cfe.eaa8d8","type":"set","name":"set model-uuid","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-uuid' \nvalue=\"`$ar-model.uuid`\" />\n\n\n","comments":"","x":1586.529140472412,"y":668.0528540611267,"z":"bf2de7b8.413148","wires":[]},{"id":"d9e258a7.c1071","type":"switchNode","name":"switch model-version is null","xml":"<switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>\n","comments":"","outputs":1,"x":1200.8148193359375,"y":700.3386378288269,"z":"bf2de7b8.413148","wires":[["8ee38127.aa0868"]]},{"id":"8ee38127.aa0868","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1450.8148002624512,"y":700.3386225700378,"z":"bf2de7b8.413148","wires":[["610bece7.c45dd4"]]},{"id":"610bece7.c45dd4","type":"set","name":"set model-version","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version' \nvalue=\"`$ar-model.version`\" />\n\n\n","comments":"","x":1643.6719589233398,"y":700.3385443687439,"z":"bf2de7b8.413148","wires":[]},{"id":"7885bfde.a79488","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.ecomp-generated-naming`'>\n","comments":"","outputs":1,"x":1264.38623046875,"y":802.7672729492188,"z":"bf2de7b8.413148","wires":[["9239a2ce.fafa4","e195da86.529e68"]]},{"id":"9239a2ce.fafa4","type":"other","name":"outcome Y","xml":"<outcome value='Y'>\n","comments":"","outputs":1,"x":1550.3862915039062,"y":802.1958618164062,"z":"bf2de7b8.413148","wires":[["cad0403.cd4d94"]]},{"id":"cad0403.cd4d94","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":1704.1363525390625,"y":804.69580078125,"z":"bf2de7b8.413148","wires":[["35d70668.6be0d2"]]},{"id":"e195da86.529e68","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1569.608642578125,"y":891.1958618164062,"z":"bf2de7b8.413148","wires":[["d35a58bc.e50138"]]},{"id":"d35a58bc.e50138","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error in allotted-resource-model data.  Ecomp-generated-naming should be true\" />\n\n","comments":"","x":1752.608642578125,"y":896.1958618164062,"z":"bf2de7b8.413148","wires":[]},{"id":"35d70668.6be0d2","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.naming-policy`'>\n","comments":"","outputs":1,"x":1840.38623046875,"y":853.767333984375,"z":"bf2de7b8.413148","wires":[["c5a38d06.972378","d046dbae.b5109"]]},{"id":"c5a38d06.972378","type":"other","name":"outcome oam_network_policy","xml":"<outcome value='oam_network_policy'>\n","comments":"","outputs":1,"x":2215.244140625,"y":857.3453369140625,"z":"bf2de7b8.413148","wires":[["53d31de0.592f64"]]},{"id":"d046dbae.b5109","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2129.671875,"y":934.1958618164062,"z":"bf2de7b8.413148","wires":[["53d31de0.592f64"]]},{"id":"a6d75105.5c52c8","type":"set","name":"set ar_name","xml":"<set>\n<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />\n","comments":"","x":2521.100830078125,"y":892.7672729492188,"z":"bf2de7b8.413148","wires":[]},{"id":"af081f6c.54a4d","type":"execute","name":"execute SliStringUtils - replace TenantOAMNetworkRole","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ar-name`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-name\"/>\n    <parameter name=\"target\" value=\"$TenantOAMNetworkRole\"/>\n    <parameter name=\"replacement\" value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`\"/>\n\n","comments":"","outputs":1,"x":2665.2437858581543,"y":936.6244196891785,"z":"bf2de7b8.413148","wires":[[]]},{"id":"86105782.997358","type":"execute","name":"execute SliStringUtils - replace LandingNetworkRole","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ar-name`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ar-name\"/>\n    <parameter name=\"target\" value=\"$LandingNetworkRole\"/>\n    <parameter name=\"replacement\" value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`\"/>\n\n","comments":"","outputs":1,"x":2652.243896484375,"y":976.7672729492188,"z":"bf2de7b8.413148","wires":[[]]},{"id":"53d31de0.592f64","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":2329.5292015075684,"y":932.3387522697449,"z":"bf2de7b8.413148","wires":[["a6d75105.5c52c8","af081f6c.54a4d","86105782.997358","8d2f4598.fa58"]]},{"id":"8d2f4598.fa58","type":"set","name":"set identifiers.allotted-resource-name","xml":"<set>\n<parameter name='brg-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />\n","comments":"","x":2610.1005859375,"y":1027.052978515625,"z":"bf2de7b8.413148","wires":[]},{"id":"489a55af.96a154","type":"set","name":"set assignments in overall structure","xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.' \nvalue=\"`$brg-ar-assignments.`\" />\n\n\n","comments":"","x":1219.8624572753906,"y":1063.6246919631958,"z":"bf2de7b8.413148","wires":[]},{"id":"6e15816e.dc1a18","type":"set","name":"Handle brg-ar-assignments","xml":"<set>\n<parameter name='brg-ar-assignments.vbrg-wan-ip' value='127.0.0.1'/>\n","comments":"","x":1199.529052734375,"y":960.0530395507812,"z":"bf2de7b8.413148","wires":[]},{"id":"93589f82.f74e7","type":"for","name":"for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]","xml":"<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n","comments":"","outputs":1,"x":2237.8155822753906,"y":1337.0411586761475,"z":"bf2de7b8.413148","wires":[["10287613.ac1c5a"]]},{"id":"6a7c81a4.d6b458","type":"switchNode","name":"switch service-data.consumed-allotted-resources_length","xml":"<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1268.8148193359375,"y":1224.505126953125,"z":"bf2de7b8.413148","wires":[["93c6f9b5.58d778","7c7889c0.2dcf9"]]},{"id":"93c6f9b5.58d778","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1644.2077865600586,"y":1229.1124458312988,"z":"bf2de7b8.413148","wires":[["51706315.19d304"]]},{"id":"7c7889c0.2dcf9","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1642.9577865600586,"y":1319.1124477386475,"z":"bf2de7b8.413148","wires":[["97e6df3f.75cba"]]},{"id":"10287613.ac1c5a","type":"switchNode","name":"switch allotted-resource-id","xml":"<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n","comments":"","outputs":1,"x":2672.4106826782227,"y":1338.85085105896,"z":"bf2de7b8.413148","wires":[["b1182dc2.599"]]},{"id":"b1182dc2.599","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2879.220375061035,"y":1342.064962387085,"z":"bf2de7b8.413148","wires":[["4a37e6ba.7ef7c8"]]},{"id":"97e6df3f.75cba","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1800.834976196289,"y":1325.4885501861572,"z":"bf2de7b8.413148","wires":[["93589f82.f74e7","af2682ec.9c827"]]},{"id":"4a37e6ba.7ef7c8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":3047.4817276000977,"y":1346.9222631454468,"z":"bf2de7b8.413148","wires":[["4d3df632.b7a47","b70883dd.4d196"]]},{"id":"51706315.19d304","type":"set","name":"set cidx","xml":"<set>\n<parameter name='tmp.cidx' value=\"`0`\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value=\"1\" />\n\n\n","comments":"","x":1823.0647735595703,"y":1231.3266830444336,"z":"bf2de7b8.413148","wires":[]},{"id":"4d3df632.b7a47","type":"set","name":"set tmp.cidx and ctx.consumed-ar","xml":"<set>\n<parameter name='tmp.cidx' value='`$cidx`' />\n<parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />\n<parameter name='tmp.found-cidx' value='true' />","comments":"","x":3293.3391876220703,"y":1341.4937419891357,"z":"bf2de7b8.413148","wires":[]},{"id":"764d1d1a.157ec4","type":"set","name":"set consumed allotted resources","xml":"<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n","comments":"","x":1179.6720123291016,"y":1389.826681137085,"z":"bf2de7b8.413148","wires":[]},{"id":"22dd0dd8.431072","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1579.910057067871,"y":1750.4815347194672,"z":"bf2de7b8.413148","wires":[["c6583a43.de49f"]]},{"id":"20da9a61.ce80de","type":"comment","name":"Add BRG AR to mdsal","info":"","comments":"","x":1104.148208618164,"y":1725.1957080364227,"z":"bf2de7b8.413148","wires":[]},{"id":"d18da704.925258","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":1120.4814224243164,"y":1463.671986579895,"z":"bf2de7b8.413148","wires":[[]]},{"id":"485cf3c4.63339c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":840.57666015625,"y":407.4814453125,"z":"bf2de7b8.413148","wires":[["f17f867f.41ed8"]]},{"id":"f17f867f.41ed8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":788.57666015625,"y":903.2908325195312,"z":"bf2de7b8.413148","wires":[["c9560d04.6cea5","d7e419ac.10dda8","a1de8aef.82fc18","a718dba2.92623","8606bb79.93a638","d9e258a7.c1071","1f10f3f4.abae94","7885bfde.a79488","a7fa051c.ec08b8","6e15816e.dc1a18","489a55af.96a154","6a7c81a4.d6b458","764d1d1a.157ec4","d18da704.925258","98199cc9.6a499","1ef29606.df61aa","f12334c3.4295d","410f6b01.d7177c","7d236fa8.ed7de"]]},{"id":"c9560d04.6cea5","type":"set","name":"set id","xml":"<set>\n<parameter name='brg-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='brg-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='brg-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='brg-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />","comments":"","x":1159.2434387207031,"y":413.433837890625,"z":"bf2de7b8.413148","wires":[]},{"id":"1ef29606.df61aa","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 = $brg-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $brg-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$ar-model.invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$ar-model.uuid`\" />\n\t<parameter name=\"operational-status\" value=\"null\" />\n","comments":"","outputs":1,"x":1141.0529327392578,"y":1631.5767517089844,"z":"bf2de7b8.413148","wires":[["d36496a4.dab97","995b6679.f48c1"]]},{"id":"d36496a4.dab97","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1396.814842224121,"y":1614.5292553901672,"z":"bf2de7b8.413148","wires":[["b90d9c62.7bb3c"]]},{"id":"b90d9c62.7bb3c","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":1563.338722229004,"y":1626.1483263969421,"z":"bf2de7b8.413148","wires":[]},{"id":"995b6679.f48c1","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1403.9101295471191,"y":1647.2912230491638,"z":"bf2de7b8.413148","wires":[["b90d9c62.7bb3c"]]},{"id":"af2682ec.9c827","type":"switchNode","name":"switch tmp.found-cidx","xml":"<switch test='`$tmp.found-cidx`'>\n","comments":"","outputs":1,"x":2052.743423461914,"y":1583.2315921783447,"z":"bf2de7b8.413148","wires":[["d9e9d9ac.d49268"]]},{"id":"d9e9d9ac.d49268","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2242.743377685547,"y":1583.2315292358398,"z":"bf2de7b8.413148","wires":[["a1cb35d3.82d23"]]},{"id":"a1cb35d3.82d23","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2408.743377685547,"y":1583.2315292358398,"z":"bf2de7b8.413148","wires":[["b0efdb24.9fd4c"]]},{"id":"b0efdb24.9fd4c","type":"set","name":"set tmp.cidx ","xml":"<set>\n<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\n","comments":"","x":2654.600706100464,"y":1583.8030033111572,"z":"bf2de7b8.413148","wires":[]},{"id":"c6583a43.de49f","type":"execute","name":"execute RestApiCallNode - Update parent provided service AR","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"parent\" />\n\n","comments":"","outputs":1,"x":1930.9521980285645,"y":1750.1904199123383,"z":"bf2de7b8.413148","wires":[["9ff1a968.b8411","551760d4.5414a8","4b3d2583.fd580c"]]},{"id":"86908d89.d4e3e8","type":"comment","name":"Rollback parent","info":"","comments":"","x":1774.9521255493164,"y":1719.8570504188538,"z":"bf2de7b8.413148","wires":[]},{"id":"9ff1a968.b8411","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2302.2602462768555,"y":1810.8553862571716,"z":"bf2de7b8.413148","wires":[["5bf32973.a0689"]]},{"id":"551760d4.5414a8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2293.26029586792,"y":1779.3554120063782,"z":"bf2de7b8.413148","wires":[["5bf32973.a0689"]]},{"id":"4b3d2583.fd580c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2297.0103340148926,"y":1749.7125168815255,"z":"bf2de7b8.413148","wires":[["5bf32973.a0689"]]},{"id":"5bf32973.a0689","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":2438.666301727295,"y":1745.9046860709786,"z":"bf2de7b8.413148","wires":[[]]},{"id":"d3365f28.2dd8d","type":"comment","name":"Generate naming","info":"","comments":"","x":1195.3862762451172,"y":760.7672252655029,"z":"bf2de7b8.413148","wires":[]},{"id":"20bd770e.2b589","type":"get-resource","name":"get-resource tunnelxconn-allotted-resource","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='brg-allotted-resources/brg-allotted-resource/$brg-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >\n","comments":"","outputs":1,"x":540,"y":359,"z":"bf2de7b8.413148","wires":[["485cf3c4.63339c"]]},{"id":"f626fedf.f8fe98","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":616,"y":250,"z":"bf2de7b8.413148","wires":[[]]},{"id":"5de71d7a.6cddd4","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":623,"y":290,"z":"bf2de7b8.413148","wires":[[]]},{"id":"b70883dd.4d196","type":"break","name":"break","xml":"<break>","comments":"","x":3206.243507385254,"y":1386.7316856384277,"z":"bf2de7b8.413148","wires":[]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-tunnelxconn-ar.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-tunnelxconn-ar.json
index a263325a..29e7161f 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-tunnelxconn-ar.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-tunnelxconn-ar.json
@@ -1,162 +1 @@
-[
-  {
-    "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-tunnelxconn-ar",
-    "xml":"<method rpc='get-tunnelxconn-ar' 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.tunnelxconn-ar",
-    "xml":"<set>\n<parameter name='tmp.tunnelxconn-ar.' value='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$tunnelidx].`' />\n",
-    "comments":"",
-    "x":1310.6668128967285,
-    "y":330.3332872390747,
-    "z":"e0aca357.6f32a",
-    "wires":[
-
-    ]
-  }
-]
\ No newline at end of file
+[{"id":"7c853e9a.8e493","type":"dgstart","name":"DGSTART","outputs":1,"x":107,"y":102,"z":"58c3c7f.58ec038","wires":[["26c3a6ab.f0995a"]]},{"id":"26c3a6ab.f0995a","type":"service-logic","name":"GENERIC-RESOURCE-API 1.2.0-SNAPSHOT-111502","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":203.23807907104492,"y":162.95239067077637,"z":"58c3c7f.58ec038","wires":[["b685d1e2.1ad7"]]},{"id":"b685d1e2.1ad7","type":"method","name":"get-tunnelxconn-ar","xml":"<method rpc='get-tunnelxconn-ar' mode='sync'>\n","comments":"","outputs":1,"x":224.1548728942871,"y":231.52378940582275,"z":"58c3c7f.58ec038","wires":[["a60c7031.42946"]]},{"id":"a60c7031.42946","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":157.47619247436523,"y":341.5237879753113,"z":"58c3c7f.58ec038","wires":[["9497630e.f7b11","c2ddbd60.23e6b"]]},{"id":"c2ddbd60.23e6b","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":342.00000762939453,"y":350.33327293395996,"z":"58c3c7f.58ec038","wires":[["9d4bdfb6.f48ca"]]},{"id":"9497630e.f7b11","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":420.3333282470703,"y":291.6666431427002,"z":"58c3c7f.58ec038","wires":[[]]},{"id":"96f8fe76.c2dd","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":619.6666870117188,"y":464.33331298828125,"z":"58c3c7f.58ec038","wires":[["747bb764.bbace8"]]},{"id":"747bb764.bbace8","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":865.6666870117188,"y":284.3332824707031,"z":"58c3c7f.58ec038","wires":[["d3e839f4.8c4f08"]]},{"id":"d3e839f4.8c4f08","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1045.3332901000977,"y":323.99994945526123,"z":"58c3c7f.58ec038","wires":[["a573ec9b.2c01b"]]},{"id":"a573ec9b.2c01b","type":"set","name":"set tmp.tunnelxconn-ar","xml":"<set>\n<parameter name='tmp.tunnelxconn-ar.' value='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$tunnelidx].`' />\n","comments":"","x":1231.000156402588,"y":320.66662311553955,"z":"58c3c7f.58ec038","wires":[]},{"id":"7eedec25.00f7f4","type":"set","name":"set","xml":"<set>\n<parameter name='tmp.printout.consuming-service-instance-id' value='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$tunnelidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n<parameter name='tmp.printout.index' value='`$tunnelidx`' />\n","comments":"","x":682,"y":332,"z":"58c3c7f.58ec038","wires":[]},{"id":"9d4bdfb6.f48ca","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":522,"y":395,"z":"58c3c7f.58ec038","wires":[["7eedec25.00f7f4","96f8fe76.c2dd"]]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_gw-vfmodule-update.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_gw-vfmodule-update.json
index 485ffacd..43d01536 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_gw-vfmodule-update.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_gw-vfmodule-update.json
@@ -1 +1 @@
-[{"id":"5a2ce84a.2a5768","type":"dgstart","name":"DGSTART","outputs":1,"x":149,"y":91,"z":"d1447f06.01b7f","wires":[["be8f043.98f0ef8"]]},{"id":"be8f043.98f0ef8","type":"service-logic","name":"GENERIC-RESOURCE-API 1.2.0-SNAPSHOT-111502","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":245.23807907104492,"y":151.95239067077637,"z":"d1447f06.01b7f","wires":[["94e132ae.047618"]]},{"id":"94e132ae.047618","type":"method","name":"gw-vfmodule-update","xml":"<method rpc='gw-vfmodule-update' mode='sync'>\n","comments":"","outputs":1,"x":129.15488815307617,"y":245.19043064117432,"z":"d1447f06.01b7f","wires":[["2c97cc82.13917c"]]},{"id":"2c97cc82.13917c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":245.99998092651367,"y":345.0000009536743,"z":"d1447f06.01b7f","wires":[["6fd806f5.1e0cf8","7e47a1b6.ea6ca","ed3653e2.5212a8"]]},{"id":"318d30e7.cc194","type":"execute","name":"generate vnf service-info url - vnf-d","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.vnf-api-url1`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.vnf-api-url2\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vnf-id`\"/>\n\n","comments":"","outputs":1,"x":2005.2500610351562,"y":1515.0002136230469,"z":"d1447f06.01b7f","wires":[[]]},{"id":"43971082.730f7","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.vnf.vfmodule.templatefile`\" />\n   <!--\n   <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.vnf-api-url3`' />\n   -->\n   <parameter name='restapiUrl' value='`$tmp.vf-module-object-path`' />\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-vfmodule-vgw\" />\n\n","comments":"","outputs":1,"x":1591.9999389648438,"y":2046.0001831054688,"z":"d1447f06.01b7f","wires":[["cac6eda.d1dd69"]]},{"id":"27f265c4.04de6a","type":"execute","name":"generate vnf service-info url - service-instance-id","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.service.vnf.vfmodule-resource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.vnf-api-url1\"/>\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":2050.7500610351562,"y":1472.2502136230469,"z":"d1447f06.01b7f","wires":[[]]},{"id":"26b6b15e.7cf40e","type":"execute","name":"generate vnf service-info url - vf-module-id","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.vnf-api-url2`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.vnf-api-url3\"/>\n    <parameter name=\"target\" value=\"{vf-module-id}\"/>\n    <parameter name=\"replacement\" value=\"`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vfmodule-id`\"/>\n\n","comments":"","outputs":1,"x":2029.5000610351562,"y":1556.0002136230469,"z":"d1447f06.01b7f","wires":[[]]},{"id":"dbd1314c.923b4","type":"set","name":"set tmp.vgw.vg_mux_tunnel.vni","xml":"<set>\n<!--\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />\n-->\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[0].allotted-resource-data[0].tunnelxconn-topology[0].tunnelxconn-assignments[0].vni`' />\n\n\n\n","comments":"","x":1583.2500610351562,"y":1633.5002136230469,"z":"d1447f06.01b7f","wires":[]},{"id":"c79e8967.5f551","type":"set","name":"set tmp.service.vnf.vf-module-id","xml":"<set>\n<parameter name='tmp.service.vnf.vf-module.vf-module-id' value='9aa4ede4-c639-48c4-9386-74c9ff87f8e3' />\n<parameter name='brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vfmodule-id' value='9aa4ede4-c639-48c4-9386-74c9ff87f8e3' />","comments":"","x":2045.75,"y":1313.0834045410156,"z":"d1447f06.01b7f","wires":[]},{"id":"1743f961.36c79f","type":"set","name":"set tmp.service-data.vnf-information.vnf-id","xml":"<set>\n<parameter name='tmp.service-data.vnf-information.vnf-id' value='3a3332d1-12ad-4709-ac81-ba32b304a462' />\n<parameter name='brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vnf-id' value='3a3332d1-12ad-4709-ac81-ba32b304a462' />\n","comments":"","x":2012,"y":1273.0834045410156,"z":"d1447f06.01b7f","wires":[]},{"id":"e053f1e9.fe00e","type":"set","name":"set tmp.service-data.service-information.service-instance-id","xml":"<set>\n<parameter name='tmp.service-data.service-information.service-instance-id' value='6e34b9fb-9ec1-4c95-9e12-0326c434c623' />\n","comments":"","x":2060.7499389648438,"y":1218.083251953125,"z":"d1447f06.01b7f","wires":[]},{"id":"db82c7d3.0603c8","type":"set","name":"set tmp.service.vnf.vf-module-id","xml":"<set>\n<parameter name='tmp.restapi.service.vnf.vfmodule-resource' value='`$prop.restapi.service.vnf.vfmodule-resource`' />\n","comments":"","x":1565.75,"y":1351.8333435058594,"z":"d1447f06.01b7f","wires":[]},{"id":"eff549e7.c3aa1","type":"execute","name":"execute Propertis gen-res-api-dg","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":1573.2498779296875,"y":1143.0834045410156,"z":"d1447f06.01b7f","wires":[[]]},{"id":"cac6eda.d1dd69","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1873.2499389648438,"y":2097.2501831054688,"z":"d1447f06.01b7f","wires":[["118e296d.8d4b27"]]},{"id":"118e296d.8d4b27","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Failed on PUT vf-module parameters to MD0SAL' />\n","comments":"","x":2063.2499389648438,"y":2106.0001831054688,"z":"d1447f06.01b7f","wires":[]},{"id":"d77077f7.503848","type":"set","name":"set VGW2BRG-MACADDRESs & consuming service-instance","xml":"<set>\n<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\n<parameter name='tmp.brg-mac-address-match' value=\"`'VGW2BRG-' + $tmp.brg-macaddress`\"/>\n<!--\n<parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />\nservice-data.service-topology.service-topology-identifier.service-instance-id\n\n-->\n<parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\n","comments":"","x":620.0000610351562,"y":357.08343505859375,"z":"d1447f06.01b7f","wires":[]},{"id":"523ea527.76699c","type":"get-resource","name":"get-resource vnfs","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='preload-vnfs' pfx='tmp.preloadvnfdata' >\n","comments":"","outputs":1,"x":782.3055419921875,"y":688.7499694824219,"z":"d1447f06.01b7f","wires":[[]]},{"id":"76a8e6e4.4fc528","type":"for","name":"for tmp.vnfs","xml":"<for index='vnfidx' start='0' end='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list_length`' >\n\n\n","comments":"","outputs":1,"x":776.1944580078125,"y":790.9723510742188,"z":"d1447f06.01b7f","wires":[["b2eff683.95cbe"]]},{"id":"91e15171.591e1","type":"switchNode","name":"switch parameter name","xml":"<switch test='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].vnf-name == $tmp.brg-mac-address-match`'>\n\n\n","comments":"","outputs":1,"x":1064.1942749023438,"y":806.361083984375,"z":"d1447f06.01b7f","wires":[["889d8c80.f385f8"]]},{"id":"889d8c80.f385f8","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1222.91650390625,"y":952.5,"z":"d1447f06.01b7f","wires":[["2cc787b4.515c08"]]},{"id":"2cc787b4.515c08","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1138,"y":1412.5,"z":"d1447f06.01b7f","wires":[["d21db1e1.8f1b08","eff549e7.c3aa1","db82c7d3.0603c8","1b68e1a3.6004ae","2086475b.a51918","35c66ad8.ae3386","2e18627.f93a01e","61a05b5e.1b139c","79598fea.259c78","dbd1314c.923b4","5426cffc.d7aa3"]]},{"id":"e64a5ef3.99b52","type":"comment","name":"vnfidx ","info":"","comments":"","x":1384.2499389648438,"y":826.2500305175781,"z":"d1447f06.01b7f","wires":[]},{"id":"d21db1e1.8f1b08","type":"for","name":"for each vnf parameter copy to vf_module_parameter","xml":"<for index='preloadIdx' start='0' end='`$tmp.endLoop1`'>\n<!--\n\n     \"preload-data\": {\n          \"vnf-topology-information\": {\n            \"vnf-parameters\": [\n            \n            -->\n","comments":"","outputs":1,"x":1640.4999389648438,"y":1021.25,"z":"d1447f06.01b7f","wires":[["2c47b660.a0b01a"]]},{"id":"51e53b5d.e9a984","type":"set","name":"set name/values","xml":"<set>\n<parameter name='tmp.vfmodule.param[$preloadIdx].name'  value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$preloadIdx].vnf-parameter-name`' />\n<parameter name='tmp.vfmodule.param[$preloadIdx].value' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$preloadIdx].vnf-parameter-value`' />","comments":"","x":2145.6389770507812,"y":1090.9722595214844,"z":"d1447f06.01b7f","wires":[]},{"id":"6fd806f5.1e0cf8","type":"get-resource","name":"get-resource tunnelxcon-allotted-resources","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API'    \n         key='tunnelxconn-allotted-resources/' pfx='tmp.txconns' >\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t","comments":"","outputs":1,"x":562.3635559082031,"y":457.8182067871094,"z":"d1447f06.01b7f","wires":[["a14f4f30.7bf86"]]},{"id":"4ed3399b.5f757","type":"for","name":"for tmp.xconns.tunnelxconn-allotted-resoruces.tunnelxonn-alloted-resource[]","xml":"<for index='txidx' start='0' end='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource_length`' >\n\n\n","comments":"","outputs":1,"x":1033.4544982910156,"y":480.9090576171875,"z":"d1447f06.01b7f","wires":[["1f8ab929.f4fdff"]]},{"id":"63993bff.c5d494","type":"switchNode","name":"switch parameter name","xml":"<switch test='`$tmp.test1 == $tmp.consuming-service-instance-id`'>","comments":"","outputs":1,"x":1419,"y":612.7423706054688,"z":"d1447f06.01b7f","wires":[["c5f860b7.8ce078"]]},{"id":"c5f860b7.8ce078","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1587.5,"y":683.060546875,"z":"d1447f06.01b7f","wires":[["d9ee0f7e.01bf88"]]},{"id":"60344461.6714d4","type":"set","name":"set thisIsVGW","xml":"<set>\n<parameter name='tmp.thisIsVGW' value='true' />\n","comments":"","x":1934.8182373046875,"y":797.5454711914062,"z":"d1447f06.01b7f","wires":[]},{"id":"7e47a1b6.ea6ca","type":"set","name":"set thisIsVGW false","xml":"<set>\n<parameter name='tmp.thisIsVGW' value='false' />\n","comments":"","x":482.81817626953125,"y":407.81817626953125,"z":"d1447f06.01b7f","wires":[]},{"id":"ed3653e2.5212a8","type":"switchNode","name":"switch thsIsVGW","xml":"<switch test='`$tmp.thisIsVGW`'>\n","comments":"","outputs":1,"x":294.3636474609375,"y":516.3637084960938,"z":"d1447f06.01b7f","wires":[["88630163.1f719"]]},{"id":"88630163.1f719","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":317.090909090909,"y":598.1818181818181,"z":"d1447f06.01b7f","wires":[["8910cdf6.2f0ab"]]},{"id":"8910cdf6.2f0ab","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":498.67474365234375,"y":786.293701171875,"z":"d1447f06.01b7f","wires":[["523ea527.76699c","76a8e6e4.4fc528"]]},{"id":"b2eff683.95cbe","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":854.666748046875,"y":841.1112060546875,"z":"d1447f06.01b7f","wires":[["91e15171.591e1","7ac6eb03.0d1e8c"]]},{"id":"1f8ab929.f4fdff","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1188,"y":544.4444580078125,"z":"d1447f06.01b7f","wires":[["63993bff.c5d494","43685628.f5f5d"]]},{"id":"2c47b660.a0b01a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1943.4166259765625,"y":1053.1944885253906,"z":"d1447f06.01b7f","wires":[["51e53b5d.e9a984"]]},{"id":"a14f4f30.7bf86","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":647.6666666666665,"y":508.22222222222223,"z":"d1447f06.01b7f","wires":[["4ed3399b.5f757"]]},{"id":"43685628.f5f5d","type":"set","name":"set txconns.tunnelxconn-allotted-resources.tunnelxconn-alloted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id","xml":"<set>\n<parameter name='tmp.test1' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n<parameter name='tmp.test2' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource-data[$txidx].tunnelxconn-topology[0].allotted-resource-identifiers[0].consuming-service-instance-id`' />","comments":"","x":1290,"y":183,"z":"d1447f06.01b7f","wires":[]},{"id":"7ac6eb03.0d1e8c","type":"set","name":"set test3","xml":"<set>\n<parameter name='tmp.test3' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].vnf-name`' />\n<parameter name='tmp.test4' value='`$tmp.brg-mac-address-match`'/>\n\n\n","comments":"","x":1016,"y":732,"z":"d1447f06.01b7f","wires":[]},{"id":"1b68e1a3.6004ae","type":"set","name":"set length of for  endLoop1","xml":"<set>\n<parameter name='tmp.endLoop1' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters_length`' />","comments":"","x":1554.25,"y":947.5,"z":"d1447f06.01b7f","wires":[]},{"id":"2086475b.a51918","type":"set","name":"set vf-module-object-path","xml":"<set>\n<parameter name='tmp.vf-module-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $service-data.service-topology.service-topology-identifier.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id \n + '/'`\"/>\n","comments":"","x":1490.5,"y":1412.5,"z":"d1447f06.01b7f","wires":[]},{"id":"35c66ad8.ae3386","type":"set","name":"copy  vf-module-parameters","xml":"<set>\n<!--\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param.'\n\n                 service-data.vnfs.vnf\\[0\\].       vnf-data.vf-modules.vf-module\\[0\\]             .vf-module-data.vf-module-topology.vf-module-parameters.param.\n   value='$tmp.vfmodule.' />\n-->\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.'\n   value='$tmp.vfmodule.' />","comments":"","x":1528.0000610351562,"y":1818.2499389648438,"z":"d1447f06.01b7f","wires":[]},{"id":"2e18627.f93a01e","type":"execute","name":"execute print context","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bdf-gw-vfmodule.log' />\n","comments":"","outputs":1,"x":1464.2500610351562,"y":1873.7499389648438,"z":"d1447f06.01b7f","wires":[[]]},{"id":"61a05b5e.1b139c","type":"set","name":"set tmp.vfmodule.param_length","xml":"<set>\n<parameter name='tmp.vfmodule.param_length' value='`$tmp.endLoop1`' />\n","comments":"","x":1574.2501831054688,"y":1085,"z":"d1447f06.01b7f","wires":[]},{"id":"8dcc0569.10249","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":1215.5,"y":1632.5,"z":"d1447f06.01b7f","wires":[]},{"id":"79598fea.259c78","type":"for","name":"for paramIdx to set VNI","xml":"<for index='paramIdx' start='0' end='`$tmp.vfmodule.param_length`' >\n","comments":"","outputs":1,"x":1563,"y":1732.5,"z":"d1447f06.01b7f","wires":[["907e0702.827b98"]]},{"id":"27ea0bf1.7371bc","type":"switchNode","name":"switch parameter name vg-mux-tunnel-vni","xml":"<switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-mux-tunnel-vni-match`'>","comments":"","outputs":1,"x":2060.5,"y":1801.25,"z":"d1447f06.01b7f","wires":[["cd5c9ec4.ad0af8"]]},{"id":"cd5c9ec4.ad0af8","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2378,"y":1828.75,"z":"d1447f06.01b7f","wires":[["bb91234f.950048"]]},{"id":"bb91234f.950048","type":"set","name":"set vni in tmp.vfmodule.param","xml":"<set>\n<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni`' />\n","comments":"","x":2590.5,"y":1866.25,"z":"d1447f06.01b7f","wires":[]},{"id":"5426cffc.d7aa3","type":"set","name":"set switch test string","xml":"<set>\n<!--\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />\n-->\n<parameter name='tmp.vg-mux-tunnel-vni-match' value='vg_vgmux_tunnel_vni' />\n\n\n\n","comments":"","x":1553,"y":1682.5,"z":"d1447f06.01b7f","wires":[]},{"id":"907e0702.827b98","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1769.25,"y":1727.5,"z":"d1447f06.01b7f","wires":[["27ea0bf1.7371bc"]]},{"id":"39894545.21de32","type":"set","name":"set to see tmpvfmodule.param[].name","xml":"<set>\n<!--\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />\n-->\n<parameter name='tmp.test.param[$paramIdx].name' value='`$tmp.vfmodule.param[$paramIdx].name`' />\n\n\n\n","comments":"","x":2048.0000610351562,"y":1720,"z":"d1447f06.01b7f","wires":[]},{"id":"307ee0b5.e38d7","type":"comment","name":"let md-sal helper save data so no need for the RESTAPICAll Node","info":"","comments":"","x":1560.4999084472656,"y":1972.5,"z":"d1447f06.01b7f","wires":[]},{"id":"d2760d91.22b388","type":"comment","name":" using path from calling DG - these nodes for testing","info":"","comments":"","x":2043,"y":1423.75,"z":"d1447f06.01b7f","wires":[]},{"id":"e46e612b.087e1","type":"set","name":"set MACADDRESS fa:16:3e:8f:ea:68 ","xml":"<set>\n<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\n\n","comments":"","x":537,"y":309,"z":"d1447f06.01b7f","wires":[]},{"id":"5bb21711.d63b1","type":"set","name":"set VGW2BRG-MACADDRESs & consuming service-instance","xml":"<set>\n<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\n<parameter name='tmp.brg-mac-address-match' value=\"`'VGW2BRG-' + $tmp.brg-macaddress`\"/>\n<!--\n<parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />\nservice-data.service-topology.service-topology-identifier.service-instance-id\n\n-->\n<parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\n","comments":"","x":2077,"y":730,"z":"d1447f06.01b7f","wires":[]},{"id":"d9ee0f7e.01bf88","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1733,"y":713,"z":"d1447f06.01b7f","wires":[["60344461.6714d4","5bb21711.d63b1","f7dd993b.b754a"]]},{"id":"f7dd993b.b754a","type":"set","name":"set MACADDRESS tmp.txconcs...brg-wan-mac-address","xml":"<set>\n<parameter name='tmp.brg-macaddress' \n      value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.brg-wan-mac-address`' />\n\n","comments":"","x":2051,"y":667,"z":"d1447f06.01b7f","wires":[]}]
+[{"id":"5a2ce84a.2a5768","type":"dgstart","name":"DGSTART","outputs":1,"x":149,"y":91,"z":"d1447f06.01b7f","wires":[["be8f043.98f0ef8"]]},{"id":"be8f043.98f0ef8","type":"service-logic","name":"GENERIC-RESOURCE-API 1.2.0-SNAPSHOT-111603b2","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":245.23807907104492,"y":151.95239067077637,"z":"d1447f06.01b7f","wires":[["94e132ae.047618"]]},{"id":"94e132ae.047618","type":"method","name":"gw-vfmodule-update","xml":"<method rpc='gw-vfmodule-update' mode='sync'>\n","comments":"","outputs":1,"x":129.15488815307617,"y":245.19043064117432,"z":"d1447f06.01b7f","wires":[["2c97cc82.13917c"]]},{"id":"2c97cc82.13917c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":245.99998092651367,"y":345.0000009536743,"z":"d1447f06.01b7f","wires":[["6fd806f5.1e0cf8","7e47a1b6.ea6ca","ed3653e2.5212a8","d77077f7.503848"]]},{"id":"318d30e7.cc194","type":"execute","name":"generate vnf service-info url - vnf-d","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.vnf-api-url1`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.vnf-api-url2\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vnf-id`\"/>\n\n","comments":"","outputs":1,"x":2005.2500610351562,"y":1515.0002136230469,"z":"d1447f06.01b7f","wires":[[]]},{"id":"43971082.730f7","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.vnf.vfmodule.templatefile`\" />\n   <!--\n   <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.vnf-api-url3`' />\n   -->\n   <parameter name='restapiUrl' value='`$tmp.vf-module-object-path`' />\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-vfmodule-vgw\" />\n\n","comments":"","outputs":1,"x":1591.9999389648438,"y":2046.0001831054688,"z":"d1447f06.01b7f","wires":[["cac6eda.d1dd69"]]},{"id":"27f265c4.04de6a","type":"execute","name":"generate vnf service-info url - service-instance-id","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.service.vnf.vfmodule-resource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.vnf-api-url1\"/>\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":2050.7500610351562,"y":1472.2502136230469,"z":"d1447f06.01b7f","wires":[[]]},{"id":"26b6b15e.7cf40e","type":"execute","name":"generate vnf service-info url - vf-module-id","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.vnf-api-url2`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.vnf-api-url3\"/>\n    <parameter name=\"target\" value=\"{vf-module-id}\"/>\n    <parameter name=\"replacement\" value=\"`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vfmodule-id`\"/>\n\n","comments":"","outputs":1,"x":2029.5000610351562,"y":1556.0002136230469,"z":"d1447f06.01b7f","wires":[[]]},{"id":"dbd1314c.923b4","type":"set","name":"set tmp.vgw.vg_mux_tunnel.vni","xml":"<set>\n<!--\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />\n-->\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[0].allotted-resource-data[0].tunnelxconn-topology[0].tunnelxconn-assignments[0].vni`' />\n\n\n\n","comments":"","x":1583.2500610351562,"y":1633.5002136230469,"z":"d1447f06.01b7f","wires":[]},{"id":"c79e8967.5f551","type":"set","name":"set tmp.service.vnf.vf-module-id","xml":"<set>\n<parameter name='tmp.service.vnf.vf-module.vf-module-id' value='9aa4ede4-c639-48c4-9386-74c9ff87f8e3' />\n<parameter name='brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vfmodule-id' value='9aa4ede4-c639-48c4-9386-74c9ff87f8e3' />","comments":"","x":2045.75,"y":1313.0834045410156,"z":"d1447f06.01b7f","wires":[]},{"id":"1743f961.36c79f","type":"set","name":"set tmp.service-data.vnf-information.vnf-id","xml":"<set>\n<parameter name='tmp.service-data.vnf-information.vnf-id' value='3a3332d1-12ad-4709-ac81-ba32b304a462' />\n<parameter name='brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.gw-vnf-id' value='3a3332d1-12ad-4709-ac81-ba32b304a462' />\n","comments":"","x":2012,"y":1273.0834045410156,"z":"d1447f06.01b7f","wires":[]},{"id":"e053f1e9.fe00e","type":"set","name":"set tmp.service-data.service-information.service-instance-id","xml":"<set>\n<parameter name='tmp.service-data.service-information.service-instance-id' value='6e34b9fb-9ec1-4c95-9e12-0326c434c623' />\n","comments":"","x":2060.7499389648438,"y":1218.083251953125,"z":"d1447f06.01b7f","wires":[]},{"id":"db82c7d3.0603c8","type":"set","name":"set tmp.service.vnf.vf-module-id","xml":"<set>\n<parameter name='tmp.restapi.service.vnf.vfmodule-resource' value='`$prop.restapi.service.vnf.vfmodule-resource`' />\n","comments":"","x":1565.75,"y":1351.8333435058594,"z":"d1447f06.01b7f","wires":[]},{"id":"eff549e7.c3aa1","type":"execute","name":"execute Propertis gen-res-api-dg","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":1573.2498779296875,"y":1143.0834045410156,"z":"d1447f06.01b7f","wires":[[]]},{"id":"cac6eda.d1dd69","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1873.2499389648438,"y":2097.2501831054688,"z":"d1447f06.01b7f","wires":[["118e296d.8d4b27"]]},{"id":"118e296d.8d4b27","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Failed on PUT vf-module parameters to MD0SAL' />\n","comments":"","x":2063.2499389648438,"y":2106.0001831054688,"z":"d1447f06.01b7f","wires":[]},{"id":"d77077f7.503848","type":"set","name":"set  consuming service-instance","xml":"<set>\n<!--\n<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\n<parameter name='tmp.brg-mac-address-match' value=\"`'VGW2BRG-' + $tmp.brg-macaddress`\"/>\n\n<parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />\nservice-data.service-topology.service-topology-identifier.service-instance-id\n\n-->\n<parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\n","comments":"","x":620.0000610351562,"y":357.08343505859375,"z":"d1447f06.01b7f","wires":[]},{"id":"523ea527.76699c","type":"get-resource","name":"get-resource vnfs","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='preload-vnfs' pfx='tmp.preloadvnfdata' >\n","comments":"","outputs":1,"x":782.3055419921875,"y":688.7499694824219,"z":"d1447f06.01b7f","wires":[[]]},{"id":"76a8e6e4.4fc528","type":"for","name":"for tmp.vnfs","xml":"<for index='vnfidx' start='0' end='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list_length`' >\n\n\n","comments":"","outputs":1,"x":776.1944580078125,"y":790.9723510742188,"z":"d1447f06.01b7f","wires":[["b2eff683.95cbe"]]},{"id":"91e15171.591e1","type":"switchNode","name":"switch parameter name","xml":"<switch test='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].vnf-name == $tmp.brg-mac-address-match`'>\n\n\n","comments":"","outputs":1,"x":1064.1942749023438,"y":806.361083984375,"z":"d1447f06.01b7f","wires":[["889d8c80.f385f8"]]},{"id":"889d8c80.f385f8","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1222.91650390625,"y":952.5,"z":"d1447f06.01b7f","wires":[["2cc787b4.515c08"]]},{"id":"2cc787b4.515c08","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1138,"y":1412.5,"z":"d1447f06.01b7f","wires":[["d21db1e1.8f1b08","eff549e7.c3aa1","db82c7d3.0603c8","1b68e1a3.6004ae","2086475b.a51918","35c66ad8.ae3386","2e18627.f93a01e","61a05b5e.1b139c","79598fea.259c78","dbd1314c.923b4","5426cffc.d7aa3"]]},{"id":"e64a5ef3.99b52","type":"comment","name":"vnfidx ","info":"","comments":"","x":1384.2499389648438,"y":826.2500305175781,"z":"d1447f06.01b7f","wires":[]},{"id":"d21db1e1.8f1b08","type":"for","name":"for each vnf parameter copy to vf_module_parameter","xml":"<for index='preloadIdx' start='0' end='`$tmp.endLoop1`'>\n<!--\n\n     \"preload-data\": {\n          \"vnf-topology-information\": {\n            \"vnf-parameters\": [\n            \n            -->\n","comments":"","outputs":1,"x":1640.4999389648438,"y":1021.25,"z":"d1447f06.01b7f","wires":[["2c47b660.a0b01a"]]},{"id":"51e53b5d.e9a984","type":"set","name":"set name/values","xml":"<set>\n<parameter name='tmp.vfmodule.param[$preloadIdx].name'  value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$preloadIdx].vnf-parameter-name`' />\n<parameter name='tmp.vfmodule.param[$preloadIdx].value' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$preloadIdx].vnf-parameter-value`' />","comments":"","x":2145.6389770507812,"y":1090.9722595214844,"z":"d1447f06.01b7f","wires":[]},{"id":"6fd806f5.1e0cf8","type":"get-resource","name":"get-resource tunnelxcon-allotted-resources","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API'    \n         key='tunnelxconn-allotted-resources/' pfx='tmp.txconns' >\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t","comments":"","outputs":1,"x":562.3635559082031,"y":457.8182067871094,"z":"d1447f06.01b7f","wires":[["a14f4f30.7bf86"]]},{"id":"4ed3399b.5f757","type":"for","name":"for tmp.xconns.tunnelxconn-allotted-resoruces.tunnelxonn-alloted-resource[]","xml":"<for index='txidx' start='0' end='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource_length`' >\n\n\n","comments":"","outputs":1,"x":1033.4544982910156,"y":480.9090576171875,"z":"d1447f06.01b7f","wires":[["1f8ab929.f4fdff"]]},{"id":"63993bff.c5d494","type":"switchNode","name":"switch parameter name","xml":"<switch test='`$tmp.test1 == $tmp.consuming-service-instance-id`'>","comments":"","outputs":1,"x":1419,"y":612.7423706054688,"z":"d1447f06.01b7f","wires":[["c5f860b7.8ce078"]]},{"id":"c5f860b7.8ce078","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1587.5,"y":683.060546875,"z":"d1447f06.01b7f","wires":[["d9ee0f7e.01bf88"]]},{"id":"60344461.6714d4","type":"set","name":"set thisIsVGW","xml":"<set>\n<parameter name='tmp.thisIsVGW' value='true' />\n","comments":"","x":1934.8182373046875,"y":797.5454711914062,"z":"d1447f06.01b7f","wires":[]},{"id":"7e47a1b6.ea6ca","type":"set","name":"set thisIsVGW false","xml":"<set>\n<parameter name='tmp.thisIsVGW' value='false' />\n","comments":"","x":482.81817626953125,"y":407.81817626953125,"z":"d1447f06.01b7f","wires":[]},{"id":"ed3653e2.5212a8","type":"switchNode","name":"switch thsIsVGW","xml":"<switch test='`$tmp.thisIsVGW`'>\n","comments":"","outputs":1,"x":294.3636474609375,"y":516.3637084960938,"z":"d1447f06.01b7f","wires":[["88630163.1f719","6d08e5de.b49f9c"]]},{"id":"88630163.1f719","type":"other","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":317.090909090909,"y":598.1818181818181,"z":"d1447f06.01b7f","wires":[["8910cdf6.2f0ab"]]},{"id":"8910cdf6.2f0ab","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":498.67474365234375,"y":786.293701171875,"z":"d1447f06.01b7f","wires":[["523ea527.76699c","76a8e6e4.4fc528"]]},{"id":"b2eff683.95cbe","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":854.666748046875,"y":841.1112060546875,"z":"d1447f06.01b7f","wires":[["91e15171.591e1","7ac6eb03.0d1e8c"]]},{"id":"1f8ab929.f4fdff","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1188,"y":544.4444580078125,"z":"d1447f06.01b7f","wires":[["63993bff.c5d494","43685628.f5f5d"]]},{"id":"2c47b660.a0b01a","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1943.4166259765625,"y":1053.1944885253906,"z":"d1447f06.01b7f","wires":[["51e53b5d.e9a984"]]},{"id":"a14f4f30.7bf86","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":647.6666666666665,"y":508.22222222222223,"z":"d1447f06.01b7f","wires":[["4ed3399b.5f757"]]},{"id":"43685628.f5f5d","type":"set","name":"set txconns.tunnelxconn-allotted-resources.tunnelxconn-alloted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id","xml":"<set>\n<parameter name='tmp.test1' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n<parameter name='tmp.test2' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource-data[$txidx].tunnelxconn-topology[0].allotted-resource-identifiers[0].consuming-service-instance-id`' />","comments":"","x":1290,"y":183,"z":"d1447f06.01b7f","wires":[]},{"id":"7ac6eb03.0d1e8c","type":"set","name":"set test3","xml":"<set>\n<parameter name='tmp.test3' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].vnf-name`' />\n<parameter name='tmp.test4' value='`$tmp.brg-mac-address-match`'/>\n\n\n","comments":"","x":1016,"y":732,"z":"d1447f06.01b7f","wires":[]},{"id":"1b68e1a3.6004ae","type":"set","name":"set length of for  endLoop1","xml":"<set>\n<parameter name='tmp.endLoop1' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters_length`' />","comments":"","x":1554.25,"y":947.5,"z":"d1447f06.01b7f","wires":[]},{"id":"2086475b.a51918","type":"set","name":"set vf-module-object-path","xml":"<set>\n<parameter name='tmp.vf-module-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $service-data.service-topology.service-topology-identifier.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id \n + '/'`\"/>\n","comments":"","x":1490.5,"y":1412.5,"z":"d1447f06.01b7f","wires":[]},{"id":"35c66ad8.ae3386","type":"set","name":"copy  vf-module-parameters","xml":"<set>\n<!--\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param.'\n\n                 service-data.vnfs.vnf\\[0\\].       vnf-data.vf-modules.vf-module\\[0\\]             .vf-module-data.vf-module-topology.vf-module-parameters.param.\n   value='$tmp.vfmodule.' />\n-->\n<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.'\n   value='$tmp.vfmodule.' />","comments":"","x":1528.0000610351562,"y":1818.2499389648438,"z":"d1447f06.01b7f","wires":[]},{"id":"2e18627.f93a01e","type":"execute","name":"execute print context","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bdf-gw-vfmodule.log' />\n","comments":"","outputs":1,"x":1464.2500610351562,"y":1873.7499389648438,"z":"d1447f06.01b7f","wires":[[]]},{"id":"61a05b5e.1b139c","type":"set","name":"set tmp.vfmodule.param_length","xml":"<set>\n<parameter name='tmp.vfmodule.param_length' value='`$tmp.endLoop1`' />\n","comments":"","x":1574.2501831054688,"y":1085,"z":"d1447f06.01b7f","wires":[]},{"id":"8dcc0569.10249","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":1215.5,"y":1632.5,"z":"d1447f06.01b7f","wires":[]},{"id":"79598fea.259c78","type":"for","name":"for paramIdx to set VNI","xml":"<for index='paramIdx' start='0' end='`$tmp.vfmodule.param_length`' >\n","comments":"","outputs":1,"x":1563,"y":1732.5,"z":"d1447f06.01b7f","wires":[["907e0702.827b98"]]},{"id":"27ea0bf1.7371bc","type":"switchNode","name":"switch parameter name vg-mux-tunnel-vni","xml":"<switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-mux-tunnel-vni-match`'>","comments":"","outputs":1,"x":2060.5,"y":1801.25,"z":"d1447f06.01b7f","wires":[["cd5c9ec4.ad0af8"]]},{"id":"cd5c9ec4.ad0af8","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2378,"y":1828.75,"z":"d1447f06.01b7f","wires":[["bb91234f.950048"]]},{"id":"bb91234f.950048","type":"set","name":"set vni in tmp.vfmodule.param","xml":"<set>\n<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni`' />\n","comments":"","x":2590.5,"y":1866.25,"z":"d1447f06.01b7f","wires":[]},{"id":"5426cffc.d7aa3","type":"set","name":"set switch test string","xml":"<set>\n<!--\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />\n-->\n<parameter name='tmp.vg-mux-tunnel-vni-match' value='vg_vgmux_tunnel_vni' />\n\n\n\n","comments":"","x":1553,"y":1682.5,"z":"d1447f06.01b7f","wires":[]},{"id":"907e0702.827b98","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1769.25,"y":1727.5,"z":"d1447f06.01b7f","wires":[["27ea0bf1.7371bc"]]},{"id":"39894545.21de32","type":"set","name":"set to see tmpvfmodule.param[].name","xml":"<set>\n<!--\n<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />\n-->\n<parameter name='tmp.test.param[$paramIdx].name' value='`$tmp.vfmodule.param[$paramIdx].name`' />\n\n\n\n","comments":"","x":2048.0000610351562,"y":1720,"z":"d1447f06.01b7f","wires":[]},{"id":"307ee0b5.e38d7","type":"comment","name":"let md-sal helper save data so no need for the RESTAPICAll Node","info":"","comments":"","x":1560.4999084472656,"y":1972.5,"z":"d1447f06.01b7f","wires":[]},{"id":"d2760d91.22b388","type":"comment","name":" using path from calling DG - these nodes for testing","info":"","comments":"","x":2043,"y":1423.75,"z":"d1447f06.01b7f","wires":[]},{"id":"e46e612b.087e1","type":"set","name":"set MACADDRESS fa:16:3e:8f:ea:68 ","xml":"<set>\n<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\n\n","comments":"","x":537,"y":309,"z":"d1447f06.01b7f","wires":[]},{"id":"5bb21711.d63b1","type":"set","name":"set VGW2BRG-MACADDRESs & consuming service-instance","xml":"<set>\n<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\n<parameter name='tmp.brg-mac-address-match' value=\"`'VGW2BRG-' + $tmp.brg-macaddress`\"/>\n<!--\n<parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />\nservice-data.service-topology.service-topology-identifier.service-instance-id\n\n-->\n<parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\n","comments":"","x":2077,"y":730,"z":"d1447f06.01b7f","wires":[]},{"id":"d9ee0f7e.01bf88","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1733,"y":713,"z":"d1447f06.01b7f","wires":[["60344461.6714d4","5bb21711.d63b1","f7dd993b.b754a"]]},{"id":"f7dd993b.b754a","type":"set","name":"set MACADDRESS tmp.txconcs...brg-wan-mac-address","xml":"<set>\n<parameter name='tmp.brg-macaddress' \n      value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.brg-wan-mac-address`' />\n\n","comments":"","x":2051,"y":667,"z":"d1447f06.01b7f","wires":[]},{"id":"6d08e5de.b49f9c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":257,"y":757,"z":"d1447f06.01b7f","wires":[["8fa522a5.35575"]]},{"id":"d71a16e.28b1f68","type":"returnFailure","name":"return failure Did not find vGW Preload","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='Did not find vGW Preload' />\n","comments":"","x":515,"y":923,"z":"d1447f06.01b7f","wires":[]},{"id":"8fa522a5.35575","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":269,"y":835,"z":"d1447f06.01b7f","wires":[["d71a16e.28b1f68","abacc0f3.a3d4c8"]]},{"id":"abacc0f3.a3d4c8","type":"execute","name":"execute print context","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/bdf-gw-vfmodule.failure.log' />\n","comments":"","outputs":1,"x":465,"y":872,"z":"d1447f06.01b7f","wires":[[]]}]
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 5109fdd5..9f49fbeb 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
@@ -1,415 +1,337 @@
-<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-    <method rpc='brg-topology-operation-activate' mode='sync'>
-        <block atomic="true">
-            <set>
-                <parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-                <parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
-                <parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />
-            </set>
-            <set>
-                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/' + $tmp.ar.allotted-resource-id + '/allotted-resource-data/brg-topology/'` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.brg-allottedresource`"/>
-                <parameter name="outputPath" value="tmp.ar-url"/>
-                <parameter name="target" value="{allotted-resource-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='GET' />
-                <parameter name="responsePrefix" value="mdsal-ar" />
-                <outcome value='success'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name='bk-brg-ar' value='$mdsal-ar.' />
-                        </set>
-                        <switch test='`$mdsal-ar.brg-allotted-resource_length`'>
-                            <outcome value='1'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />
-                                    </set>
-                                    <switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
-                                        <outcome value='Created'>
-                                            <block></block>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <block></block>
-                                        </outcome>
-                                    </switch>
-                                    <set>
-                                        <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
-                                        <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />
-                                        <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
-                                    </set>
-                                </block>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true"></block>
-                </outcome>
-            </execute>
-            <set>
-                <parameter name='brg-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-                <parameter name='brg-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />
-                <parameter name='brg-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />
-                <parameter name='brg-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />
-                <parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />
-                <parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />
-                <parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />
-                <parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />
-                <parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
-                <parameter name="outputPath" value="tmp.current-time" />
-            </execute>
-            <set>
-                <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />
-                <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />
-                <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />
-                <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />
-                <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-            </set>
-            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                    resource="allotted-resource"
-                    key="customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND service-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND service-instance.service-instance-id = $brg-topology-operation-input.service-information.service-instance-id AND allotted-resource.id = $tmp.ar.allotted-resource-id"
-                    pfx='pfx' local-only='false' force='false'>
-                <parameter name="operational-status" value="in-service-path" />
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="AAI failed" />
-                    </return>
-                </outcome>
-            </update>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`" />
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='PUT' />
-                <parameter name="responsePrefix" value="mdsal-ar" />
-                <outcome value='success'>
-                    <block></block>
-                </outcome>
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
-                    </return>
-                </outcome>
-            </execute>
-            <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-tunnelxconn-ar' mode='sync' ></call>
-            <set>
-                <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.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"/>
-                <parameter name="target" value="{honeycomb-instance-ip}"/>
-                <parameter name="replacement" value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip`"/>
-            </execute>
-            <set>
-                <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip` " />
-                <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' >
-                <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 setting up vxlan tunnel" />
-                    </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 setting up vxlan tunnel" />
-                    </return>
-                </outcome>
-            </execute>
-            <set>
-                <parameter name='tmp.bridge-domain' value="bridge-domain-10" />
-                <parameter name='tmp.split-horizon-group' value="2" />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.bridge-domain.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 setting up bridge domain" />
-                    </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 setting up bridge domain" />
-                    </return>
-                </outcome>
-            </execute>
-            <set>
-                <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />
-            </set>
-            <set>
-                <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`' />
-            </set>
-            <set>
-                <parameter name='tmp.search.consuming-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />
-            </set>
-            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services' pfx='tmp.servicedata' >
-                <outcome value='success'>
-                    <for index='serviceidx' start='0' end='`$tmp.servicedata.services.service_length`' >
-                        <switch test='`$tmp.servicedata.services.service[$serviceidx].service-instance-id == $tmp.search.consuming-service-instance-id`'>
-                            <outcome value='true'>
-                                <for index='vnfidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf_length`' >
-                                    <for index='vfmoduleidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >
-                                        <for index='paramidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >
-                                            <switch test='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].name == vgw_private_ip_1`'>
-                                                <outcome value='true'>
-                                                    <set>
-                                                        <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip' value='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].value`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                        </for>
-                                    </for>
-                                </for>
-                            </outcome>
-                        </switch>
-                    </for>
-                </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 getting GENERIC-RESOURCE-API:services" />
-                    </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 getting GENERIC-RESOURCE-API:services" />
-                    </return>
-                </outcome>
-            </get-resource>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.honeycomb.url`"/>
-                <parameter name="outputPath" value="tmp.honeycomb.url"/>
-                <parameter name="target" value="{honeycomb-instance-ip}"/>
-                <parameter name="replacement" value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip`"/>
-            </execute>
-            <set>
-                <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` " />
-                <parameter name='tmp.tunnel-dest-ip' value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` " />
-                <parameter name='tmp.tunnel-src-ip' value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-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 setting up vxlan tunnel" />
-                    </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 setting up vxlan tunnel" />
-                    </return>
-                </outcome>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.bridge-domain.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 setting up bridge domain" />
-                    </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 setting up bridge domain" />
-                    </return>
-                </outcome>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.vnf-api.service-information`"/>
-                <parameter name="outputPath" value="tmp.vnf-api-url"/>
-                <parameter name="target" value="{vnf-id}"/>
-                <parameter name="replacement" value="`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.vnf-api-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='GET' />
-                <parameter name="responsePrefix" value="service-data" />
-                <outcome value='success'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name='bk-service-data' value='$service-data.' />
-                        </set>
-                        <switch test='`$service-data.service-data_length`'>
-                            <outcome value='1'>
-                                <block atomic='true'>
-                                    <set>
-                                        <parameter name='tmp.service-data.' value='$service-data.service-data[0].' />
-                                    </set>
-                                    <switch test='`$tmp.service-data.order-status`'>
-                                        <outcome value='Created'>
-                                            <block></block>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <block></block>
-                                        </outcome>
-                                    </switch>
-                                </block>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true"></block>
-                </outcome>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.services`"/>
-                <parameter name="outputPath" value="tmp.services-url"/>
-                <parameter name="target" value="{service-instance-id}"/>
-                <parameter name="replacement" value="`$tmp.service-data.service-information.service-instance-id`"/>
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.services.templatefile`" />
-                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.services-url`' />
-                <parameter name='restapiUser' value='`$prop.controller.user`' />
-                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                <parameter name='format' value='json' />
-                <parameter name='httpMethod' value='PUT' />
-                <parameter name="responsePrefix" value="mdsal-ar" />
-                <outcome value='success'>
-                    <block></block>
-                </outcome>
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
-                    </return>
-                </outcome>
-                <outcome value='not-found'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
-                    </return>
-                </outcome>
-            </execute>
-            <set>
-                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-                <parameter name='brg-object-path' value="`$tmp.ar.self-link`"/>
-                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $brg-topology-operation-input.service-information.service-instance-id + '/service-data/service-topology/'`"/>
-            </set>
-            <return status='success'>
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
+<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'><method rpc='brg-topology-operation-activate' mode='sync'>
+<block atomic="true"><set>
+<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
+<!--
+<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />
+-->
+
+</set><block atomic="true"><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs' pfx='tmp.vnfdata' >
+</get-resource><for index='vnfidx' start='0' end='`$tmp.vnfdata.vnfs.vnf-list_length`' >
+
+
+<switch test='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.service-information.service-instance-id == $tmp.ar.parent-service-instance-id`'>
+
+
+<outcome value='true'>
+<block>
+<set>
+<parameter name='tmp.ar.brg-vnf-id' 
+   value='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].vnf-id`' />
+
+
+
+</set></block></outcome></switch></for></block><set>
+<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'
+ + $tmp.ar.allotted-resource-id
+ + '/allotted-resource-data/brg-topology/'` " />
+
+</set><execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+    <parameter name='contextPrefix' value='prop' />
+</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+    <parameter name="source" value="`$prop.restapi.brg-allottedresource`"/>
+    <parameter name="outputPath" value="tmp.ar-url"/>
+    <parameter name="target" value="{allotted-resource-id}"/>
+    <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+</execute><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+    <parameter name='restapiUser' value='`$prop.controller.user`' />
+    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+    <parameter name='format' value='json' />
+    <parameter name='httpMethod' value='GET' />
+    <parameter name="responsePrefix" value="mdsal-ar" />
+
+<outcome value='success'>
+<block atomic="true">
+<set>
+<parameter name='bk-brg-ar' value='$mdsal-ar.' />
+</set><switch test='`$mdsal-ar.brg-allotted-resource_length`'>
+<outcome value='1'>
+<block atomic='true'>
+<set>
+<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />
+</set><switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
+<outcome value='Created'>
+<block>
+</block></outcome><outcome value='Other'>
+<block>
+</block></outcome></switch><set>
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
+
+</set></block></outcome></switch></block></outcome><outcome value='Other'>
+<block atomic="true">
+</block></outcome></execute><set>
+<parameter name='brg-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+<parameter name='brg-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />
+<parameter name='brg-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />
+<parameter name='brg-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+    <parameter name="outputPath" value="tmp.current-time" />
+
+</execute><set>
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+</set><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource" 
+		key="customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $brg-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+			allotted-resource.id = $tmp.ar.allotted-resource-id"
+        pfx='pfx' local-only='false' force='false'>
+	<parameter name="operational-status" value="in-service-path" />
+<outcome value='failure'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="AAI failed" />
+</return></outcome><outcome value='not-found'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="AAI failed" />
+</return></outcome></update><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`" />
+    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+    <parameter name='restapiUser' value='`$prop.controller.user`' />
+    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+    <parameter name='format' value='json' />
+    <parameter name='httpMethod' value='PUT' />
+    <parameter name="responsePrefix" value="mdsal-ar" />
+
+<outcome value='success'>
+<block>
+</block></outcome><outcome value='failure'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+</return></outcome><outcome value='not-found'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+</return></outcome></execute><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='`$brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />
+</set><call module='GENERIC-RESOURCE-API' rpc='get-tunnelxconn-ar' mode='sync' >
+</call><set>
+<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.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"/>
+    <parameter name="target" value="{honeycomb-instance-ip}"/>
+    <parameter name="replacement" value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip`"/>
+</execute><set>
+<parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip` " />
+<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' >
+    <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 setting up vxlan tunnel" />
+</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 setting up vxlan tunnel" />
+</return></outcome></execute><set>
+<parameter name='tmp.bridge-domain' value="bridge-domain-10" />
+<parameter name='tmp.split-horizon-group' value="2" /></set><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.bridge-domain.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 setting up bridge domain" />
+</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 setting up bridge domain" />
+</return></outcome></execute><set>
+<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />
+</set><set>
+<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`' />
+</set><set>
+<parameter name='tmp.search.consuming-service-instance-id' value='`$brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />
+																	</set><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='preload-vnfs' pfx='tmp.preloadvnfdata' >
+<!--
+tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[1].preload-data[0].vnf-topology-information.vnf-parameters[16].vnf-parameter-value = 10.0.101.30
+--><outcome value='success'>
+<block>
+<set>
+<parameter name='tmp.brg-match-vnf-name' value="`'VGW2BRG-'+ $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-mac-address`" />
+
+</set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+<parameter name='filename' value='/var/tmp/brg-topo-op-activate.log' />
+</execute><for index='vnfidx' start='0' end='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list_length`' >
+                               
+
+
+<block>
+<switch test='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].vnf-name == $tmp.brg-match-vnf-name`'>
+
+
+<outcome value='true'>
+<for index='paramidx' start='0' end='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters_length`' >
+
+
+<switch test="`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$paramidx].vnf-parameter-name == 'vgw_private_ip_1'`" >
+
+
+<outcome value='true'>
+<set>
+<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip'
+ value="`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$paramidx].vnf-parameter-value`" />
+
+</set></outcome></switch></for></outcome></switch></block></for></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 getting GENERIC-RESOURCE-API:services" />
+</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 getting GENERIC-RESOURCE-API:services" />
+</return></outcome></get-resource><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+    <parameter name="source" value="`$prop.honeycomb.url`"/>
+    <parameter name="outputPath" value="tmp.honeycomb.url"/>
+    <parameter name="target" value="{honeycomb-instance-ip}"/>
+    <parameter name="replacement" value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip`"/>
+</execute><set>
+<parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` " />
+<parameter name='tmp.tunnel-dest-ip' value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` " />
+<parameter name='tmp.tunnel-src-ip' value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-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.core.slipluginutils.SliStringUtils' method='replace' >
+    <parameter name="source" value="`$prop.restapi.vnf-api.service-information`"/>
+    <parameter name="outputPath" value="tmp.vnf-api-url"/>
+    <parameter name="target" value="{vnf-id}"/>
+    <parameter name="replacement" value="`$tmp.ar.brg-vnf-id`"/>
+
+   <!-- 
+   <parameter name="replacement" value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`"/>
+ -->
+    <!--
+    <parameter name="replacement" value="`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`"/>
+-->
+<!--
+brg-ar.allotted-resource-data.brg-topology.brg-assignments
+--></execute><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.vnf-api-url`' />
+    <parameter name='restapiUser' value='`$prop.controller.user`' />
+    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+    <parameter name='format' value='json' />
+    <parameter name='httpMethod' value='GET' />
+    <parameter name="responsePrefix" value="service-data" />
+
+<outcome value='success'>
+<block atomic="true">
+<set>
+<parameter name='bk-service-data' value='$service-data.' />
+</set><switch test='`$service-data.service-data_length`'>
+<outcome value='1'>
+<block atomic='true'>
+<set>
+<parameter name='tmp.service-data.' value='$service-data.service-data[0].' />
+</set><switch test='`$tmp.service-data.order-status`'>
+<outcome value='Created'>
+<block>
+</block></outcome><outcome value='Other'>
+<block>
+</block></outcome></switch></block></outcome></switch></block></outcome><outcome value='Other'>
+<block atomic="true">
+</block></outcome></execute><set>
+<parameter name='tmp.service-data.service-information.service-instance-id' value='`$brg-topology-operation-input.service-information.service-instance-id`' />
+</set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+    <parameter name="source" value="`$prop.restapi.services`"/>
+    <parameter name="outputPath" value="tmp.services-url"/>
+    <parameter name="target" value="{service-instance-id}"/>
+    <parameter name="replacement" value="`$tmp.service-data.service-information.service-instance-id`"/>
+<!--  tmp.service-data.service-information.service-instance-id
+brg-topology-operation-input.allotted-resource-information.parent-service-instance-id
+brg-topology-operation-input.service-information.service-instance-id
+
+--></execute><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.services.templatefile`" />
+    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.services-url`' />
+    <parameter name='restapiUser' value='`$prop.controller.user`' />
+    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+    <parameter name='format' value='json' />
+    <parameter name='httpMethod' value='PUT' />
+    <parameter name="responsePrefix" value="mdsal-ar" />
+
+<outcome value='success'>
+<block>
+</block></outcome><outcome value='failure'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+</return></outcome><outcome value='not-found'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+</return></outcome></execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+<parameter name='filename' value='/var/tmp/brg-topo-op-activate.log' />
+</execute><set>
+<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+<parameter name='brg-object-path' value="`$tmp.ar.self-link`"/>
+<parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $tmp.service-data.service-information.service-instance-id
+ + '/service-data/service-topology/'`"/>
+ 
+ <!--
+brg-topology-operation-input.allotted-resource-information.parent-service-instance-id
+ 
+ brg-topology-operation-input.service-information.service-instance-id
+ -->
+</set><return status='success'>
+<parameter name="ack-final-indicator" value="Y" />
+<parameter name="error-code" value="200" />
+<parameter name="error-message" value="`$error-message`" />
+</return></block></method></service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
index fdd868d2..21f0efb4 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
@@ -1,287 +1,227 @@
-<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-    <method rpc='brg-topology-operation-assign' mode='sync'>
-        <block atomic="true">
-            <set>
-                <parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-                <parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
-            </set>
-            <set>
-                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/' + $tmp.ar.allotted-resource-id + '/allotted-resource-data/tunnelxconn-topology/'` " />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$prop.restapi.brg-allottedresource`"/>
-                <parameter name="outputPath" value="tmp.ar-url"/>
-                <parameter name="target" value="{allotted-resource-id}"/>
-                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-            </execute>
-            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='brg-allotted-resources/brg-allotted-resource/$brg-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >
-                <outcome value='success'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message"
-                                   value="`'Existing brg-allotted-resource with order status of ' + $mdsal-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
-                    </return>
-                </outcome>
-                <outcome value='Other'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name='brg-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-                            <parameter name='brg-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />
-                            <parameter name='brg-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />
-                            <parameter name='brg-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />
-                            <parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />
-                            <parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />
-                            <parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />
-                            <parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />
-                            <parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " />
-                        </set>
-                        <set>
-                            <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
-                            <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />
-                            <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
-                        </set>
-                        <set>
-                            <parameter name='brg-ar-identifiers.consuming-service-instance-id' value="`$brg-topology-operation-input.service-information.service-instance-id` " />
-                            <parameter name='brg-ar-identifiers.parent-service-instance-id' value="`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-                            <parameter name='brg-ar-identifiers.allotted-resource-type' value="`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
-                            <parameter name='brg-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-                        </set>
-                        <set>
-                            <parameter name='tx-ar.allotted-resource-data.brg-topology.onap-model-information.'
-                                       value="`$brg-topology-operation-input.allotted-resource-information.onap-model-information.`" />
-                        </set>
-                        <switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>
-                            <outcome value=''>
-                                <set>
-                                    <parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-invariant-uuid'
-                                               value="`$ar-model.invariant-uuid`" />
-                                </set>
-                            </outcome>
-                        </switch>
-                        <switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>
-                            <outcome value=''>
-                                <set>
-                                    <parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-uuid'
-                                               value="`$ar-model.uuid`" />
-                                </set>
-                            </outcome>
-                        </switch>
-                        <switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>
-                            <outcome value=''>
-                                <set>
-                                    <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version'
-                                               value="`$ar-model.version`" />
-                                </set>
-                            </outcome>
-                        </switch>
-                        <switch test='`$ar-model.ecomp-generated-naming`'>
-                            <outcome value='Y'>
-                                <block atomic="true">
-                                    <switch test='`$ar-model.naming-policy`'>
-                                        <outcome value='oam_network_policy'>
-                                            <block atomic='true'>
-                                                <set>
-                                                    <parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />
-                                                </set>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                    <parameter name="source" value="`$tmp.ar-name`"/>
-                                                    <parameter name="outputPath" value="tmp.ar-name"/>
-                                                    <parameter name="target" value="$TenantOAMNetworkRole"/>
-                                                    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`"/>
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                    <parameter name="source" value="`$tmp.ar-name`"/>
-                                                    <parameter name="outputPath" value="tmp.ar-name"/>
-                                                    <parameter name="target" value="$LandingNetworkRole"/>
-                                                    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`"/>
-                                                </execute>
-                                                <set>
-                                                    <parameter name='brg-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />
-                                                </set>
-                                            </block>
-                                        </outcome>
-                                        <outcome value='Other'>
-                                            <block atomic='true'>
-                                                <set>
-                                                    <parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />
-                                                </set>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                    <parameter name="source" value="`$tmp.ar-name`"/>
-                                                    <parameter name="outputPath" value="tmp.ar-name"/>
-                                                    <parameter name="target" value="$TenantOAMNetworkRole"/>
-                                                    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`"/>
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                    <parameter name="source" value="`$tmp.ar-name`"/>
-                                                    <parameter name="outputPath" value="tmp.ar-name"/>
-                                                    <parameter name="target" value="$LandingNetworkRole"/>
-                                                    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`"/>
-                                                </execute>
-                                                <set>
-                                                    <parameter name='brg-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />
-                                                </set>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </block>
-                            </outcome>
-                            <outcome value='Other'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="Error in allotted-resource-model data.  Ecomp-generated-naming should be true" />
-                                </return>
-                            </outcome>
-                        </switch>
-                        <set>
-                            <parameter name='brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.'
-                                       value="`$brg-ar-identifiers.`" />
-                        </set>
-                        <set>
-                            <parameter name='brg-ar-assignments.vbrg-wan-ip' value='127.0.0.1'/>
-                        </set>
-                        <set>
-                            <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.'
-                                       value="`$brg-ar-assignments.`" />
-                        </set>
-                        <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
-                            <outcome value=''>
-                                <set>
-                                    <parameter name='tmp.cidx' value="`0`" />
-                                    <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" />
-                                </set>
-                            </outcome>
-                            <outcome value='Other'>
-                                <block atomic="true">
-                                    <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
-                                        <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-                                            <outcome value='true'>
-                                                <block atomic="true">
-                                                    <set>
-                                                        <parameter name='tmp.cidx' value='`$cidx`' />
-                                                        <parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />
-                                                        <parameter name='tmp.found-cidx' value='true' />
-                                                    </set>
-                                                    <break></break>
-                                                </block>
-                                            </outcome>
-                                        </switch>
-                                    </for>
-                                    <switch test='`$tmp.found-cidx`'>
-                                        <outcome value='false'>
-                                            <block atomic="true">
-                                                <set>
-                                                    <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
-                                                </set>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                </block>
-                            </outcome>
-                        </switch>
-                        <set>
-                            <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-                            <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value="`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
-                            <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " />
-                            <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />
-                        </set>
-                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
-                            <parameter name="outputPath" value="tmp.current-time" />
-                        </execute>
-                        <set>
-                            <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />
-                            <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />
-                            <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />
-                            <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />
-                            <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-                        </set>
-                        <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                resource="allotted-resource"
-                                key="customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND service-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND service-instance.service-instance-id = $brg-topology-operation-input.service-information.service-instance-id AND allotted-resource.id = $tmp.ar.allotted-resource-id"
-                                pfx='pfx' local-only='false' force='false'>
-                            <parameter name="description" value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
-                            <parameter name="selflink" value="`$tmp.ar.self-link`" />
-                            <parameter name="model-invariant-id" value="`$ar-model.invariant-uuid`" />
-                            <parameter name="model-version-id" value="`$ar-model.uuid`" />
-                            <parameter name="operational-status" value="null" />
-                            <outcome value='failure'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="AAI failed" />
-                                </return>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="AAI failed" />
-                                </return>
-                            </outcome>
-                        </update>
-                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`" />
-                            <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-                            <parameter name='restapiUser' value='`$prop.controller.user`' />
-                            <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                            <parameter name='format' value='json' />
-                            <parameter name='httpMethod' value='PUT' />
-                            <parameter name="responsePrefix" value="mdsal-ar" />
-                            <outcome value='success'>
-                                <block>
-                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                        <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
-                                        <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />
-                                        <parameter name='restapiUser' value='`$prop.controller.user`' />
-                                        <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-                                        <parameter name='format' value='json' />
-                                        <parameter name='httpMethod' value='DELETE' />
-                                        <parameter name="responsePrefix" value="parent" />
-                                        <outcome value='success'>
-                                            <block></block>
-                                        </outcome>
-                                        <outcome value='failure'>
-                                            <block></block>
-                                        </outcome>
-                                        <outcome value='not-found'>
-                                            <block></block>
-                                        </outcome>
-                                    </execute>
-                                </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 tunnelxconn-allotted-resource" />
-                                </return>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <return status='failure'>
-                                    <parameter name='ack-final' value='Y'/>
-                                    <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="Error updating md-sal for tunnelxconn-allotted-resource" />
-                                </return>
-                            </outcome>
-                        </execute>
-                        <set>
-                            <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-                            <parameter name='tunnelxconn-object-path' value="`$tmp.ar.self-link`"/>
-                            <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $brg-topology-operation-input.service-information.service-instance-id + '/service-data/service-topology/'`"/>
-                        </set>
-                        <return status='success'>
-                            <parameter name="ack-final-indicator" value="Y" />
-                            <parameter name="error-code" value="200" />
-                            <parameter name="error-message" value="`$error-message`" />
-                        </return>
-                    </block>
-                </outcome>
-            </get-resource>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
+<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'><method rpc='brg-topology-operation-assign' mode='sync'>
+<block atomic="true"><set>
+<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
+
+
+</set><set>
+<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'
+ + $tmp.ar.allotted-resource-id
+ + '/allotted-resource-data/tunnelxconn-topology/'` " />
+
+</set><execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+    <parameter name='contextPrefix' value='prop' />
+</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+    <parameter name="source" value="`$prop.restapi.brg-allottedresource`"/>
+    <parameter name="outputPath" value="tmp.ar-url"/>
+    <parameter name="target" value="{allotted-resource-id}"/>
+    <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='brg-allotted-resources/brg-allotted-resource/$brg-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >
+<outcome value='Other'>
+<block atomic="true">
+<set>
+<parameter name='brg-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+<parameter name='brg-ar.allotted-resource-status.action' value="`$brg-topology-operation-input.request-information.request-action` " />
+<parameter name='brg-ar.allotted-resource-status.rpc-name' value="brg-topology-operation" />
+<parameter name='brg-ar.allotted-resource-status.rpc-action' value="`$brg-topology-operation-input.sdnc-request-header.svc-action` " />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$brg-topology-operation-input.request-information.` " />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$brg-topology-operation-input.sdnc-request-header.` " />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$brg-topology-operation-input.service-information.` " />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$brg-topology-operation-input.allotted-resource-information.` " />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value="`$brg-topology-operation-input.brg-request-input.` " /></set><set>
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
+
+</set><set>
+<parameter name='brg-ar-identifiers.consuming-service-instance-id' value="`$brg-topology-operation-input.service-information.service-instance-id` " />
+<parameter name='brg-ar-identifiers.parent-service-instance-id' value="`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+<parameter name='brg-ar-identifiers.allotted-resource-type' value="`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+<parameter name='brg-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+
+</set><set>
+<parameter name='tx-ar.allotted-resource-data.brg-topology.onap-model-information.' 
+value="`$brg-topology-operation-input.allotted-resource-information.onap-model-information.`" />
+
+
+</set><switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>
+<outcome value=''>
+<set>
+<parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-invariant-uuid' 
+value="`$ar-model.invariant-uuid`" />
+
+
+</set></outcome></switch><switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>
+<outcome value=''>
+<set>
+<parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-uuid' 
+value="`$ar-model.uuid`" />
+
+
+</set></outcome></switch><switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>
+<outcome value=''>
+<set>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version' 
+value="`$ar-model.version`" />
+
+
+</set></outcome></switch><switch test='`$ar-model.ecomp-generated-naming`'>
+<outcome value='Y'>
+<block atomic="true">
+<switch test='`$ar-model.naming-policy`'>
+<outcome value='oam_network_policy'>
+<block atomic='true'>
+<set>
+<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />
+</set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+    <parameter name="source" value="`$tmp.ar-name`"/>
+    <parameter name="outputPath" value="tmp.ar-name"/>
+    <parameter name="target" value="$TenantOAMNetworkRole"/>
+    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`"/>
+
+</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+    <parameter name="source" value="`$tmp.ar-name`"/>
+    <parameter name="outputPath" value="tmp.ar-name"/>
+    <parameter name="target" value="$LandingNetworkRole"/>
+    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`"/>
+
+</execute><set>
+<parameter name='brg-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />
+</set></block></outcome><outcome value='Other'>
+<block atomic='true'>
+<set>
+<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />
+</set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+    <parameter name="source" value="`$tmp.ar-name`"/>
+    <parameter name="outputPath" value="tmp.ar-name"/>
+    <parameter name="target" value="$TenantOAMNetworkRole"/>
+    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`"/>
+
+</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+    <parameter name="source" value="`$tmp.ar-name`"/>
+    <parameter name="outputPath" value="tmp.ar-name"/>
+    <parameter name="target" value="$LandingNetworkRole"/>
+    <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`"/>
+
+</execute><set>
+<parameter name='brg-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />
+</set></block></outcome></switch></block></outcome><outcome value='Other'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="Error in allotted-resource-model data.  Ecomp-generated-naming should be true" />
+
+</return></outcome></switch><set>
+<parameter name='brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.' 
+value="`$brg-ar-identifiers.`" />
+
+
+</set><set>
+<parameter name='brg-ar-assignments.vbrg-wan-ip' value='127.0.0.1'/>
+</set><set>
+<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.' 
+value="`$brg-ar-assignments.`" />
+
+
+</set><switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
+<outcome value=''>
+<set>
+<parameter name='tmp.cidx' value="`0`" />
+<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" />
+
+
+</set></outcome><outcome value='Other'>
+<block atomic="true"><for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
+<switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+
+<outcome value='true'>
+<block atomic="true"><set>
+<parameter name='tmp.cidx' value='`$cidx`' />
+<parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />
+<parameter name='tmp.found-cidx' value='true' /></set><break></break></block></outcome></switch></for><switch test='`$tmp.found-cidx`'>
+<outcome value='false'>
+<block atomic="true"><set>
+<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
+</set></block></outcome></switch></block></outcome></switch><set>
+<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value="`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " />
+<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />
+
+</set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+    <parameter name="outputPath" value="tmp.current-time" />
+
+</execute><set>
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />
+<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+</set><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource" 
+		key="customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $brg-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+			allotted-resource.id = $tmp.ar.allotted-resource-id"
+        pfx='pfx' local-only='false' force='false'>
+	<parameter name="description" value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
+	<parameter name="selflink" value="`$tmp.ar.self-link`" />
+	<parameter name="model-invariant-id" value="`$ar-model.invariant-uuid`" />
+	<parameter name="model-version-id" value="`$ar-model.uuid`" />
+	<parameter name="operational-status" value="null" />
+<outcome value='failure'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="AAI failed" />
+</return></outcome><outcome value='not-found'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="AAI failed" />
+</return></outcome></update><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.brg.templatefile`" />
+    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+    <parameter name='restapiUser' value='`$prop.controller.user`' />
+    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+    <parameter name='format' value='json' />
+    <parameter name='httpMethod' value='PUT' />
+    <parameter name="responsePrefix" value="mdsal-ar" />
+
+<outcome value='success'>
+<block>
+<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
+    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />
+    <parameter name='restapiUser' value='`$prop.controller.user`' />
+    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+    <parameter name='format' value='json' />
+    <parameter name='httpMethod' value='DELETE' />
+    <parameter name="responsePrefix" value="parent" />
+
+<outcome value='success'>
+<block></block></outcome><outcome value='failure'>
+<block></block></outcome><outcome value='not-found'>
+<block></block></outcome></execute></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 tunnelxconn-allotted-resource" />
+</return></outcome><outcome value='not-found'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="Error updating md-sal for tunnelxconn-allotted-resource" />
+</return></outcome></execute><set>
+<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+<parameter name='tunnelxconn-object-path' value="`$tmp.ar.self-link`"/>
+<parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $brg-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'`"/>
+ 
+</set><return status='success'>
+<parameter name="ack-final-indicator" value="Y" />
+<parameter name="error-code" value="200" />
+<parameter name="error-message" value="`$error-message`" />
+</return></block></outcome></get-resource></block></method></service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml
index f74ec8e3..be34b3bf 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-tunnelxconn-ar.xml
@@ -1,18 +1,17 @@
-<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-tunnelxconn-ar' 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.tunnelxconn-ar.' value='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$tunnelidx].`' />
-                            </set>
-                        </block>
-                    </outcome>
-                </switch>
-            </for>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
+<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-tunnelxconn-ar' 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`' >
+
+
+<block>
+<set>
+<parameter name='tmp.printout.consuming-service-instance-id' value='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$tunnelidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id`' />
+<parameter name='tmp.printout.index' value='`$tunnelidx`' />
+</set><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.tunnelxconn-ar.' value='`$tmp.tunnel-ar.data.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$tunnelidx].`' />
+</set></block></outcome></switch></block></for></block></method></service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml
index 8109b945..27c49fce 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml
@@ -1,6 +1,16 @@
 <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='gw-vfmodule-update' mode='sync'>
 <block>
 <set>
+<!--
+<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />
+<parameter name='tmp.brg-mac-address-match' value="`'VGW2BRG-' + $tmp.brg-macaddress`"/>
+
+<parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />
+service-data.service-topology.service-topology-identifier.service-instance-id
+
+-->
+<parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />
+</set><set>
 <parameter name='tmp.thisIsVGW' value='false' />
 </set><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API'    
          key='tunnelxconn-allotted-resources/' pfx='tmp.txconns' >
@@ -102,4 +112,11 @@ service-data.service-topology.service-topology-identifier.service-instance-id
 <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.'
    value='$tmp.vfmodule.' /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
 <parameter name='filename' value='/var/tmp/bdf-gw-vfmodule.log' />
-</execute></block></outcome></switch></block></for></block></outcome></switch></block></method></service-logic>
+</execute></block></outcome></switch></block></for></block></outcome><outcome value='Other'>
+<block>
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+<parameter name='filename' value='/var/tmp/bdf-gw-vfmodule.failure.log' />
+</execute><return status='failure'>
+<parameter name='error-code' value='500' />
+<parameter name='error-message' value='Did not find vGW Preload' />
+</return></block></outcome></switch></block></method></service-logic>
-- 
2.16.6