From 778b7b1dd8c787d9210caf9ce2f0ff80eeb49d37 Mon Sep 17 00:00:00 2001
From: Brian Freeman <bf1936@att.com>
Date: Wed, 15 Nov 2017 18:11:33 +0000
Subject: [PATCH] Fix xconn assign

Issue-ID: SDNC-199
Change-Id: Ic27f705672e4101a0813c85e3fd0f93f05f72934
Signed-off-by: Brian Freeman <bf1936@att.com>
---
 ...C-RESOURCE-API_get-vnf-api-parent-instance.json |  209 +--
 ...-API_tunnelxconn-topology-operation-assign.json | 1538 +-------------------
 ...IC-RESOURCE-API_get-vnf-api-parent-instance.xml |   48 +-
 ...E-API_tunnelxconn-topology-operation-assign.xml |  603 ++++----
 4 files changed, 296 insertions(+), 2102 deletions(-)

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.json
index 8de156fe..5cb69f21 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.json
@@ -1,208 +1 @@
-[
-  {
-    "id":"ca9867f0.bee9b8",
-    "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":490.9999313354492,
-    "y":347.3333616256714,
-    "z":"113743e5.c5805c",
-    "wires":[
-      [
-        "c8f3625d.8c17"
-      ]
-    ]
-  },
-  {
-    "id":"5f5355c8.d5e21c",
-    "type":"dgstart",
-    "name":"DGSTART",
-    "outputs":1,
-    "x":121.66665649414062,
-    "y":80,
-    "z":"113743e5.c5805c",
-    "wires":[
-      [
-        "72be46c0.39b648"
-      ]
-    ]
-  },
-  {
-    "id":"72be46c0.39b648",
-    "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":272.90473556518555,
-    "y":147.95239067077637,
-    "z":"113743e5.c5805c",
-    "wires":[
-      [
-        "f67f0e3d.eb57b"
-      ]
-    ]
-  },
-  {
-    "id":"f67f0e3d.eb57b",
-    "type":"method",
-    "name":"get-vnf-api-parent-instance",
-    "xml":"<method rpc='get-vnf-api-parent-instance' mode='sync'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":326.8215026855469,
-    "y":207.19044494628906,
-    "z":"113743e5.c5805c",
-    "wires":[
-      [
-        "26d836cd.d8f48a"
-      ]
-    ]
-  },
-  {
-    "id":"26d836cd.d8f48a",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":227.14284896850586,
-    "y":326.5237879753113,
-    "z":"113743e5.c5805c",
-    "wires":[
-      [
-        "c3cef9b4.0af4e8",
-        "ca9867f0.bee9b8"
-      ]
-    ]
-  },
-  {
-    "id":"c3cef9b4.0af4e8",
-    "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":535.9999847412109,
-    "y":286.9999952316284,
-    "z":"113743e5.c5805c",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"c8f3625d.8c17",
-    "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.search.parent-service-instance-id`'>\n\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":763.9999847412109,
-    "y":349.6666841506958,
-    "z":"113743e5.c5805c",
-    "wires":[
-      [
-        "929c05d0.10e968"
-      ]
-    ]
-  },
-  {
-    "id":"8e1b44d6.600948",
-    "type":"get-resource",
-    "name":"get-resource parent service instance",
-    "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.vnf-id/service-data/' pfx='parent-service-instance' >\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":1265.3333053588867,
-    "y":324.6666851043701,
-    "z":"113743e5.c5805c",
-    "wires":[
-      [
-        "2e1a8d2c.7d2b72"
-      ]
-    ]
-  },
-  {
-    "id":"2e1a8d2c.7d2b72",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1490.666654586792,
-    "y":324.33336639404297,
-    "z":"113743e5.c5805c",
-    "wires":[
-      [
-        "b633d9b1.a67d28"
-      ]
-    ]
-  },
-  {
-    "id":"929c05d0.10e968",
-    "type":"success",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1003.0000076293945,
-    "y":240.66669464111328,
-    "z":"113743e5.c5805c",
-    "wires":[
-      [
-        "40f0e6cc.970498"
-      ]
-    ]
-  },
-  {
-    "id":"40f0e6cc.970498",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1036.0000534057617,
-    "y":327.6667003631592,
-    "z":"113743e5.c5805c",
-    "wires":[
-      [
-        "5f33dc50.216f34",
-        "8e1b44d6.600948"
-      ]
-    ]
-  },
-  {
-    "id":"5f33dc50.216f34",
-    "type":"set",
-    "name":"set  tmp.old-service-data.vnf-id",
-    "xml":"<set>\n<parameter name='tmp.old-service-data.vnf-id' value='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.vnf-id`' />\n",
-    "comments":"",
-    "x":1255.0000228881836,
-    "y":231.00003814697266,
-    "z":"113743e5.c5805c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"b633d9b1.a67d28",
-    "type":"returnFailure",
-    "name":"return failure - parent service instance not found",
-    "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=\"`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`\" />\n",
-    "comments":"",
-    "x":1759.6666259765625,
-    "y":316.6666564941406,
-    "z":"113743e5.c5805c",
-    "wires":[
-
-    ]
-  }
-]
\ No newline at end of file
+[{"id":"7b3f7465.e880f4","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":458,"y":414.3333616256714,"z":"93aea807.147f78","wires":[["29eb104d.f31d5"]]},{"id":"dd7bb1e4.e5866","type":"dgstart","name":"DGSTART","outputs":1,"x":88.6667251586914,"y":147,"z":"93aea807.147f78","wires":[["6368cf0a.1d92c"]]},{"id":"6368cf0a.1d92c","type":"service-logic","name":"GENERIC-RESOURCE-API 1.2.0-SNAPAHOT-111501","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":239.90480422973633,"y":214.95239067077637,"z":"93aea807.147f78","wires":[["bbb8a0c5.75f9a"]]},{"id":"bbb8a0c5.75f9a","type":"method","name":"get-vnf-api-parent-instance","xml":"<method rpc='get-vnf-api-parent-instance' mode='sync'>\n","comments":"","outputs":1,"x":293.82157135009766,"y":274.19044494628906,"z":"93aea807.147f78","wires":[["d1709f70.65eec"]]},{"id":"d1709f70.65eec","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":194.14291763305664,"y":393.5237879753113,"z":"93aea807.147f78","wires":[["31f9d6b7.1788a2","7b3f7465.e880f4"]]},{"id":"31f9d6b7.1788a2","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":503.0000534057617,"y":353.9999952316284,"z":"93aea807.147f78","wires":[[]]},{"id":"29eb104d.f31d5","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.search.parent-service-instance-id`'>\n\n\n","comments":"","outputs":1,"x":731.0000534057617,"y":416.6666841506958,"z":"93aea807.147f78","wires":[["f0d1c2c9.5e6df8"]]},{"id":"5d04a6e8.82fb5","type":"get-resource","name":"get-resource parent service instance","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.vnf-id/service-data/' pfx='parent-service-instance' >\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":1232.3333740234375,"y":391.6666851043701,"z":"93aea807.147f78","wires":[["dad950e8.616f28"]]},{"id":"dad950e8.616f28","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1457.6667232513428,"y":391.33336639404297,"z":"93aea807.147f78","wires":[["f911a350.f3712"]]},{"id":"f0d1c2c9.5e6df8","type":"success","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":970.0000762939453,"y":307.6666946411133,"z":"93aea807.147f78","wires":[["88ae32d5.c2278"]]},{"id":"88ae32d5.c2278","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1003.0001220703125,"y":394.6667003631592,"z":"93aea807.147f78","wires":[["fa7cb6ab.02de7","5d04a6e8.82fb5"]]},{"id":"fa7cb6ab.02de7","type":"set","name":"set  tmp.old-service-data.vnf-id","xml":"<set>\n<parameter name='tmp.old-service-data.vnf-id' value='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.vnf-id`' />\n","comments":"","x":1222.0000915527344,"y":298.00003814697266,"z":"93aea807.147f78","wires":[]},{"id":"f911a350.f3712","type":"returnFailure","name":"return failure - parent service instance not found","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=\"`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`\" />\n","comments":"","x":1726.6666946411133,"y":383.6666564941406,"z":"93aea807.147f78","wires":[]}]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.json
index a5427e32..018d9ab9 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.json
@@ -1,1537 +1 @@
-[
-  {
-    "id":"f7a51f5.fe86ce",
-    "type":"dgstart",
-    "name":"DGSTART",
-    "outputs":1,
-    "x":415,
-    "y":350,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "ba9c043e.e07f58"
-      ]
-    ]
-  },
-  {
-    "id":"ba9c043e.e07f58",
-    "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":511.2380790710449,
-    "y":410.95239067077637,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "249d942d.c245dc"
-      ]
-    ]
-  },
-  {
-    "id":"249d942d.c245dc",
-    "type":"method",
-    "name":"tunnelxconn-topology-operation-assign",
-    "xml":"<method rpc='tunnelxconn-topology-operation-assign' mode='sync'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":562.154857635498,
-    "y":446.1904458999634,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "6d5b29f7.7a4718"
-      ]
-    ]
-  },
-  {
-    "id":"6d5b29f7.7a4718",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":465.47619247436523,
-    "y":589.5237879753113,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "3003211a.e085be",
-        "e75e77ea.b57f18",
-        "f5d1d70b.ddc6f8",
-        "338371c3.03166e",
-        "bec51e2f.be8cc"
-      ]
-    ]
-  },
-  {
-    "id":"d0d44753.44ba98",
-    "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":1308.6666564941406,
-    "y":2516.5477046966553,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"8469024b.7a82b",
-    "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 + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
-    "comments":"",
-    "x":1345.7540550231934,
-    "y":2395.432439804077,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"2132e3dd.5539fc",
-    "type":"set",
-    "name":"set allotted-resource-oper-status",
-    "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
-    "comments":"",
-    "x":1417.468376159668,
-    "y":1812.6228160858154,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"e75e77ea.b57f18",
-    "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":911.738037109375,
-    "y":457.33331298828125,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"3003211a.e085be",
-    "type":"set",
-    "name":"set tmp.ar.allotted-resource-id,etc",
-    "xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
-    "comments":"",
-    "x":959.997314453125,
-    "y":413.59259033203125,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"eb1ff0c9.ef38e",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1098.8148803710938,
-    "y":629.2672729492188,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "c02bbcdf.bc013"
-      ]
-    ]
-  },
-  {
-    "id":"4e2ca4b9.af9d2c",
-    "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.tx.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":1438.8626251220703,
-    "y":2037.1008231639862,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "aff222bc.8e6d2",
-        "d2e716e0.ea3f78",
-        "52261953.a9dda8"
-      ]
-    ]
-  },
-  {
-    "id":"aff222bc.8e6d2",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1707.5040016174316,
-    "y":2088.43223490566,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "39f6948c.62523c"
-      ]
-    ]
-  },
-  {
-    "id":"d2e716e0.ea3f78",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1698.504051208496,
-    "y":2056.9322606548667,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "39f6948c.62523c"
-      ]
-    ]
-  },
-  {
-    "id":"52261953.a9dda8",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1702.2540893554688,
-    "y":2027.289365530014,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "dcd5ec61.1101"
-      ]
-    ]
-  },
-  {
-    "id":"39f6948c.62523c",
-    "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":1868.2540893554688,
-    "y":2057.6822844967246,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"c1360476.7b6098",
-    "type":"set",
-    "name":"set oper-status",
-    "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
-    "comments":"",
-    "x":1448.5294189453125,
-    "y":730.0529174804688,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"f35d4335.54c9c",
-    "type":"comment",
-    "name":"Save consumed-allotted-resources to mdsal",
-    "info":"",
-    "comments":"",
-    "x":1475.2435302734375,
-    "y":1552.7196044921875,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"655635e7.0e3eec",
-    "type":"comment",
-    "name":"GET tunnelxconn-allotted-resource from mdsal",
-    "info":"",
-    "comments":"",
-    "x":821.8148193359375,
-    "y":599.7672119140625,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"c02bbcdf.bc013",
-    "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 tunnelxconn-allotted-resource with order status of ' + $mdsal-ar.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n",
-    "comments":"",
-    "x":1408.129150390625,
-    "y":624.6243896484375,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"573f6a07.f17fd4",
-    "type":"set",
-    "name":"set tx-ar-identifiers",
-    "xml":"<set>\n<parameter name='tx-ar-identifiers.consuming-service-instance-id' value=\"`$tunnelxconn-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='tx-ar-identifiers.parent-service-instance-id' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='tx-ar-identifiers.allotted-resource-type' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='tx-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n",
-    "comments":"",
-    "x":1458.38623046875,
-    "y":823.6243896484375,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"d7829a8.d904768",
-    "type":"comment",
-    "name":"Set allotted-resource-identifiers",
-    "info":"",
-    "comments":"",
-    "x":1485.338623046875,
-    "y":782.338623046875,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"42c79ea2.81985",
-    "type":"set",
-    "name":"set identifiers in overall structure",
-    "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.' value=\"`$tx-ar-identifiers.`\" />\n\n\n",
-    "comments":"",
-    "x":1475.38623046875,
-    "y":1131.910400390625,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"d8d243c1.7bb7e",
-    "type":"set",
-    "name":"set ecomp model information from input",
-    "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.' \nvalue=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.`\" />\n\n\n",
-    "comments":"",
-    "x":1503.957763671875,
-    "y":866.9100952148438,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"388bbf45.722ad",
-    "type":"switchNode",
-    "name":"switch model-invariant-uuid is null",
-    "xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1484.8148193359375,
-    "y":906.195809841156,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "61c62608.d61778"
-      ]
-    ]
-  },
-  {
-    "id":"61c62608.d61778",
-    "type":"outcome",
-    "name":"outcome null",
-    "xml":"<outcome value=''>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1711.9576988220215,
-    "y":907.6243271827698,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "39e6f667.b8ce5a"
-      ]
-    ]
-  },
-  {
-    "id":"39e6f667.b8ce5a",
-    "type":"set",
-    "name":"set model-invariant-uuid",
-    "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-invariant-uuid' \nvalue=\"`$ar-model.invariant-uuid`\" />\n\n\n",
-    "comments":"",
-    "x":1913.38627243042,
-    "y":907.0528798103333,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"e8848901.4775c8",
-    "type":"switchNode",
-    "name":"switch model-uuid is null",
-    "xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1456.2434158325195,
-    "y":940.4815106391907,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "d9785a66.79e3a8"
-      ]
-    ]
-  },
-  {
-    "id":"d9785a66.79e3a8",
-    "type":"outcome",
-    "name":"outcome null",
-    "xml":"<outcome value=''>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1657.6719818115234,
-    "y":941.0529322624207,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "1427b5c2.d5936a"
-      ]
-    ]
-  },
-  {
-    "id":"1427b5c2.d5936a",
-    "type":"set",
-    "name":"set model-uuid",
-    "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-uuid' \nvalue=\"`$ar-model.uuid`\" />\n\n\n",
-    "comments":"",
-    "x":1850.529140472412,
-    "y":941.0528540611267,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"109fba97.f782b5",
-    "type":"switchNode",
-    "name":"switch model-version is null",
-    "xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1464.8148193359375,
-    "y":982.338623046875,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "3f70eb82.810ee4"
-      ]
-    ]
-  },
-  {
-    "id":"3f70eb82.810ee4",
-    "type":"outcome",
-    "name":"outcome null",
-    "xml":"<outcome value=''>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1714.8148002624512,
-    "y":973.3386225700378,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "dc565eb7.6c9dc"
-      ]
-    ]
-  },
-  {
-    "id":"dc565eb7.6c9dc",
-    "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":1907.6719589233398,
-    "y":973.3385443687439,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"1d9a0b0d.a6f8f5",
-    "type":"switchNode",
-    "name":"switch ar-model.ecomp-generated-naming",
-    "xml":"<switch test='`$ar-model.ecomp-generated-naming`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1528.38623046875,
-    "y":1075.7672729492188,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "5928be3a.62e24",
-        "297d3bf7.200674"
-      ]
-    ]
-  },
-  {
-    "id":"5928be3a.62e24",
-    "type":"other",
-    "name":"outcome Y",
-    "xml":"<outcome value='Y'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1814.3862915039062,
-    "y":1075.1958618164062,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "7b105e84.481c9"
-      ]
-    ]
-  },
-  {
-    "id":"7b105e84.481c9",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">\n",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":1968.1363525390625,
-    "y":1077.69580078125,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "92b98902.431af8"
-      ]
-    ]
-  },
-  {
-    "id":"297d3bf7.200674",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1833.608642578125,
-    "y":1164.1958618164062,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "3e840127.e2aa3e"
-      ]
-    ]
-  },
-  {
-    "id":"3e840127.e2aa3e",
-    "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":2016.608642578125,
-    "y":1169.1958618164062,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"92b98902.431af8",
-    "type":"switchNode",
-    "name":"switch ar-model.ecomp-generated-naming",
-    "xml":"<switch test='`$ar-model.naming-policy`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2104.38623046875,
-    "y":1126.767333984375,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "26eb7249.47e7fe",
-        "f1043fa9.14b2e"
-      ]
-    ]
-  },
-  {
-    "id":"26eb7249.47e7fe",
-    "type":"other",
-    "name":"outcome oam_network_policy",
-    "xml":"<outcome value='oam_network_policy'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2479.244140625,
-    "y":1130.3453369140625,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "e7502764.f34288"
-      ]
-    ]
-  },
-  {
-    "id":"f1043fa9.14b2e",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2393.671875,
-    "y":1207.1958618164062,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "e7502764.f34288"
-      ]
-    ]
-  },
-  {
-    "id":"1d6e2e9f.9f6281",
-    "type":"set",
-    "name":"set ar_name",
-    "xml":"<set>\n<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />\n",
-    "comments":"",
-    "x":2785.100830078125,
-    "y":1165.7672729492188,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"d37d22cd.5e612",
-    "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":2929.2437858581543,
-    "y":1209.6244196891785,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"ef7b09c8.6b36b8",
-    "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":2916.243896484375,
-    "y":1249.7672729492188,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"e7502764.f34288",
-    "type":"block",
-    "name":"block: atomic",
-    "xml":"<block atomic='true'>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":2593.5292015075684,
-    "y":1205.3387522697449,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "1d6e2e9f.9f6281",
-        "d37d22cd.5e612",
-        "ef7b09c8.6b36b8",
-        "49ad4058.d0089"
-      ]
-    ]
-  },
-  {
-    "id":"49ad4058.d0089",
-    "type":"set",
-    "name":"set identifiers.allotted-resource-name",
-    "xml":"<set>\n<parameter name='tx-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />\n",
-    "comments":"",
-    "x":2874.1005859375,
-    "y":1300.052978515625,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"d092a98.3446758",
-    "type":"set",
-    "name":"set assignments in overall structure",
-    "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.' \nvalue=\"`$tx-ar-assignments.`\" />\n\n\n",
-    "comments":"",
-    "x":1460.8624267578125,
-    "y":1498.6246337890625,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"add28223.49736",
-    "type":"set",
-    "name":"Handle tx-ar-assignments",
-    "xml":"<set>\n<parameter name='tx-ar-assignments.vni' value='`$tmp.manageVni.vni`'/>\n<parameter name='tx-ar-assignments.vgmux-bearer-ip' value='`$tmp.vgmux-bearer-ip`'/>\n<parameter name='tx-ar-assignments.vgmux-lan-ip' value='`$tmp.vgmux-lan-ip`'/>\n<parameter name='tx-ar-assignments.vg-ip' value='`$tmp.manageIpaddr.ip`'/>\n\n",
-    "comments":"",
-    "x":1428.529052734375,
-    "y":1418.052978515625,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"6d7c9c61.51b0b4",
-    "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":2501.8155822753906,
-    "y":1610.0411586761475,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "70f7bb5e.ea0274"
-      ]
-    ]
-  },
-  {
-    "id":"c057b9c3.dc3768",
-    "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":1507.8148193359375,
-    "y":1603.505126953125,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "62b02de0.0af454",
-        "26557b09.94a7f4"
-      ]
-    ]
-  },
-  {
-    "id":"62b02de0.0af454",
-    "type":"other",
-    "name":"outcome Null",
-    "xml":"<outcome value=''>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1908.207763671875,
-    "y":1582.1124267578125,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "b0181993.439998"
-      ]
-    ]
-  },
-  {
-    "id":"26557b09.94a7f4",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1900.957763671875,
-    "y":1663.1124267578125,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "670fdc23.c2e944"
-      ]
-    ]
-  },
-  {
-    "id":"70f7bb5e.ea0274",
-    "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":2936.4106826782227,
-    "y":1611.85085105896,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "a8f61abf.fcd308"
-      ]
-    ]
-  },
-  {
-    "id":"a8f61abf.fcd308",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3143.220375061035,
-    "y":1615.064962387085,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "df6d8539.73d218"
-      ]
-    ]
-  },
-  {
-    "id":"670fdc23.c2e944",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":2067.8349609375,
-    "y":1657.488525390625,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "6d7c9c61.51b0b4",
-        "a831b9c8.902e48"
-      ]
-    ]
-  },
-  {
-    "id":"df6d8539.73d218",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":3311.4817276000977,
-    "y":1619.9222631454468,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "cf90980d.2f50b8"
-      ]
-    ]
-  },
-  {
-    "id":"b0181993.439998",
-    "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":2093.0648193359375,
-    "y":1585.32666015625,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"cf90980d.2f50b8",
-    "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":3557.3391876220703,
-    "y":1614.4937419891357,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"9e1a3f00.67db8",
-    "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=\"`$tunnelxconn-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":1443.6720123291016,
-    "y":1662.826681137085,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"dcd5ec61.1101",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1843.910057067871,
-    "y":2023.4815347194672,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"1b2081c9.a5da5e",
-    "type":"comment",
-    "name":"Add SZ AR to mdsal",
-    "info":"",
-    "comments":"",
-    "x":1370.148193359375,
-    "y":1973.1956787109375,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"7aaed588.63511c",
-    "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":1384.4814224243164,
-    "y":1736.671986579895,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"99804d99.5a352",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1104.57666015625,
-    "y":680.4814453125,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "e8c6a2dd.e4b3e"
-      ]
-    ]
-  },
-  {
-    "id":"aae390e8.74c6e",
-    "type":"block",
-    "name":"block: atomic",
-    "xml":"<block atomic=\"true\">\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1052.57666015625,
-    "y":1176.2908325195312,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "9e1a3f00.67db8",
-        "7aaed588.63511c",
-        "2132e3dd.5539fc",
-        "4e2ca4b9.af9d2c",
-        "8469024b.7a82b",
-        "d0d44753.44ba98",
-        "d7a47b9d.32cb28",
-        "c1360476.7b6098",
-        "573f6a07.f17fd4",
-        "d8d243c1.7bb7e",
-        "388bbf45.722ad",
-        "e8848901.4775c8",
-        "109fba97.f782b5",
-        "1d9a0b0d.a6f8f5",
-        "42c79ea2.81985",
-        "59dac422.4bc30c",
-        "d857982b.5cce48",
-        "40af5f1c.9055f",
-        "add28223.49736",
-        "d092a98.3446758",
-        "c057b9c3.dc3768",
-        "30b6665f.e4a89a",
-        "de53cfb9.dddbd",
-        "abea3cf1.3111d",
-        "f623a457.d69fb8"
-      ]
-    ]
-  },
-  {
-    "id":"d7a47b9d.32cb28",
-    "type":"set",
-    "name":"set id",
-    "xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />",
-    "comments":"",
-    "x":1423.2434387207031,
-    "y":686.433837890625,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"f623a457.d69fb8",
-    "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",
-    "comments":"",
-    "outputs":1,
-    "x":1411.052978515625,
-    "y":1888.5767822265625,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "34d1f7b2.8b87a8",
-        "b3d34689.7dc1b8"
-      ]
-    ]
-  },
-  {
-    "id":"34d1f7b2.8b87a8",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1660.814842224121,
-    "y":1887.5292553901672,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "a85cc318.f284a"
-      ]
-    ]
-  },
-  {
-    "id":"a85cc318.f284a",
-    "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":1827.338722229004,
-    "y":1899.1483263969421,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"b3d34689.7dc1b8",
-    "type":"failure",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1667.9101295471191,
-    "y":1920.2912230491638,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "a85cc318.f284a"
-      ]
-    ]
-  },
-  {
-    "id":"a831b9c8.902e48",
-    "type":"switchNode",
-    "name":"switch tmp.found-cidx",
-    "xml":"<switch test='`$tmp.found-cidx`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2316.743423461914,
-    "y":1856.2315921783447,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "7ea3dd53.4333f4"
-      ]
-    ]
-  },
-  {
-    "id":"7ea3dd53.4333f4",
-    "type":"outcomeTrue",
-    "name":"false",
-    "xml":"<outcome value='false'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2506.743377685547,
-    "y":1856.2315292358398,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "b69b3a44.e782b8"
-      ]
-    ]
-  },
-  {
-    "id":"b69b3a44.e782b8",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":2672.743377685547,
-    "y":1856.2315292358398,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "b4e6550a.303748"
-      ]
-    ]
-  },
-  {
-    "id":"b4e6550a.303748",
-    "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":2918.600706100464,
-    "y":1856.8030033111572,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"995e10ab.ef2f6",
-    "type":"break",
-    "name":"break",
-    "xml":"<break/>\n",
-    "comments":"",
-    "x":3476.243408203125,
-    "y":1659.731689453125,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ad2c1042.ffcf4",
-    "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":2194.9521980285645,
-    "y":2023.1904199123383,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "473b0bea.e2adf4",
-        "7b199046.8906d",
-        "416141e2.fa511"
-      ]
-    ]
-  },
-  {
-    "id":"f9d8c7c9.5d1db8",
-    "type":"comment",
-    "name":"Rollback parent",
-    "info":"",
-    "comments":"",
-    "x":2038.9521255493164,
-    "y":1992.8570504188538,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"473b0bea.e2adf4",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2566.2602462768555,
-    "y":2083.8553862571716,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "4115590f.ef7568"
-      ]
-    ]
-  },
-  {
-    "id":"7b199046.8906d",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2557.26029586792,
-    "y":2052.355412006378,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "4115590f.ef7568"
-      ]
-    ]
-  },
-  {
-    "id":"416141e2.fa511",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2561.0103340148926,
-    "y":2022.7125168815255,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "4115590f.ef7568"
-      ]
-    ]
-  },
-  {
-    "id":"4115590f.ef7568",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":2702.666301727295,
-    "y":2018.9046860709786,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"bf37a377.dd8a4",
-    "type":"comment",
-    "name":"Generate naming",
-    "info":"",
-    "comments":"",
-    "x":1459.3862762451172,
-    "y":1033.767225265503,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"f5d1d70b.ddc6f8",
-    "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":904,
-    "y":502,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"e8c6a2dd.e4b3e",
-    "type":"get-resource",
-    "name":"get-resource parent service instance",
-    "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.ar.parent-service-instance-id/service-data/' pfx='parent-service-instance' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":917,
-    "y":783,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "8991d34b.f48af",
-        "dbef2e21.0da74"
-      ]
-    ]
-  },
-  {
-    "id":"dbef2e21.0da74",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1180,
-    "y":777,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "aae390e8.74c6e"
-      ]
-    ]
-  },
-  {
-    "id":"8991d34b.f48af",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":993,
-    "y":878,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "d4ea2429.a9c908"
-      ]
-    ]
-  },
-  {
-    "id":"d4ea2429.a9c908",
-    "type":"returnFailure",
-    "name":"return failure - parent service instance not found",
-    "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=\"`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`\" />\n",
-    "comments":"",
-    "x":920,
-    "y":939,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"be6a5ce7.0ed",
-    "type":"for",
-    "name":"for parent vnf parameters",
-    "xml":"<for index='curidx' start='0' end='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length`' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":1970,
-    "y":1223,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "95805190.debbe"
-      ]
-    ]
-  },
-  {
-    "id":"95805190.debbe",
-    "type":"switchNode",
-    "name":"switch parameter name",
-    "xml":"<switch test='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-name`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2092,
-    "y":1315,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "508d4d24.3b9154",
-        "1ac32417.a325dc"
-      ]
-    ]
-  },
-  {
-    "id":"508d4d24.3b9154",
-    "type":"other",
-    "name":"vgmux_private_ip_0",
-    "xml":"<outcome value='vgmux_private_ip_0'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2318,
-    "y":1319,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "861fd9c6.6015f8"
-      ]
-    ]
-  },
-  {
-    "id":"755943b8.1a105c",
-    "type":"set",
-    "name":"set tmp.vgmux-bearer-ip",
-    "xml":"<set>\n<parameter name='tmp.vgmux-bearer-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>\n\n",
-    "comments":"",
-    "x":2550.9999771118164,
-    "y":1380.0000400543213,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"1ac32417.a325dc",
-    "type":"other",
-    "name":"vgmux_private_ip_2",
-    "xml":"<outcome value='vgmux_private_ip_2'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2320,
-    "y":1379,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "755943b8.1a105c"
-      ]
-    ]
-  },
-  {
-    "id":"861fd9c6.6015f8",
-    "type":"set",
-    "name":"set tmp.vgmux-lan-ip",
-    "xml":"<set>\n<parameter name='tmp.vgmux-lan-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>\n\n",
-    "comments":"",
-    "x":2540.9999771118164,
-    "y":1322.0000381469727,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"59dac422.4bc30c",
-    "type":"set",
-    "name":"set default assignments",
-    "xml":"<set>\n<parameter name='tmp.vni' value='123' />\n<parameter name='tmp.vgmux-bearer-ip' value='127.0.0.1' />\n<parameter name='tmp.vgmux-lan-ip' value='127.0.0.1' />",
-    "comments":"",
-    "x":1450,
-    "y":1177,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"338371c3.03166e",
-    "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.tx-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":900,
-    "y":545,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"40af5f1c.9055f",
-    "type":"call",
-    "name":"call GENERIC-RESOURCE-API:manage-vni-assignment",
-    "xml":"<call module='GENERIC-RESOURCE-API' rpc='manage-vni-assignment' mode='sync' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":1537,
-    "y":1322,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"d857982b.5cce48",
-    "type":"set",
-    "name":"set actions = reserve, pools = VNI, VGW",
-    "xml":"<set>\n<parameter name='tmp.manageVni.action' value='reserve' />\n<parameter name='tmp.manageIpaddr.action' value='reserve' />\n<parameter name='tmp.manageVni.pool' value='VNI'/>\n<parameter name='tmp.manageIpaddr.pool' value='VGW'/>",
-    "comments":"",
-    "x":1473,
-    "y":1268,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"bec51e2f.be8cc",
-    "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":824,
-    "y":680,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "eb1ff0c9.ef38e",
-        "99804d99.5a352"
-      ]
-    ]
-  },
-  {
-    "id":"30b6665f.e4a89a",
-    "type":"switchNode",
-    "name":"Does parent service instance have vnf parameters?",
-    "xml":"<switch test=\"`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length != ''`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1517,
-    "y":1218,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "a8ab7150.c4542"
-      ]
-    ]
-  },
-  {
-    "id":"a8ab7150.c4542",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1779,
-    "y":1220,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-        "be6a5ce7.0ed"
-      ]
-    ]
-  },
-  {
-    "id":"de53cfb9.dddbd",
-    "type":"call",
-    "name":"call GENERIC-RESOURCE-API:manage-ipaddr-assignment",
-    "xml":"<call module='GENERIC-RESOURCE-API' rpc='manage-ipaddr-assignment' mode='sync' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":1533,
-    "y":1369,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"abea3cf1.3111d",
-    "type":"set",
-    "name":"Handle tx parameters",
-    "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].name' value='VNI'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].value' value='`$tmp.manageVni.vni`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].name' value='vgmux_private_ip_2'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].value' value='`$tmp.vgmux-bearer-ip`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].name' value='vgmux_private_ip_0'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].value' value='`$tmp.vgmux-lan-ip`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].name' value='vgw_private_ip_0'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].value' value='`$tmp.manageIpaddr.ip`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters_length' value='4'/>\n\n",
-    "comments":"",
-    "x":1425,
-    "y":1458,
-    "z":"6d778d5b.c45f64",
-    "wires":[
-
-    ]
-  }
-]
\ No newline at end of file
+[{"id":"1ca16a80.2caae6","type":"dgstart","name":"DGSTART","outputs":1,"x":124,"y":75,"z":"1199f92b.84c70f","wires":[["b4f4cd99.19211"]]},{"id":"b4f4cd99.19211","type":"service-logic","name":"GENERIC-RESOURCE-API 1.2.0-SNAPSHOT-111501","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":220.23807907104492,"y":135.95239067077637,"z":"1199f92b.84c70f","wires":[["d56de4ee.d84328"]]},{"id":"d56de4ee.d84328","type":"method","name":"tunnelxconn-topology-operation-assign","xml":"<method rpc='tunnelxconn-topology-operation-assign' mode='sync'>\n","comments":"","outputs":1,"x":271.15485763549805,"y":171.19044589996338,"z":"1199f92b.84c70f","wires":[["d1f80a72.54dcb8"]]},{"id":"d1f80a72.54dcb8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":174.47619247436523,"y":314.5237879753113,"z":"1199f92b.84c70f","wires":[["3884d063.bf017","fec1a8b3.26b3b8","dc03e4ee.d84988","c7b45e35.5d99f8","c3103460.280e18"]]},{"id":"6305c3b7.10e66c","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":1017.6666564941406,"y":2241.5477046966553,"z":"1199f92b.84c70f","wires":[]},{"id":"9d5729f3.96cf18","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 + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":1054.7540550231934,"y":2120.432439804077,"z":"1199f92b.84c70f","wires":[]},{"id":"738ca6aa.bf5888","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":1141.9129028320312,"y":1504.0673217773438,"z":"1199f92b.84c70f","wires":[]},{"id":"fec1a8b3.26b3b8","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":620.738037109375,"y":182.33331298828125,"z":"1199f92b.84c70f","wires":[]},{"id":"3884d063.bf017","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n","comments":"","x":668.997314453125,"y":138.59259033203125,"z":"1199f92b.84c70f","wires":[]},{"id":"6fb8a35e.f42ca4","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":807.8148803710938,"y":354.26727294921875,"z":"1199f92b.84c70f","wires":[["28cd7780.0973c"]]},{"id":"295904fd.98be34","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.tx.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":1147.8626251220703,"y":1762.1008231639862,"z":"1199f92b.84c70f","wires":[["cb9d6154.6f8f1","231c9fc8.2d02a","2e60fcec.47401c"]]},{"id":"cb9d6154.6f8f1","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1416.5040016174316,"y":1813.4322349056602,"z":"1199f92b.84c70f","wires":[["f260fd29.62cf58"]]},{"id":"231c9fc8.2d02a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1407.504051208496,"y":1781.9322606548667,"z":"1199f92b.84c70f","wires":[["f260fd29.62cf58"]]},{"id":"2e60fcec.47401c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1411.2540893554688,"y":1752.289365530014,"z":"1199f92b.84c70f","wires":[["3a94b596.f511e2"]]},{"id":"f260fd29.62cf58","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":1573.254150390625,"y":1809.6822509765625,"z":"1199f92b.84c70f","wires":[]},{"id":"33187c4e.932ecc","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1157.5294189453125,"y":455.05291748046875,"z":"1199f92b.84c70f","wires":[]},{"id":"ce3cfb1b.f5d3d8","type":"comment","name":"Save consumed-allotted-resources to mdsal","info":"","comments":"","x":1184.2435302734375,"y":1277.7196044921875,"z":"1199f92b.84c70f","wires":[]},{"id":"8519e347.276768","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":530.8148193359375,"y":324.7672119140625,"z":"1199f92b.84c70f","wires":[]},{"id":"28cd7780.0973c","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 tunnelxconn-allotted-resource with order status of ' + $mdsal-ar.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n","comments":"","x":1117.129150390625,"y":349.6243896484375,"z":"1199f92b.84c70f","wires":[]},{"id":"6f7f8e99.efeab8","type":"set","name":"set tx-ar-identifiers","xml":"<set>\n<parameter name='tx-ar-identifiers.consuming-service-instance-id' value=\"`$tunnelxconn-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='tx-ar-identifiers.parent-service-instance-id' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='tx-ar-identifiers.allotted-resource-type' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='tx-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n","comments":"","x":1167.38623046875,"y":548.6243896484375,"z":"1199f92b.84c70f","wires":[]},{"id":"85ef761e.bb2e3","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":1194.338623046875,"y":507.338623046875,"z":"1199f92b.84c70f","wires":[]},{"id":"d94d86ae.bd2ba8","type":"set","name":"set identifiers in overall structure","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.' value=\"`$tx-ar-identifiers.`\" />\n\n\n","comments":"","x":1184.38623046875,"y":856.910400390625,"z":"1199f92b.84c70f","wires":[]},{"id":"4d3ca425.12572c","type":"set","name":"set ecomp model information from input","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.' \nvalue=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.`\" />\n\n\n","comments":"","x":1212.957763671875,"y":591.9100952148438,"z":"1199f92b.84c70f","wires":[]},{"id":"bdc469ae.366338","type":"switchNode","name":"switch model-invariant-uuid is null","xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>\n","comments":"","outputs":1,"x":1193.8148193359375,"y":631.195809841156,"z":"1199f92b.84c70f","wires":[["5ea1f53b.39ee54"]]},{"id":"5ea1f53b.39ee54","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1420.9576988220215,"y":632.6243271827698,"z":"1199f92b.84c70f","wires":[["c782a715.0e0b3"]]},{"id":"c782a715.0e0b3","type":"set","name":"set model-invariant-uuid","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-invariant-uuid' \nvalue=\"`$ar-model.invariant-uuid`\" />\n\n\n","comments":"","x":1622.38627243042,"y":632.0528798103333,"z":"1199f92b.84c70f","wires":[]},{"id":"86a14329.ea84b8","type":"switchNode","name":"switch model-uuid is null","xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>\n","comments":"","outputs":1,"x":1165.2434158325195,"y":665.4815106391907,"z":"1199f92b.84c70f","wires":[["53567faf.2247e8"]]},{"id":"53567faf.2247e8","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1366.6719818115234,"y":666.0529322624207,"z":"1199f92b.84c70f","wires":[["d22c735a.1eff98"]]},{"id":"d22c735a.1eff98","type":"set","name":"set model-uuid","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-uuid' \nvalue=\"`$ar-model.uuid`\" />\n\n\n","comments":"","x":1559.529140472412,"y":666.0528540611267,"z":"1199f92b.84c70f","wires":[]},{"id":"466f1f08.f7d4a8","type":"switchNode","name":"switch model-version is null","xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>\n","comments":"","outputs":1,"x":1173.8148193359375,"y":707.338623046875,"z":"1199f92b.84c70f","wires":[["a33759a6.7c7e48"]]},{"id":"a33759a6.7c7e48","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1423.8148002624512,"y":698.3386225700378,"z":"1199f92b.84c70f","wires":[["a1dd22b5.33d6d"]]},{"id":"a1dd22b5.33d6d","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":1616.6719589233398,"y":698.3385443687439,"z":"1199f92b.84c70f","wires":[]},{"id":"9057c540.68dbd","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.ecomp-generated-naming`'>\n","comments":"","outputs":1,"x":1237.38623046875,"y":800.7672729492188,"z":"1199f92b.84c70f","wires":[["335debba.1fe934","fe69e334.1d80a8"]]},{"id":"335debba.1fe934","type":"other","name":"outcome Y","xml":"<outcome value='Y'>\n","comments":"","outputs":1,"x":1523.3862915039062,"y":800.1958618164062,"z":"1199f92b.84c70f","wires":[["45257bd.1a2fa04"]]},{"id":"45257bd.1a2fa04","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":1677.1363525390625,"y":802.69580078125,"z":"1199f92b.84c70f","wires":[["bff7f73d.9b8c2"]]},{"id":"fe69e334.1d80a8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1542.608642578125,"y":889.1958618164062,"z":"1199f92b.84c70f","wires":[["565fbb98.b1aca4"]]},{"id":"565fbb98.b1aca4","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":1725.608642578125,"y":894.1958618164062,"z":"1199f92b.84c70f","wires":[]},{"id":"bff7f73d.9b8c2","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.naming-policy`'>\n","comments":"","outputs":1,"x":1813.38623046875,"y":851.767333984375,"z":"1199f92b.84c70f","wires":[["1f60cb20.1aa2cd","7b3bbb.df36bc44"]]},{"id":"1f60cb20.1aa2cd","type":"other","name":"outcome oam_network_policy","xml":"<outcome value='oam_network_policy'>\n","comments":"","outputs":1,"x":2188.244140625,"y":855.3453369140625,"z":"1199f92b.84c70f","wires":[["9c860bec.e0d66"]]},{"id":"7b3bbb.df36bc44","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2102.671875,"y":932.1958618164062,"z":"1199f92b.84c70f","wires":[["9c860bec.e0d66"]]},{"id":"5116d261.6590bc","type":"set","name":"set ar_name","xml":"<set>\n<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />\n","comments":"","x":2494.100830078125,"y":890.7672729492188,"z":"1199f92b.84c70f","wires":[]},{"id":"35817794.2e25d8","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":2638.2437858581543,"y":934.6244196891785,"z":"1199f92b.84c70f","wires":[[]]},{"id":"1501141a.25d134","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":2625.243896484375,"y":974.7672729492188,"z":"1199f92b.84c70f","wires":[[]]},{"id":"9c860bec.e0d66","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":2302.5292015075684,"y":930.3387522697449,"z":"1199f92b.84c70f","wires":[["5116d261.6590bc","35817794.2e25d8","1501141a.25d134","91c79897.77cff"]]},{"id":"91c79897.77cff","type":"set","name":"set identifiers.allotted-resource-name","xml":"<set>\n<parameter name='tx-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />\n","comments":"","x":2583.1005859375,"y":1025.052978515625,"z":"1199f92b.84c70f","wires":[]},{"id":"ea18351a.e0da4","type":"set","name":"set assignments in overall structure","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.' \nvalue=\"`$tx-ar-assignments.`\" />\n\n\n","comments":"","x":1159.8624267578125,"y":1233.6246337890625,"z":"1199f92b.84c70f","wires":[]},{"id":"c4d9f4e0.851328","type":"set","name":"Handle tx-ar-assignments","xml":"<set>\n<parameter name='tx-ar-assignments.vni' value='`$tmp.manageVni.vni`'/>\n<parameter name='tx-ar-assignments.vgmux-bearer-ip' value='`$tmp.vgmux-bearer-ip`'/>\n<parameter name='tx-ar-assignments.vgmux-lan-ip' value='`$tmp.vgmux-lan-ip`'/>\n<parameter name='tx-ar-assignments.vg-ip' value='`$tmp.manageIpaddr.ip`'/>\n\n","comments":"","x":1127.529052734375,"y":1153.052978515625,"z":"1199f92b.84c70f","wires":[]},{"id":"ca4f6251.f676b8","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":2210.8155822753906,"y":1335.0411586761475,"z":"1199f92b.84c70f","wires":[["d07b60e4.6703d"]]},{"id":"73b9e044.1a28b8","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":1216.8148193359375,"y":1328.505126953125,"z":"1199f92b.84c70f","wires":[["73760181.c95de","c367e332.923428"]]},{"id":"73760181.c95de","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1617.207763671875,"y":1307.1124267578125,"z":"1199f92b.84c70f","wires":[["1b189b0a.078ec5"]]},{"id":"c367e332.923428","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1609.957763671875,"y":1388.1124267578125,"z":"1199f92b.84c70f","wires":[["fd2f3b36.28b57"]]},{"id":"d07b60e4.6703d","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":2645.4106826782227,"y":1336.85085105896,"z":"1199f92b.84c70f","wires":[["a97263bc.410ad8"]]},{"id":"a97263bc.410ad8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2852.220375061035,"y":1340.064962387085,"z":"1199f92b.84c70f","wires":[["73531849.83f63"]]},{"id":"fd2f3b36.28b57","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1776.8349609375,"y":1382.488525390625,"z":"1199f92b.84c70f","wires":[["ca4f6251.f676b8","5ef04c10.686ff4"]]},{"id":"73531849.83f63","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":3020.4817276000977,"y":1344.9222631454468,"z":"1199f92b.84c70f","wires":[["85f4a2a6.ccdab"]]},{"id":"1b189b0a.078ec5","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":1802.0648193359375,"y":1310.32666015625,"z":"1199f92b.84c70f","wires":[]},{"id":"85f4a2a6.ccdab","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":3266.3391876220703,"y":1339.4937419891357,"z":"1199f92b.84c70f","wires":[]},{"id":"f16149e7.134fe","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=\"`$tunnelxconn-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":1152.6720123291016,"y":1387.826681137085,"z":"1199f92b.84c70f","wires":[]},{"id":"3a94b596.f511e2","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1552.910057067871,"y":1748.4815347194672,"z":"1199f92b.84c70f","wires":[[]]},{"id":"d73436ab.76504","type":"comment","name":"Add SZ AR to mdsal","info":"","comments":"","x":1079.148193359375,"y":1698.1956787109375,"z":"1199f92b.84c70f","wires":[]},{"id":"cabff161.c1c3f8","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.592529296875,"y":1447.2275390625,"z":"1199f92b.84c70f","wires":[[]]},{"id":"4ebb5534.09aedc","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":813.57666015625,"y":405.4814453125,"z":"1199f92b.84c70f","wires":[["e7607939.f160a8"]]},{"id":"b542ce05.d12118","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":761.57666015625,"y":901.2908325195312,"z":"1199f92b.84c70f","wires":[["f16149e7.134fe","cabff161.c1c3f8","738ca6aa.bf5888","295904fd.98be34","9d5729f3.96cf18","6305c3b7.10e66c","ae407ab9.d8441","33187c4e.932ecc","6f7f8e99.efeab8","4d3ca425.12572c","bdc469ae.366338","86a14329.ea84b8","466f1f08.f7d4a8","9057c540.68dbd","d94d86ae.bd2ba8","782f995b.c7ea4","1cd93a58.c40ea6","fe6f8a49.b66388","c4d9f4e0.851328","ea18351a.e0da4","73b9e044.1a28b8","fab7807f.a82bb8","ce575bb9.3832c8","c10b9954.5aad48","f67d8a3f.eb864","bb370f0b.999ba8"]]},{"id":"ae407ab9.d8441","type":"set","name":"set id","xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />","comments":"","x":1132.2434387207031,"y":411.433837890625,"z":"1199f92b.84c70f","wires":[]},{"id":"f67d8a3f.eb864","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\" />","comments":"","outputs":1,"x":1119.38623046875,"y":1625.799072265625,"z":"1199f92b.84c70f","wires":[["e851470f.6820c","a2e69f5d.317138"]]},{"id":"e851470f.6820c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1369.814842224121,"y":1612.5292553901672,"z":"1199f92b.84c70f","wires":[["10169d60.8e8cf3"]]},{"id":"10169d60.8e8cf3","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":1538.3387451171875,"y":1614.1483154296875,"z":"1199f92b.84c70f","wires":[]},{"id":"a2e69f5d.317138","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1380.91015625,"y":1667.291259765625,"z":"1199f92b.84c70f","wires":[["10169d60.8e8cf3"]]},{"id":"5ef04c10.686ff4","type":"switchNode","name":"switch tmp.found-cidx","xml":"<switch test='`$tmp.found-cidx`'>\n","comments":"","outputs":1,"x":2025.743423461914,"y":1581.2315921783447,"z":"1199f92b.84c70f","wires":[["110b5f4d.dfc181"]]},{"id":"110b5f4d.dfc181","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2215.743377685547,"y":1581.2315292358398,"z":"1199f92b.84c70f","wires":[["aa9b2d21.01bc9"]]},{"id":"aa9b2d21.01bc9","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2381.743377685547,"y":1581.2315292358398,"z":"1199f92b.84c70f","wires":[["c1ca7ac4.055b78"]]},{"id":"c1ca7ac4.055b78","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":2627.600706100464,"y":1581.8030033111572,"z":"1199f92b.84c70f","wires":[]},{"id":"9b8ea20.c5d2ae","type":"break","name":"break","xml":"<break/>\n","comments":"","x":3185.243408203125,"y":1384.731689453125,"z":"1199f92b.84c70f","wires":[]},{"id":"ea9a4916.25e128","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":1903.9521980285645,"y":1748.1904199123383,"z":"1199f92b.84c70f","wires":[["7ba04dee.e05774","30df0c18.2b414c","9b5f8936.710398"]]},{"id":"d07e3308.ff7ba8","type":"comment","name":"Rollback parent","info":"","comments":"","x":1747.9521255493164,"y":1717.8570504188538,"z":"1199f92b.84c70f","wires":[]},{"id":"7ba04dee.e05774","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2275.2602462768555,"y":1808.8553862571716,"z":"1199f92b.84c70f","wires":[["96ad59c0.bb63a"]]},{"id":"30df0c18.2b414c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2266.26029586792,"y":1777.3554120063782,"z":"1199f92b.84c70f","wires":[["96ad59c0.bb63a"]]},{"id":"9b5f8936.710398","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2270.0103340148926,"y":1747.7125168815255,"z":"1199f92b.84c70f","wires":[["96ad59c0.bb63a"]]},{"id":"96ad59c0.bb63a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2411.666301727295,"y":1743.9046860709786,"z":"1199f92b.84c70f","wires":[[]]},{"id":"91997441.0b5168","type":"comment","name":"Generate naming","info":"","comments":"","x":1168.3862762451172,"y":758.7672252655029,"z":"1199f92b.84c70f","wires":[]},{"id":"dc03e4ee.d84988","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":613,"y":227,"z":"1199f92b.84c70f","wires":[[]]},{"id":"e8e8f95a.c2474","type":"get-resource","name":"get-resource parent service instance","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.ar.parent-service-instance-id/service-data/' pfx='parent-service-instance' >\n","comments":"","outputs":1,"x":177,"y":535,"z":"1199f92b.84c70f","wires":[[]]},{"id":"574e94fb.ac4614","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":889,"y":502,"z":"1199f92b.84c70f","wires":[["b542ce05.d12118"]]},{"id":"93178853.42eb18","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":702,"y":603,"z":"1199f92b.84c70f","wires":[["b5b183ef.628608"]]},{"id":"b5b183ef.628608","type":"returnFailure","name":"return failure - parent service instance not found","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=\"`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`\" />\n","comments":"","x":629,"y":664,"z":"1199f92b.84c70f","wires":[]},{"id":"af858bf.c7af2f8","type":"for","name":"for parent vnf parameters","xml":"<for index='curidx' start='0' end='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length`' >\n","comments":"","outputs":1,"x":1679,"y":948,"z":"1199f92b.84c70f","wires":[["6cc5d5d9.577a24"]]},{"id":"6cc5d5d9.577a24","type":"switchNode","name":"switch parameter name","xml":"<switch test='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-name`'>\n","comments":"","outputs":1,"x":1801,"y":1040,"z":"1199f92b.84c70f","wires":[["40106979.3c1f68","6c9f5586.8d3acc"]]},{"id":"40106979.3c1f68","type":"other","name":"vgmux_private_ip_0","xml":"<outcome value='vgmux_private_ip_0'>\n","comments":"","outputs":1,"x":2027,"y":1044,"z":"1199f92b.84c70f","wires":[["b789fdcd.90ae68"]]},{"id":"e8306c65.d29578","type":"set","name":"set tmp.vgmux-bearer-ip","xml":"<set>\n<parameter name='tmp.vgmux-bearer-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>\n\n","comments":"","x":2259.9999771118164,"y":1105.0000400543213,"z":"1199f92b.84c70f","wires":[]},{"id":"6c9f5586.8d3acc","type":"other","name":"vgmux_private_ip_2","xml":"<outcome value='vgmux_private_ip_2'>\n","comments":"","outputs":1,"x":2029,"y":1104,"z":"1199f92b.84c70f","wires":[["e8306c65.d29578"]]},{"id":"b789fdcd.90ae68","type":"set","name":"set tmp.vgmux-lan-ip","xml":"<set>\n<parameter name='tmp.vgmux-lan-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>\n\n","comments":"","x":2249.9999771118164,"y":1047.0000381469727,"z":"1199f92b.84c70f","wires":[]},{"id":"782f995b.c7ea4","type":"set","name":"set default assignments","xml":"<set>\n<parameter name='tmp.vni' value='123' />\n<parameter name='tmp.vgmux-bearer-ip' value='127.0.0.1' />\n<parameter name='tmp.vgmux-lan-ip' value='127.0.0.1' />","comments":"","x":1159,"y":902,"z":"1199f92b.84c70f","wires":[]},{"id":"c7b45e35.5d99f8","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.tx-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":609,"y":270,"z":"1199f92b.84c70f","wires":[[]]},{"id":"fe6f8a49.b66388","type":"call","name":"call GENERIC-RESOURCE-API:manage-vni-assignment","xml":"<call module='GENERIC-RESOURCE-API' rpc='manage-vni-assignment' mode='sync' >\n","comments":"","outputs":1,"x":1225,"y":1023,"z":"1199f92b.84c70f","wires":[[]]},{"id":"1cd93a58.c40ea6","type":"set","name":"set actions = reserve, pools = VNI, VGW","xml":"<set>\n<parameter name='tmp.manageVni.action' value='reserve' />\n<parameter name='tmp.manageIpaddr.action' value='reserve' />\n<parameter name='tmp.manageVni.pool' value='VNI'/>\n<parameter name='tmp.manageIpaddr.pool' value='VGW'/>","comments":"","x":1178,"y":986,"z":"1199f92b.84c70f","wires":[]},{"id":"c3103460.280e18","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":533,"y":405,"z":"1199f92b.84c70f","wires":[["6fb8a35e.f42ca4","4ebb5534.09aedc"]]},{"id":"fab7807f.a82bb8","type":"switchNode","name":"Does parent service instance have vnf parameters?","xml":"<switch test=\"`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length != ''`\">\n","comments":"","outputs":1,"x":1226,"y":943,"z":"1199f92b.84c70f","wires":[["821280c.218ce8"]]},{"id":"821280c.218ce8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1488,"y":945,"z":"1199f92b.84c70f","wires":[["af858bf.c7af2f8"]]},{"id":"ce575bb9.3832c8","type":"call","name":"call GENERIC-RESOURCE-API:manage-ipaddr-assignment","xml":"<call module='GENERIC-RESOURCE-API' rpc='manage-ipaddr-assignment' mode='sync' >\n","comments":"","outputs":1,"x":1237,"y":1064,"z":"1199f92b.84c70f","wires":[[]]},{"id":"c10b9954.5aad48","type":"set","name":"Handle tx parameters","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].name' value='VNI'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].value' value='`$tmp.manageVni.vni`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].name' value='vgmux_private_ip_2'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].value' value='`$tmp.vgmux-bearer-ip`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].name' value='vgmux_private_ip_0'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].value' value='`$tmp.vgmux-lan-ip`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].name' value='vgw_private_ip_0'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].value' value='`$tmp.manageIpaddr.ip`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters_length' value='4'/>\n\n","comments":"","x":1124,"y":1193,"z":"1199f92b.84c70f","wires":[]},{"id":"97512ae7.66d038","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":232,"y":483,"z":"1199f92b.84c70f","wires":[]},{"id":"e7607939.f160a8","type":"call","name":"call  get-vnf-api-parent-instance","xml":"\n<call module='GENERIC-RESOURCE-API' rpc='get-vnf-api-parent-instance' mode='sync' >\n","comments":"","outputs":1,"x":629,"y":502,"z":"1199f92b.84c70f","wires":[["574e94fb.ac4614","93178853.42eb18"]]},{"id":"bb370f0b.999ba8","type":"set","name":"setservice data custid, svc instance, svc type","xml":"<set>\n<parameter name='service-data.service-information.global-customer-id' value='`$tunnelxconn-topology-operation-input.service-information.global-customer-id`' />\n<parameter name='service-data.service-information.subscription-service-type' value='`$tunnelxconn-topology-operation-input.service-information.subscription-service-type`' />\n<!--\n<parameter name='service-data.service-information.service-instance-id' value='`$tunnelxconn-topology-operation-input.service-information.service-instance-id`' />\n-->\n<parameter name='service-data.service-information.service-instance-id' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`\"/>","comments":"","x":1173.4443969726562,"y":1560.666748046875,"z":"1199f92b.84c70f","wires":[]},{"id":"81296acf.9afab8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":778.8888888888889,"y":1563.3333333333333,"z":"1199f92b.84c70f","wires":[]},{"id":"c87576f3.85ee38","type":"comment","name":"map input to service-data request info","info":"","comments":"","x":1453.3334350585938,"y":1538.888671875,"z":"1199f92b.84c70f","wires":[]},{"id":"f0b09585.ceb66","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n","comments":"","x":773,"y":1148,"z":"1199f92b.84c70f","wires":[]}]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml
index d03a1c30..dd10e543 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_get-vnf-api-parent-instance.xml
@@ -1,28 +1,20 @@
-<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-vnf-api-parent-instance' mode='sync'>
-        <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.search.parent-service-instance-id`'>
-                    <outcome value='true'>
-                        <block>
-                            <set>
-                                <parameter name='tmp.old-service-data.vnf-id' value='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.vnf-id`' />
-                            </set>
-                            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.vnf-id/service-data/' pfx='parent-service-instance' >
-                                <outcome value='failure'>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message"
-                                                   value="`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`" />
-                                    </return>
-                                </outcome>
-                            </get-resource>
-                        </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-vnf-api-parent-instance' mode='sync'>
+<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.search.parent-service-instance-id`'>
+
+
+<outcome value='true'>
+<block>
+<set>
+<parameter name='tmp.old-service-data.vnf-id' value='`$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.vnf-id`' />
+</set><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.vnfdata.vnfs.vnf-list[$vnfidx].service-data.vnf-id/service-data/' pfx='parent-service-instance' >
+																													<outcome value='failure'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" 
+    value="`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`" />
+</return></outcome></get-resource></block></outcome></switch></for></block></method></service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
index 3eae828d..666caad6 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
@@ -1,332 +1,277 @@
-<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='tunnelxconn-topology-operation-assign' mode='sync'>
-        <block atomic="true">
-            <set>
-                <parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-                <parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-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.tx-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'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message"
-                                   value="`'Existing tunnelxconn-allotted-resource with order status of ' + $mdsal-ar.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
-                    </return>
-                </outcome>
-                <outcome value='Other'>
-                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.ar.parent-service-instance-id/service-data/' pfx='parent-service-instance' >
-                        <outcome value='success'>
-                            <block atomic="true">
-                                <set>
-                                    <parameter name='tx-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-                                    <parameter name='tx-ar.allotted-resource-status.action' value="`$tunnelxconn-topology-operation-input.request-information.request-action` " />
-                                    <parameter name='tx-ar.allotted-resource-status.rpc-name' value="tunnelxconn-topology-operation" />
-                                    <parameter name='tx-ar.allotted-resource-status.rpc-action' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` " />
-                                    <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$tunnelxconn-topology-operation-input.request-information.` " />
-                                    <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.` " />
-                                    <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$tunnelxconn-topology-operation-input.service-information.` " />
-                                    <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.` " />
-                                    <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` " />
-                                </set>
-                                <set>
-                                    <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
-                                    <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />
-                                    <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
-                                </set>
-                                <set>
-                                    <parameter name='tx-ar-identifiers.consuming-service-instance-id' value="`$tunnelxconn-topology-operation-input.service-information.service-instance-id` " />
-                                    <parameter name='tx-ar-identifiers.parent-service-instance-id' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-                                    <parameter name='tx-ar-identifiers.allotted-resource-type' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
-                                    <parameter name='tx-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-                                </set>
-                                <set>
-                                    <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.'
-                                               value="`$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.`" />
-                                </set>
-                                <switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>
-                                    <outcome value=''>
-                                        <set>
-                                            <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-invariant-uuid'
-                                                       value="`$ar-model.invariant-uuid`" />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>
-                                    <outcome value=''>
-                                        <set>
-                                            <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-uuid'
-                                                       value="`$ar-model.uuid`" />
-                                        </set>
-                                    </outcome>
-                                </switch>
-                                <switch test='$tunnelxconn-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='tx-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='tx-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='tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.' value="`$tx-ar-identifiers.`" />
-                                </set>
-                                <set>
-                                    <parameter name='tmp.vni' value='123' />
-                                    <parameter name='tmp.vgmux-bearer-ip' value='127.0.0.1' />
-                                    <parameter name='tmp.vgmux-lan-ip' value='127.0.0.1' />
-                                </set>
-                                <switch test="`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length != ''`">
-                                    <outcome value='true'>
-                                        <for index='curidx' start='0' end='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length`' >
-                                            <switch test='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-name`'>
-                                                <outcome value='vgmux_private_ip_0'>
-                                                    <set>
-                                                        <parameter name='tmp.vgmux-lan-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='vgmux_private_ip_2'>
-                                                    <set>
-                                                        <parameter name='tmp.vgmux-bearer-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                        </for>
-                                    </outcome>
-                                </switch>
-                                <set>
-                                    <parameter name='tmp.manageVni.action' value='reserve' />
-                                    <parameter name='tmp.manageIpaddr.action' value='reserve' />
-                                    <parameter name='tmp.manageVni.pool' value='VNI'/>
-                                    <parameter name='tmp.manageIpaddr.pool' value='VGW'/>
-                                </set>
-                                <call module='GENERIC-RESOURCE-API' rpc='manage-vni-assignment' mode='sync' ></call>
-                                <call module='GENERIC-RESOURCE-API' rpc='manage-ipaddr-assignment' mode='sync' ></call>
-                                <set>
-                                    <parameter name='tx-ar-assignments.vni' value='`$tmp.manageVni.vni`'/>
-                                    <parameter name='tx-ar-assignments.vgmux-bearer-ip' value='`$tmp.vgmux-bearer-ip`'/>
-                                    <parameter name='tx-ar-assignments.vgmux-lan-ip' value='`$tmp.vgmux-lan-ip`'/>
-                                    <parameter name='tx-ar-assignments.vg-ip' value='`$tmp.manageIpaddr.ip`'/>
-                                </set>
-                                <set>
-                                    <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].name' value='VNI'/>
-                                    <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].value' value='`$tmp.manageVni.vni`'/>
-                                    <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].name' value='vgmux_private_ip_2'/>
-                                    <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].value' value='`$tmp.vgmux-bearer-ip`'/>
-                                    <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].name' value='vgmux_private_ip_0'/>
-                                    <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].value' value='`$tmp.vgmux-lan-ip`'/>
-                                    <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].name' value='vgw_private_ip_0'/>
-                                    <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].value' value='`$tmp.manageIpaddr.ip`'/>
-                                    <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters_length' value='4'/>
-                                </set>
-                                <set>
-                                    <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.'
-                                               value="`$tx-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>
-                                                        </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="`$tunnelxconn-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='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />
-                                    <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />
-                                    <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />
-                                    <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />
-                                    <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-                                </set>
-                                <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                        resource="allotted-resource"
-                                        key="customer.global-customer-id = $service-data.service-information.global-customer-id AND
+<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'><method rpc='tunnelxconn-topology-operation-assign' mode='sync'>
+<block atomic="true"><set>
+<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-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.tx-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'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" 
+    value="`'Existing tunnelxconn-allotted-resource with order status of ' + $mdsal-ar.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
+</return></outcome><outcome value='Other'>
+
+<call module='GENERIC-RESOURCE-API' rpc='get-vnf-api-parent-instance' mode='sync' >
+<outcome value='success'>
+<block atomic="true">
+<set>
+<parameter name='tx-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+<parameter name='tx-ar.allotted-resource-status.action' value="`$tunnelxconn-topology-operation-input.request-information.request-action` " />
+<parameter name='tx-ar.allotted-resource-status.rpc-name' value="tunnelxconn-topology-operation" />
+<parameter name='tx-ar.allotted-resource-status.rpc-action' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` " />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$tunnelxconn-topology-operation-input.request-information.` " />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.` " />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$tunnelxconn-topology-operation-input.service-information.` " />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.` " />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` " /></set><set>
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
+
+</set><set>
+<parameter name='tx-ar-identifiers.consuming-service-instance-id' value="`$tunnelxconn-topology-operation-input.service-information.service-instance-id` " />
+<parameter name='tx-ar-identifiers.parent-service-instance-id' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+<parameter name='tx-ar-identifiers.allotted-resource-type' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+<parameter name='tx-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+
+</set><set>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.' 
+value="`$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.`" />
+
+
+</set><switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>
+<outcome value=''>
+<set>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-invariant-uuid' 
+value="`$ar-model.invariant-uuid`" />
+
+
+</set></outcome></switch><switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>
+<outcome value=''>
+<set>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-uuid' 
+value="`$ar-model.uuid`" />
+
+
+</set></outcome></switch><switch test='$tunnelxconn-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='tx-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='tx-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='tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.' value="`$tx-ar-identifiers.`" />
+
+
+</set><set>
+<parameter name='tmp.vni' value='123' />
+<parameter name='tmp.vgmux-bearer-ip' value='127.0.0.1' />
+<parameter name='tmp.vgmux-lan-ip' value='127.0.0.1' /></set><switch test="`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length != ''`">
+<outcome value='true'>
+<for index='curidx' start='0' end='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length`' >
+<switch test='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-name`'>
+<outcome value='vgmux_private_ip_0'>
+<set>
+<parameter name='tmp.vgmux-lan-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>
+
+</set></outcome><outcome value='vgmux_private_ip_2'>
+<set>
+<parameter name='tmp.vgmux-bearer-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>
+
+</set></outcome></switch></for></outcome></switch><set>
+<parameter name='tmp.manageVni.action' value='reserve' />
+<parameter name='tmp.manageIpaddr.action' value='reserve' />
+<parameter name='tmp.manageVni.pool' value='VNI'/>
+<parameter name='tmp.manageIpaddr.pool' value='VGW'/></set><call module='GENERIC-RESOURCE-API' rpc='manage-vni-assignment' mode='sync' >
+</call><call module='GENERIC-RESOURCE-API' rpc='manage-ipaddr-assignment' mode='sync' >
+</call><set>
+<parameter name='tx-ar-assignments.vni' value='`$tmp.manageVni.vni`'/>
+<parameter name='tx-ar-assignments.vgmux-bearer-ip' value='`$tmp.vgmux-bearer-ip`'/>
+<parameter name='tx-ar-assignments.vgmux-lan-ip' value='`$tmp.vgmux-lan-ip`'/>
+<parameter name='tx-ar-assignments.vg-ip' value='`$tmp.manageIpaddr.ip`'/>
+
+</set><set>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].name' value='VNI'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].value' value='`$tmp.manageVni.vni`'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].name' value='vgmux_private_ip_2'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].value' value='`$tmp.vgmux-bearer-ip`'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].name' value='vgmux_private_ip_0'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].value' value='`$tmp.vgmux-lan-ip`'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].name' value='vgw_private_ip_0'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].value' value='`$tmp.manageIpaddr.ip`'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters_length' value='4'/>
+
+</set><set>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.' 
+value="`$tx-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></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="`$tunnelxconn-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='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+</set><set>
+<parameter name='service-data.service-information.global-customer-id' value='`$tunnelxconn-topology-operation-input.service-information.global-customer-id`' />
+<parameter name='service-data.service-information.subscription-service-type' value='`$tunnelxconn-topology-operation-input.service-information.subscription-service-type`' />
+<!--
+<parameter name='service-data.service-information.service-instance-id' value='`$tunnelxconn-topology-operation-input.service-information.service-instance-id`' />
+-->
+<parameter name='service-data.service-information.service-instance-id' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`"/></set><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource" 
+		key="customer.global-customer-id = $service-data.service-information.global-customer-id AND
 			service-subscription.service-type = $service-data.service-information.subscription-service-type AND
 			service-instance.service-instance-id = $service-data.service-information.service-instance-id AND
 			allotted-resource.id = $tmp.ar.allotted-resource-id"
-                                        pfx='pfx' local-only='false' force='false'>
-                                    <parameter name="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.tx.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 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/' + $tunnelxconn-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>
-                        <outcome value='Other'>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message"
-                                           value="`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`" />
-                            </return>
-                        </outcome>
-                    </get-resource>
-                </outcome>
-            </execute>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
+        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.tx.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 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/'
+ + $tunnelxconn-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><outcome value='Other'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" 
+    value="`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`" />
+</return></outcome></call></outcome></execute></block></method></service-logic>
-- 
2.16.6