Fix brg-topo DGs

1. Added get vg-mgmt-ip in brg-topo-activate
so that vg tunnel could be properple setup

2. Added get vbrg-wan-ip to brg-topo-deactivate
so that vxlan tunnels can be removed

3. Updated AA&I updates calls to include
correct brg variables for global-customer-id,
service-type and service-instance-id

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

Former-commit-id: becd9978df3428354646a48c2d106177f6477695

1 files changed, 414 insertions, 414 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-assign.json
index 0fa18c02..e0c246b3 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,20 +1,20 @@
 [
   {
-    "id":"447755b1.5a154c",
+    "id":"e5ee9a68.8f74a8",
     "type":"dgstart",
     "name":"DGSTART",
     "outputs":1,
-    "x":275,
-    "y":195,
-    "z":"d3629202.0e9a9",
+    "x":125,
+    "y":52.5,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "66bfcde5.5d96c4"
+        "393cc04a.70965"
       ]
     ]
   },
   {
-    "id":"66bfcde5.5d96c4",
+    "id":"393cc04a.70965",
     "type":"service-logic",
     "name":"GENERIC-RESOURCE-API ${project.version}",
     "module":"GENERIC-RESOURCE-API",
@@ -22,602 +22,602 @@
     "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":371.2380790710449,
-    "y":255.95239067077637,
-    "z":"d3629202.0e9a9",
+    "x":221.23807907104492,
+    "y":113.45239067077637,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "2dfe1c17.827494"
+        "8d790a6c.626248"
       ]
     ]
   },
   {
-    "id":"2dfe1c17.827494",
+    "id":"8d790a6c.626248",
     "type":"method",
     "name":"brg-topology-operation-assign",
     "xml":"<method rpc='brg-topology-operation-assign' mode='sync'>\n",
     "comments":"",
     "outputs":1,
-    "x":417.15485763549805,
-    "y":291.1904458999634,
-    "z":"d3629202.0e9a9",
+    "x":267.15485763549805,
+    "y":148.69044589996338,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "8e0c81af.52e65"
+        "709e013b.ec7ed"
       ]
     ]
   },
   {
-    "id":"8e0c81af.52e65",
+    "id":"709e013b.ec7ed",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":325.47619247436523,
-    "y":434.5237879753113,
-    "z":"d3629202.0e9a9",
+    "x":175.47619247436523,
+    "y":292.0237879753113,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "28efce96.95a252",
-        "74f2d05d.d128",
-        "b05fdf22.36f2",
-        "3df4d53c.54c6ca",
-        "c8732493.f72838"
+        "5341126d.beb3cc",
+        "18e0684.02efa98",
+        "3d25a078.5fbfa",
+        "4f907ab1.9b90b4",
+        "8f923afe.9146b8"
       ]
     ]
   },
   {
-    "id":"2755b2a9.79da1e",
+    "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":1168.6666564941406,
-    "y":2361.5477046966553,
-    "z":"d3629202.0e9a9",
+    "x":1018.6666564941406,
+    "y":2219.0477046966553,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"12aa04eb.1fdf1b",
+    "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":1205.7540550231934,
-    "y":2240.432439804077,
-    "z":"d3629202.0e9a9",
+    "x":1055.7540550231934,
+    "y":2097.932439804077,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"9736c0da.28d34",
+    "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":1277.468376159668,
-    "y":1657.6228160858154,
-    "z":"d3629202.0e9a9",
+    "x":1127.468376159668,
+    "y":1515.1228160858154,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"74f2d05d.d128",
+    "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":755.7380676269531,
-    "y":326.33331298828125,
-    "z":"d3629202.0e9a9",
+    "x":605.7380676269531,
+    "y":183.83331298828125,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"28efce96.95a252",
+    "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":808.997314453125,
-    "y":288.59259033203125,
-    "z":"d3629202.0e9a9",
+    "x":658.997314453125,
+    "y":146.09259033203125,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"b6562205.a7488",
+    "id":"2eb376c7.9249fa",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":958.8148803710938,
-    "y":474.26727294921875,
-    "z":"d3629202.0e9a9",
+    "x":808.8148803710938,
+    "y":331.76727294921875,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "af1477fd.c2ef48"
+        "bfb84d8.6226eb"
       ]
     ]
   },
   {
-    "id":"72e34d2d.88e074",
+    "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":1298.8626251220703,
-    "y":1882.1008231639862,
-    "z":"d3629202.0e9a9",
+    "x":1148.8626251220703,
+    "y":1739.6008231639862,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "d589ef8a.4b767",
-        "6a9fa011.f03d8",
-        "851f57de.ccd048"
+        "567616cd.4d0bc8",
+        "34674551.1ef96a",
+        "c49baabf.6ac098"
       ]
     ]
   },
   {
-    "id":"d589ef8a.4b767",
+    "id":"567616cd.4d0bc8",
     "type":"not-found",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":1567.5040016174316,
-    "y":1933.4322349056602,
-    "z":"d3629202.0e9a9",
+    "x":1417.5040016174316,
+    "y":1790.9322349056602,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "e12a7d91.5e076"
+        "1afb211c.3db5af"
       ]
     ]
   },
   {
-    "id":"6a9fa011.f03d8",
+    "id":"34674551.1ef96a",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":1558.504051208496,
-    "y":1901.9322606548667,
-    "z":"d3629202.0e9a9",
+    "x":1408.504051208496,
+    "y":1759.4322606548667,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "e12a7d91.5e076"
+        "1afb211c.3db5af"
       ]
     ]
   },
   {
-    "id":"851f57de.ccd048",
+    "id":"c49baabf.6ac098",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":1562.2540893554688,
-    "y":1872.289365530014,
-    "z":"d3629202.0e9a9",
+    "x":1412.2540893554688,
+    "y":1729.789365530014,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "92379d68.800b2"
+        "24c4fc44.bfefd4"
       ]
     ]
   },
   {
-    "id":"e12a7d91.5e076",
+    "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":1728.2540893554688,
-    "y":1902.6822844967246,
-    "z":"d3629202.0e9a9",
+    "x":1578.2540893554688,
+    "y":1760.1822844967246,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"fe3888af.6a0dc8",
+    "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":1308.5294189453125,
-    "y":575.0529174804688,
-    "z":"d3629202.0e9a9",
+    "x":1158.5294189453125,
+    "y":432.55291748046875,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"3526b3c4.21b13c",
+    "id":"23613fee.e7e3c",
     "type":"comment",
     "name":"Save consumed-allotted-resources to mdsal",
     "info":"",
     "comments":"",
-    "x":1376.2434692382812,
-    "y":1256.7196044921875,
-    "z":"d3629202.0e9a9",
+    "x":1226.2434692382812,
+    "y":1114.2196044921875,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"e7882796.2e25a8",
+    "id":"c3ce8536.056418",
     "type":"comment",
     "name":"GET tunnelxconn-allotted-resource from mdsal",
     "info":"",
     "comments":"",
-    "x":681.8148193359375,
-    "y":444.7672119140625,
-    "z":"d3629202.0e9a9",
+    "x":531.8148193359375,
+    "y":302.2672119140625,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"af1477fd.c2ef48",
+    "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":1268.129150390625,
-    "y":470.6243896484375,
-    "z":"d3629202.0e9a9",
+    "x":1118.129150390625,
+    "y":328.1243896484375,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"5ce4ff52.c3598",
+    "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":1318.38623046875,
-    "y":668.6243896484375,
-    "z":"d3629202.0e9a9",
+    "x":1168.38623046875,
+    "y":526.1243896484375,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"72aaacf.5bef354",
+    "id":"dfee41c5.0d9b3",
     "type":"comment",
     "name":"Set allotted-resource-identifiers",
     "info":"",
     "comments":"",
-    "x":1345.338623046875,
-    "y":627.338623046875,
-    "z":"d3629202.0e9a9",
+    "x":1195.338623046875,
+    "y":484.838623046875,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"e4f1d676.269118",
+    "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":1335.38623046875,
-    "y":976.910400390625,
-    "z":"d3629202.0e9a9",
+    "x":1185.38623046875,
+    "y":834.410400390625,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"af5a8dd4.2718",
+    "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":1363.957763671875,
-    "y":711.9100952148438,
-    "z":"d3629202.0e9a9",
+    "x":1213.957763671875,
+    "y":569.4100952148438,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"6487f749.00d688",
+    "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":1343.8148193359375,
-    "y":751.19580078125,
-    "z":"d3629202.0e9a9",
+    "x":1193.8148193359375,
+    "y":608.69580078125,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "ac9d6ff3.e94f3"
+        "40b2b772.23c3f8"
       ]
     ]
   },
   {
-    "id":"ac9d6ff3.e94f3",
+    "id":"40b2b772.23c3f8",
     "type":"outcome",
     "name":"outcome null",
     "xml":"<outcome value=''>\n",
     "comments":"",
     "outputs":1,
-    "x":1571.9576988220215,
-    "y":752.6243271827698,
-    "z":"d3629202.0e9a9",
+    "x":1421.9576988220215,
+    "y":610.1243271827698,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "6de39e79.3ed02"
+        "853c921b.506c8"
       ]
     ]
   },
   {
-    "id":"6de39e79.3ed02",
+    "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":1773.38627243042,
-    "y":752.0528798103333,
-    "z":"d3629202.0e9a9",
+    "x":1623.38627243042,
+    "y":609.5528798103333,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"62ed5c3a.385604",
+    "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":1316.2434158325195,
-    "y":785.4815106391907,
-    "z":"d3629202.0e9a9",
+    "x":1166.2434158325195,
+    "y":642.9815106391907,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "94d93434.23d938"
+        "e20ffb32.51cf08"
       ]
     ]
   },
   {
-    "id":"94d93434.23d938",
+    "id":"e20ffb32.51cf08",
     "type":"outcome",
     "name":"outcome null",
     "xml":"<outcome value=''>\n",
     "comments":"",
     "outputs":1,
-    "x":1517.6719818115234,
-    "y":786.0529322624207,
-    "z":"d3629202.0e9a9",
+    "x":1367.6719818115234,
+    "y":643.5529322624207,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "aa516303.e0eee"
+        "3277974f.69b6d8"
       ]
     ]
   },
   {
-    "id":"aa516303.e0eee",
+    "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":1710.529140472412,
-    "y":786.0528540611267,
-    "z":"d3629202.0e9a9",
+    "x":1560.529140472412,
+    "y":643.5528540611267,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"15675ff3.fe7c9",
+    "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":1324.8148193359375,
-    "y":818.3386378288269,
-    "z":"d3629202.0e9a9",
+    "x":1174.8148193359375,
+    "y":675.8386378288269,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "baad5acc.7ffcb8"
+        "f1c91438.54f678"
       ]
     ]
   },
   {
-    "id":"baad5acc.7ffcb8",
+    "id":"f1c91438.54f678",
     "type":"outcome",
     "name":"outcome null",
     "xml":"<outcome value=''>\n",
     "comments":"",
     "outputs":1,
-    "x":1574.8148002624512,
-    "y":818.3386225700378,
-    "z":"d3629202.0e9a9",
+    "x":1424.8148002624512,
+    "y":675.8386225700378,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "ff89d62f.a88838"
+        "dd6dede8.36e8b"
       ]
     ]
   },
   {
-    "id":"ff89d62f.a88838",
+    "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":1767.6719589233398,
-    "y":818.3385443687439,
-    "z":"d3629202.0e9a9",
+    "x":1617.6719589233398,
+    "y":675.8385443687439,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"4359a5ff.7933ac",
+    "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":1388.38623046875,
-    "y":920.7672729492188,
-    "z":"d3629202.0e9a9",
+    "x":1238.38623046875,
+    "y":778.2672729492188,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "caaf3501.3ba9c8",
-        "2ae9bf81.d8366"
+        "e1eb2b6.299a9d8",
+        "b14c2617.4ba278"
       ]
     ]
   },
   {
-    "id":"caaf3501.3ba9c8",
+    "id":"e1eb2b6.299a9d8",
     "type":"other",
     "name":"outcome Y",
     "xml":"<outcome value='Y'>\n",
     "comments":"",
     "outputs":1,
-    "x":1674.3862915039062,
-    "y":920.1958618164062,
-    "z":"d3629202.0e9a9",
+    "x":1524.3862915039062,
+    "y":777.6958618164062,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "e333882f.732e78"
+        "cb449102.0bfe4"
       ]
     ]
   },
   {
-    "id":"e333882f.732e78",
+    "id":"cb449102.0bfe4",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":1828.1363525390625,
-    "y":922.69580078125,
-    "z":"d3629202.0e9a9",
+    "x":1678.1363525390625,
+    "y":780.19580078125,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "68a80432.57affc"
+        "6222201e.ef0d1"
       ]
     ]
   },
   {
-    "id":"2ae9bf81.d8366",
+    "id":"b14c2617.4ba278",
     "type":"other",
     "name":"other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":1693.608642578125,
-    "y":1009.1958618164062,
-    "z":"d3629202.0e9a9",
+    "x":1543.608642578125,
+    "y":866.6958618164062,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "363e0870.e596f8"
+        "ba1cec2.367321"
       ]
     ]
   },
   {
-    "id":"363e0870.e596f8",
+    "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":1876.608642578125,
-    "y":1014.1958618164062,
-    "z":"d3629202.0e9a9",
+    "x":1726.608642578125,
+    "y":871.6958618164062,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"68a80432.57affc",
+    "id":"6222201e.ef0d1",
     "type":"switchNode",
     "name":"switch ar-model.ecomp-generated-naming",
     "xml":"<switch test='`$ar-model.naming-policy`'>\n",
     "comments":"",
     "outputs":1,
-    "x":1964.38623046875,
-    "y":971.767333984375,
-    "z":"d3629202.0e9a9",
+    "x":1814.38623046875,
+    "y":829.267333984375,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "b9e5730f.7b10e",
-        "1e6aef5f.dbbe91"
+        "82b261b0.84ccc",
+        "d8af7c81.cbd5"
       ]
     ]
   },
   {
-    "id":"b9e5730f.7b10e",
+    "id":"82b261b0.84ccc",
     "type":"other",
     "name":"outcome oam_network_policy",
     "xml":"<outcome value='oam_network_policy'>\n",
     "comments":"",
     "outputs":1,
-    "x":2339.244140625,
-    "y":975.3453369140625,
-    "z":"d3629202.0e9a9",
+    "x":2189.244140625,
+    "y":832.8453369140625,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "272bfe84.8b7ee2"
+        "a16beaa7.a8be68"
       ]
     ]
   },
   {
-    "id":"1e6aef5f.dbbe91",
+    "id":"d8af7c81.cbd5",
     "type":"other",
     "name":"other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":2253.671875,
-    "y":1052.1958618164062,
-    "z":"d3629202.0e9a9",
+    "x":2103.671875,
+    "y":909.6958618164062,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "272bfe84.8b7ee2"
+        "a16beaa7.a8be68"
       ]
     ]
   },
   {
-    "id":"23093b95.f9aaa4",
+    "id":"b92b0ebd.ec97e",
     "type":"set",
     "name":"set ar_name",
     "xml":"<set>\n<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />\n",
     "comments":"",
-    "x":2645.100830078125,
-    "y":1010.7672729492188,
-    "z":"d3629202.0e9a9",
+    "x":2495.100830078125,
+    "y":868.2672729492188,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"1a68705f.d6389",
+    "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":2789.2437858581543,
-    "y":1054.6244196891785,
-    "z":"d3629202.0e9a9",
+    "x":2639.2437858581543,
+    "y":912.1244196891785,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
 
@@ -625,15 +625,15 @@
     ]
   },
   {
-    "id":"7aa8e90e.1063e8",
+    "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":2776.243896484375,
-    "y":1094.7672729492188,
-    "z":"d3629202.0e9a9",
+    "x":2626.243896484375,
+    "y":952.2672729492188,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
 
@@ -641,274 +641,274 @@
     ]
   },
   {
-    "id":"272bfe84.8b7ee2",
+    "id":"a16beaa7.a8be68",
     "type":"block",
     "name":"block: atomic",
     "xml":"<block atomic='true'>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":2453.5292015075684,
-    "y":1050.3387522697449,
-    "z":"d3629202.0e9a9",
+    "x":2303.5292015075684,
+    "y":907.8387522697449,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "23093b95.f9aaa4",
-        "1a68705f.d6389",
-        "7aa8e90e.1063e8",
-        "4308f250.0d061c"
+        "b92b0ebd.ec97e",
+        "ff0ac1c6.8d99",
+        "11a52a68.e2bc36",
+        "24287aef.ab1756"
       ]
     ]
   },
   {
-    "id":"4308f250.0d061c",
+    "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":2734.1005859375,
-    "y":1145.052978515625,
-    "z":"d3629202.0e9a9",
+    "x":2584.1005859375,
+    "y":1002.552978515625,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"18920617.98a00a",
+    "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":1343.8624572753906,
-    "y":1181.6246919631958,
-    "z":"d3629202.0e9a9",
+    "x":1193.8624572753906,
+    "y":1039.1246919631958,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"21493890.2a9e08",
+    "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":1323.529052734375,
-    "y":1078.0530395507812,
-    "z":"d3629202.0e9a9",
+    "x":1173.529052734375,
+    "y":935.5530395507812,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"d4e58fd3.5a831",
+    "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":2361.8155822753906,
-    "y":1455.0411586761475,
-    "z":"d3629202.0e9a9",
+    "x":2211.8155822753906,
+    "y":1312.5411586761475,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "c0a127f7.72a988"
+        "9eff53f5.fba2e"
       ]
     ]
   },
   {
-    "id":"d68f413c.e0018",
+    "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":1392.8148193359375,
-    "y":1342.505126953125,
-    "z":"d3629202.0e9a9",
+    "x":1242.8148193359375,
+    "y":1200.005126953125,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "d8f09bad.98faa8",
-        "980eb422.8bc7a8"
+        "44b6b7be.364a78",
+        "d6f3204f.2e124"
       ]
     ]
   },
   {
-    "id":"d8f09bad.98faa8",
+    "id":"44b6b7be.364a78",
     "type":"other",
     "name":"outcome Null",
     "xml":"<outcome value=''>\n",
     "comments":"",
     "outputs":1,
-    "x":1768.2077865600586,
-    "y":1347.1124458312988,
-    "z":"d3629202.0e9a9",
+    "x":1618.2077865600586,
+    "y":1204.6124458312988,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "19b4289e.1770d7"
+        "da9136e5.9a43c8"
       ]
     ]
   },
   {
-    "id":"980eb422.8bc7a8",
+    "id":"d6f3204f.2e124",
     "type":"other",
     "name":"other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":1766.9577865600586,
-    "y":1437.1124477386475,
-    "z":"d3629202.0e9a9",
+    "x":1616.9577865600586,
+    "y":1294.6124477386475,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "1162545f.50c16c"
+        "e4b52287.ffa4f"
       ]
     ]
   },
   {
-    "id":"c0a127f7.72a988",
+    "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":2796.4106826782227,
-    "y":1456.85085105896,
-    "z":"d3629202.0e9a9",
+    "x":2646.4106826782227,
+    "y":1314.35085105896,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "ff33ae53.f22d8"
+        "4247aaf2.34bc24"
       ]
     ]
   },
   {
-    "id":"ff33ae53.f22d8",
+    "id":"4247aaf2.34bc24",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":3003.220375061035,
-    "y":1460.064962387085,
-    "z":"d3629202.0e9a9",
+    "x":2853.220375061035,
+    "y":1317.564962387085,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "d155597e.e18e78"
+        "4915e942.23f368"
       ]
     ]
   },
   {
-    "id":"1162545f.50c16c",
+    "id":"e4b52287.ffa4f",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "outputs":1,
-    "x":1924.834976196289,
-    "y":1443.4885501861572,
-    "z":"d3629202.0e9a9",
+    "x":1774.834976196289,
+    "y":1300.9885501861572,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "d4e58fd3.5a831",
-        "e918e4d2.1efcf8"
+        "ad1d1f47.0fd92",
+        "f259b5a9.563638"
       ]
     ]
   },
   {
-    "id":"d155597e.e18e78",
+    "id":"4915e942.23f368",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "outputs":1,
-    "x":3171.4817276000977,
-    "y":1464.9222631454468,
-    "z":"d3629202.0e9a9",
+    "x":3021.4817276000977,
+    "y":1322.4222631454468,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "c63d8f00.d8d8c",
-        "83bc7036.c8dd5"
+        "fbb9a58b.3d9f98",
+        "f2f48ed3.1ccda"
       ]
     ]
   },
   {
-    "id":"19b4289e.1770d7",
+    "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":1947.0647735595703,
-    "y":1349.3266830444336,
-    "z":"d3629202.0e9a9",
+    "x":1797.0647735595703,
+    "y":1206.8266830444336,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"c63d8f00.d8d8c",
+    "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":3417.3391876220703,
-    "y":1459.4937419891357,
-    "z":"d3629202.0e9a9",
+    "x":3267.3391876220703,
+    "y":1316.9937419891357,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"61be16d.26f08e8",
+    "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":1303.6720123291016,
-    "y":1507.826681137085,
-    "z":"d3629202.0e9a9",
+    "x":1153.6720123291016,
+    "y":1365.326681137085,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"92379d68.800b2",
+    "id":"24c4fc44.bfefd4",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1703.910057067871,
-    "y":1868.4815347194672,
-    "z":"d3629202.0e9a9",
+    "x":1553.910057067871,
+    "y":1725.9815347194672,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "c74947a6.46a2b8"
+        "ee4c753c.c76778"
       ]
     ]
   },
   {
-    "id":"8606840b.b8ce78",
+    "id":"d6830d95.f9764",
     "type":"comment",
     "name":"Add BRG AR to mdsal",
     "info":"",
     "comments":"",
-    "x":1228.148208618164,
-    "y":1843.1957080364227,
-    "z":"d3629202.0e9a9",
+    "x":1078.148208618164,
+    "y":1700.6957080364227,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"a3f8e39.226902",
+    "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":1244.4814224243164,
-    "y":1581.671986579895,
-    "z":"d3629202.0e9a9",
+    "x":1094.4814224243164,
+    "y":1439.171986579895,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
 
@@ -916,282 +916,282 @@
     ]
   },
   {
-    "id":"681e6bc2.d5fc84",
+    "id":"5ce074ae.26955c",
     "type":"other",
     "name":"other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":964.57666015625,
-    "y":525.4814453125,
-    "z":"d3629202.0e9a9",
+    "x":814.57666015625,
+    "y":382.9814453125,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "4c28d627.be47d8"
+        "eac1d1df.4a04c"
       ]
     ]
   },
   {
-    "id":"4c28d627.be47d8",
+    "id":"eac1d1df.4a04c",
     "type":"block",
     "name":"block: atomic",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":912.57666015625,
-    "y":1021.2908325195312,
-    "z":"d3629202.0e9a9",
+    "x":762.57666015625,
+    "y":878.7908325195312,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "75b209f7.c1c7f8",
-        "5ce4ff52.c3598",
-        "af5a8dd4.2718",
-        "6487f749.00d688",
-        "62ed5c3a.385604",
-        "15675ff3.fe7c9",
-        "fe3888af.6a0dc8",
-        "4359a5ff.7933ac",
-        "e4f1d676.269118",
-        "21493890.2a9e08",
-        "18920617.98a00a",
-        "d68f413c.e0018",
-        "61be16d.26f08e8",
-        "a3f8e39.226902",
-        "9736c0da.28d34",
-        "c78f845.d573978",
-        "72e34d2d.88e074",
-        "12aa04eb.1fdf1b",
-        "2755b2a9.79da1e"
+        "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":"75b209f7.c1c7f8",
+    "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":1283.2434387207031,
-    "y":531.433837890625,
-    "z":"d3629202.0e9a9",
+    "x":1133.2434387207031,
+    "y":388.933837890625,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"c78f845.d573978",
+    "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 = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$ar-model.invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$ar-model.uuid`\" />\n\t<parameter name=\"operational-status\" value=\"null\" />\n",
+    "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":1265.0529327392578,
-    "y":1749.5767517089844,
-    "z":"d3629202.0e9a9",
+    "x":1115.0529327392578,
+    "y":1607.0767517089844,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "fd42eaba.bcea98",
-        "44f6df87.e6131"
+        "7ca7c810.8af8c8",
+        "27b10af8.032016"
       ]
     ]
   },
   {
-    "id":"fd42eaba.bcea98",
+    "id":"7ca7c810.8af8c8",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":1520.814842224121,
-    "y":1732.5292553901672,
-    "z":"d3629202.0e9a9",
+    "x":1370.814842224121,
+    "y":1590.0292553901672,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "cf813c6.4773dc"
+        "2112b130.25219e"
       ]
     ]
   },
   {
-    "id":"cf813c6.4773dc",
+    "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":1687.338722229004,
-    "y":1744.1483263969421,
-    "z":"d3629202.0e9a9",
+    "x":1537.338722229004,
+    "y":1601.6483263969421,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"44f6df87.e6131",
+    "id":"27b10af8.032016",
     "type":"failure",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":1527.9101295471191,
-    "y":1765.2912230491638,
-    "z":"d3629202.0e9a9",
+    "x":1377.9101295471191,
+    "y":1622.7912230491638,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "cf813c6.4773dc"
+        "2112b130.25219e"
       ]
     ]
   },
   {
-    "id":"e918e4d2.1efcf8",
+    "id":"f259b5a9.563638",
     "type":"switchNode",
     "name":"switch tmp.found-cidx",
     "xml":"<switch test='`$tmp.found-cidx`'>\n",
     "comments":"",
     "outputs":1,
-    "x":2176.743423461914,
-    "y":1701.2315921783447,
-    "z":"d3629202.0e9a9",
+    "x":2026.743423461914,
+    "y":1558.7315921783447,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "97cac5ec.6c2cb8"
+        "74a25a57.2f53b4"
       ]
     ]
   },
   {
-    "id":"97cac5ec.6c2cb8",
+    "id":"74a25a57.2f53b4",
     "type":"outcomeTrue",
     "name":"false",
     "xml":"<outcome value='false'>\n",
     "comments":"",
     "outputs":1,
-    "x":2366.743377685547,
-    "y":1701.2315292358398,
-    "z":"d3629202.0e9a9",
+    "x":2216.743377685547,
+    "y":1558.7315292358398,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "79bcb05d.e925c"
+        "c642818d.c82e8"
       ]
     ]
   },
   {
-    "id":"79bcb05d.e925c",
+    "id":"c642818d.c82e8",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "outputs":1,
-    "x":2532.743377685547,
-    "y":1701.2315292358398,
-    "z":"d3629202.0e9a9",
+    "x":2382.743377685547,
+    "y":1558.7315292358398,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "e7aa5ffb.99baf"
+        "94c7e089.4dbec"
       ]
     ]
   },
   {
-    "id":"e7aa5ffb.99baf",
+    "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":2778.600706100464,
-    "y":1701.8030033111572,
-    "z":"d3629202.0e9a9",
+    "x":2628.600706100464,
+    "y":1559.3030033111572,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"c74947a6.46a2b8",
+    "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":2054.9521980285645,
-    "y":1868.1904199123383,
-    "z":"d3629202.0e9a9",
+    "x":1904.9521980285645,
+    "y":1725.6904199123383,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "779e9c7a.0850b4",
-        "9d87709f.92daf",
-        "1c59440e.45623c"
+        "772b0aab.94a794",
+        "cb34fc4a.b6aaa",
+        "18d615d.09d0cea"
       ]
     ]
   },
   {
-    "id":"889dce84.ffc52",
+    "id":"633a71f3.b98a8",
     "type":"comment",
     "name":"Rollback parent",
     "info":"",
     "comments":"",
-    "x":1898.9521255493164,
-    "y":1837.8570504188538,
-    "z":"d3629202.0e9a9",
+    "x":1748.9521255493164,
+    "y":1695.3570504188538,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"779e9c7a.0850b4",
+    "id":"772b0aab.94a794",
     "type":"not-found",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":2426.2602462768555,
-    "y":1928.8553862571716,
-    "z":"d3629202.0e9a9",
+    "x":2276.2602462768555,
+    "y":1786.3553862571716,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "b6ba7293.f6aed"
+        "17d2c2c8.78357d"
       ]
     ]
   },
   {
-    "id":"9d87709f.92daf",
+    "id":"cb34fc4a.b6aaa",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":2417.26029586792,
-    "y":1897.3554120063782,
-    "z":"d3629202.0e9a9",
+    "x":2267.26029586792,
+    "y":1754.8554120063782,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "b6ba7293.f6aed"
+        "17d2c2c8.78357d"
       ]
     ]
   },
   {
-    "id":"1c59440e.45623c",
+    "id":"18d615d.09d0cea",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":2421.0103340148926,
-    "y":1867.7125168815255,
-    "z":"d3629202.0e9a9",
+    "x":2271.0103340148926,
+    "y":1725.2125168815255,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "b6ba7293.f6aed"
+        "17d2c2c8.78357d"
       ]
     ]
   },
   {
-    "id":"b6ba7293.f6aed",
+    "id":"17d2c2c8.78357d",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":2562.666301727295,
-    "y":1863.9046860709786,
-    "z":"d3629202.0e9a9",
+    "x":2412.666301727295,
+    "y":1721.4046860709786,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
 
@@ -1199,45 +1199,45 @@
     ]
   },
   {
-    "id":"fbee093c.3938b8",
+    "id":"9883554f.db10a8",
     "type":"comment",
     "name":"Generate naming",
     "info":"",
     "comments":"",
-    "x":1319.3862762451172,
-    "y":878.7672252655029,
-    "z":"d3629202.0e9a9",
+    "x":1169.3862762451172,
+    "y":736.2672252655029,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]
   },
   {
-    "id":"b05fdf22.36f2",
+    "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":664,
-    "y":479,
-    "z":"d3629202.0e9a9",
+    "x":514,
+    "y":336.5,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
-        "b6562205.a7488",
-        "681e6bc2.d5fc84"
+        "2eb376c7.9249fa",
+        "5ce074ae.26955c"
       ]
     ]
   },
   {
-    "id":"3df4d53c.54c6ca",
+    "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":740,
-    "y":368,
-    "z":"d3629202.0e9a9",
+    "x":590,
+    "y":225.5,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
 
@@ -1245,15 +1245,15 @@
     ]
   },
   {
-    "id":"c8732493.f72838",
+    "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":747,
-    "y":408,
-    "z":"d3629202.0e9a9",
+    "x":597,
+    "y":265.5,
+    "z":"25bf3deb.2eabd2",
     "wires":[
       [
 
@@ -1261,14 +1261,14 @@
     ]
   },
   {
-    "id":"83bc7036.c8dd5",
+    "id":"f2f48ed3.1ccda",
     "type":"break",
     "name":"break",
     "xml":"<break>\n",
     "comments":"",
-    "x":3330.243507385254,
-    "y":1504.7316856384277,
-    "z":"d3629202.0e9a9",
+    "x":3180.243507385254,
+    "y":1362.2316856384277,
+    "z":"25bf3deb.2eabd2",
     "wires":[
 
     ]