integration test issues fix for sdwan and sotn

Modified sdwan  attachment DG to add allotted resource using service instance id  instead to parent service
Added get token nodes for create and deactivate DGs
wantport modified for error handling

Change-Id: I50e3fc824f915c3f8db55e33050ec4aca4d6ee58
Issue-ID: SDNC-357
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

Former-commit-id: 64f9bde54d81a48b53c2a8ef03c2d5688189bcbd

1 files changed, 450 insertions, 450 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
index b5d707a7..bd279399 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "44d87731.3a3c18",
+    "id": "ad2ef973.e6a378",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 95.0000228881836,
-    "y": 25,
-    "z": "9c3e2040.51e8d",
+    "x": 131,
+    "y": 55,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "6fd2c371.0f81ec"
+        "151183ce.27c78c"
       ]
     ]
   },
   {
-    "id": "6fd2c371.0f81ec",
+    "id": "151183ce.27c78c",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1282 +22,1282 @@
     "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": 278.00002670288086,
-    "y": 99.00001811981201,
-    "z": "9c3e2040.51e8d",
+    "x": 314.00000381469727,
+    "y": 129.000018119812,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "45f888b.a092e78"
+        "89afc74f.956348"
       ]
     ]
   },
   {
-    "id": "45f888b.a092e78",
+    "id": "89afc74f.956348",
     "type": "method",
     "name": "sdwan-attachment-topology-operation-create",
     "xml": "<method rpc='sdwan-attachment-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 266.0001449584961,
-    "y": 187.00000095367432,
-    "z": "9c3e2040.51e8d",
+    "x": 302.0001220703125,
+    "y": 217.00000095367432,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "13d40907.770c77"
+        "580de8c5.e06e78"
       ]
     ]
   },
   {
-    "id": "13d40907.770c77",
+    "id": "580de8c5.e06e78",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 186.0000762939453,
-    "y": 936.0002489089966,
-    "z": "9c3e2040.51e8d",
+    "x": 222.00005340576172,
+    "y": 966.0002489089966,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "7bc4c8b1.1d9f68",
-        "9cf88721.96ba18",
-        "f2e620b.7ad45e",
-        "5cd475b4.e29f6c",
-        "e3b4ab98.b00c28",
-        "31146b5a.f96304",
-        "337b8132.75507e",
-        "33eb09e.c2f17f6",
-        "d6792827.57dcf8",
-        "145b2990.9f1986",
-        "e23f7239.d2c",
-        "c7cc4539.500a68",
-        "eae0ae19.16041",
-        "d8cd962c.832e98",
-        "81f242e0.4cfb8",
-        "a785b9fe.8e2b78",
-        "e1b91be4.687fd8",
-        "6d2b2eaf.a08e",
-        "55176b7b.204274",
-        "e7eec3f2.e0455",
-        "a8dc15.338363e8",
-        "3040fa3e.5fdf76",
-        "48507d03.0cfd24"
+        "1fbb291d.155017",
+        "f8c6b86f.980db8",
+        "655b6d38.675514",
+        "87b8ca30.cf86e8",
+        "3718c342.00f4ac",
+        "3fc33b48.8d6bf4",
+        "15c0d821.288668",
+        "99b25b64.985da8",
+        "cc1d8a7e.c8e908",
+        "aec371b2.f4eb6",
+        "7c0d6a4c.141ba4",
+        "605ed84a.e90ef8",
+        "cf809c65.e205f",
+        "5ffc39de.e33178",
+        "b70e6d89.61807",
+        "2fe0bf35.0314b",
+        "4b90a515.ea737c",
+        "30825693.105b0a",
+        "a79587b.c624178",
+        "9d0211a4.58ce8",
+        "5c590a79.9e0264",
+        "adeabb6e.cf7758",
+        "7ee858c0.930c58"
       ]
     ]
   },
   {
-    "id": "b682cccd.903f2",
+    "id": "74beb7.011b0148",
     "type": "comment",
     "name": "Set allotted resource id if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 670.076774597168,
-    "y": 96.43391990661621,
-    "z": "9c3e2040.51e8d",
+    "x": 706.0767517089844,
+    "y": 126.43391990661621,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "7bc4c8b1.1d9f68",
+    "id": "1fbb291d.155017",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 616.0000534057617,
-    "y": 151.99999332427979,
-    "z": "9c3e2040.51e8d",
+    "x": 652.0000305175781,
+    "y": 181.99999332427979,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "576ebd26.f091e4",
-        "24a61a74.3f6846"
+        "4a85a033.b553c",
+        "de2e876a.0ba078"
       ]
     ]
   },
   {
-    "id": "576ebd26.f091e4",
+    "id": "4a85a033.b553c",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 814.0001411437988,
-    "y": 121.99998188018799,
-    "z": "9c3e2040.51e8d",
+    "x": 850.0001182556152,
+    "y": 151.999981880188,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "3df307a8.733fb8"
+        "63eb9d84.765954"
       ]
     ]
   },
   {
-    "id": "24a61a74.3f6846",
+    "id": "de2e876a.0ba078",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 813.0000495910645,
-    "y": 158.99999237060547,
-    "z": "9c3e2040.51e8d",
+    "x": 849.0000267028809,
+    "y": 188.99999237060547,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "318df0c4.63f14"
+        "eef884cd.26a128"
       ]
     ]
   },
   {
-    "id": "318df0c4.63f14",
+    "id": "eef884cd.26a128",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-id",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n",
     "comments": "",
-    "x": 1011.0000381469727,
-    "y": 156.0000114440918,
-    "z": "9c3e2040.51e8d",
+    "x": 1047.000015258789,
+    "y": 186.0000114440918,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "9cf88721.96ba18",
+    "id": "f8c6b86f.980db8",
     "type": "set",
     "name": "set tmp.ar.self-link",
     "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
     "comments": "",
-    "x": 583.9999771118164,
-    "y": 373.0001001358032,
-    "z": "9c3e2040.51e8d",
+    "x": 619.9999542236328,
+    "y": 403.0001001358032,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "f2e620b.7ad45e",
+    "id": "655b6d38.675514",
     "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": 584.2618942260742,
-    "y": 454.6667814254761,
-    "z": "9c3e2040.51e8d",
+    "x": 620.2618713378906,
+    "y": 484.6667814254761,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "5cd475b4.e29f6c",
+    "id": "87b8ca30.cf86e8",
     "type": "execute",
     "name": "generate allotted-resource tmp.ar-url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-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": 637.2619552612305,
-    "y": 541.6666994094849,
-    "z": "9c3e2040.51e8d",
+    "x": 673.2619323730469,
+    "y": 571.6666994094849,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "3df307a8.733fb8",
+    "id": "63eb9d84.765954",
     "type": "execute",
     "name": "execute tmp.ar.allotted-resource-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"tmp.ar.allotted-resource-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1029.0001182556152,
-    "y": 122.99998760223389,
-    "z": "9c3e2040.51e8d",
+    "x": 1065.0000953674316,
+    "y": 152.9999876022339,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "4abca60e.39e308"
+        "7fcc0333.e4b76c"
       ]
     ]
   },
   {
-    "id": "4abca60e.39e308",
+    "id": "7fcc0333.e4b76c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1247.0001602172852,
-    "y": 122.99995136260986,
-    "z": "9c3e2040.51e8d",
+    "x": 1283.0001373291016,
+    "y": 152.99995136260986,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "99c3fe86.a7edc"
+        "dc8faa82.0a80d8"
       ]
     ]
   },
   {
-    "id": "99c3fe86.a7edc",
+    "id": "dc8faa82.0a80d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation allotted resource ID\" />\n",
     "comments": "",
-    "x": 1413.000114440918,
-    "y": 122.99996566772461,
-    "z": "9c3e2040.51e8d",
+    "x": 1449.0000915527344,
+    "y": 152.9999656677246,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "4f647ff8.bc9ba",
+    "id": "83948a24.3af768",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1143.0002536773682,
-    "y": 613.7778720855713,
-    "z": "9c3e2040.51e8d",
+    "x": 1179.0002307891846,
+    "y": 643.7778720855713,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "926c698b.647238"
+        "64a66d0e.2cab24"
       ]
     ]
   },
   {
-    "id": "b4b47003.957fd",
+    "id": "fd6c452f.f52a18",
     "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: Existing connection attachment allotted resource\" />\n    \n",
     "comments": "",
-    "x": 1876.518632888794,
-    "y": 614.8439435958862,
-    "z": "9c3e2040.51e8d",
+    "x": 1912.5186100006104,
+    "y": 644.8439435958862,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "8e25385a.b2e448",
+    "id": "df1c313d.a9cf4",
     "type": "comment",
     "name": "Check for non existence of allotted resource",
     "info": "",
     "comments": "",
-    "x": 999.0001754760742,
-    "y": 547.7779388427734,
-    "z": "9c3e2040.51e8d",
+    "x": 1035.0001525878906,
+    "y": 577.7779388427734,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "164faa8f.422405",
+    "id": "3c6b3ac8.5f54b6",
     "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": 1519.6667213439941,
-    "y": 758.0000512599945,
-    "z": "9c3e2040.51e8d",
+    "x": 1555.6666984558105,
+    "y": 788.0000512599945,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "82bdbd96.1528d"
+        "e0e0a661.74b9e8"
       ]
     ]
   },
   {
-    "id": "31146b5a.f96304",
+    "id": "3fc33b48.8d6bf4",
     "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": 701.6660461425781,
-    "y": 734.7140836715698,
-    "z": "9c3e2040.51e8d",
+    "x": 737.6660232543945,
+    "y": 764.7140836715698,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "89e1b0e1.b280a",
-        "42609e0d.0b1fc"
+        "98246edb.9d503",
+        "303d6837.0384d8"
       ]
     ]
   },
   {
-    "id": "89e1b0e1.b280a",
+    "id": "98246edb.9d503",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1005.8089447021484,
-    "y": 703.5715208053589,
-    "z": "9c3e2040.51e8d",
+    "x": 1041.8089218139648,
+    "y": 733.5715208053589,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "d2a66fcc.9de12"
+        "1bc15eed.fd45b1"
       ]
     ]
   },
   {
-    "id": "42609e0d.0b1fc",
+    "id": "303d6837.0384d8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 982.8089942932129,
-    "y": 764.571475982666,
-    "z": "9c3e2040.51e8d",
+    "x": 1018.8089714050293,
+    "y": 794.571475982666,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "2a82891c.586b96"
+        "b930de42.50a21"
       ]
     ]
   },
   {
-    "id": "2a82891c.586b96",
+    "id": "b930de42.50a21",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1142.9360847473145,
-    "y": 762.697452545166,
-    "z": "9c3e2040.51e8d",
+    "x": 1178.9360618591309,
+    "y": 792.697452545166,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "164faa8f.422405",
-        "6d36a6c.f47fa58",
-        "eedafcbb.09c83"
+        "3c6b3ac8.5f54b6",
+        "7d532296.0d9bfc",
+        "6dd5cf93.f0258"
       ]
     ]
   },
   {
-    "id": "d2a66fcc.9de12",
+    "id": "1bc15eed.fd45b1",
     "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": 1155.665927886963,
-    "y": 701.2855710983276,
-    "z": "9c3e2040.51e8d",
+    "x": 1191.6659049987793,
+    "y": 731.2855710983276,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "337b8132.75507e",
+    "id": "15c0d821.288668",
     "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=\"`$connection-attachment-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": 630.5233383178711,
-    "y": 838.2856483459473,
-    "z": "9c3e2040.51e8d",
+    "x": 666.5233154296875,
+    "y": 868.2856483459473,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "6d36a6c.f47fa58",
+    "id": "7d532296.0d9bfc",
     "type": "switchNode",
     "name": "switch tmp.found-cidx",
     "xml": "<switch test='`$tmp.found-cidx`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1332.0511322021484,
-    "y": 794.708975315094,
-    "z": "9c3e2040.51e8d",
+    "x": 1368.0511093139648,
+    "y": 824.708975315094,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "23de8d9f.e2dd32"
+        "106270aa.e9c6ff"
       ]
     ]
   },
   {
-    "id": "23de8d9f.e2dd32",
+    "id": "106270aa.e9c6ff",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1522.0510864257812,
-    "y": 794.7089123725891,
-    "z": "9c3e2040.51e8d",
+    "x": 1558.0510635375977,
+    "y": 824.7089123725891,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "64af2897.2703a8"
+        "e1144596.6d5ba8"
       ]
     ]
   },
   {
-    "id": "64af2897.2703a8",
+    "id": "e1144596.6d5ba8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1688.0510864257812,
-    "y": 794.7089123725891,
-    "z": "9c3e2040.51e8d",
+    "x": 1724.0510635375977,
+    "y": 824.7089123725891,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "923cdb1e.68a888"
+        "b93f3869.6459e8"
       ]
     ]
   },
   {
-    "id": "82bdbd96.1528d",
+    "id": "e0e0a661.74b9e8",
     "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": 1936.7783508300781,
-    "y": 755.000078201294,
-    "z": "9c3e2040.51e8d",
+    "x": 1972.7783279418945,
+    "y": 785.000078201294,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "87fbbf54.c1a56"
+        "326d00a0.76b6c"
       ]
     ]
   },
   {
-    "id": "87fbbf54.c1a56",
+    "id": "326d00a0.76b6c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2118.5879249572754,
-    "y": 755.4645252227783,
-    "z": "9c3e2040.51e8d",
+    "x": 2154.587902069092,
+    "y": 785.4645252227783,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "98cf5592.16f948"
+        "cec76fbc.ec734"
       ]
     ]
   },
   {
-    "id": "923cdb1e.68a888",
+    "id": "b93f3869.6459e8",
     "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": 1849.9244689941406,
-    "y": 794.2206134796143,
-    "z": "9c3e2040.51e8d",
+    "x": 1885.924446105957,
+    "y": 824.2206134796143,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "b1e5bcf3.c8fd2",
+    "id": "9dc9afd9.071d8",
     "type": "comment",
     "name": "Add to consumed service consumed-allotted-resources in mdsal",
     "info": "Prepare data and add to service-data",
     "comments": "",
-    "x": 722.6672592163086,
-    "y": 665.0000476837158,
-    "z": "9c3e2040.51e8d",
+    "x": 758.667236328125,
+    "y": 695.0000476837158,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "7a7522d7.8a362c",
+    "id": "79d72e28.e5bf",
     "type": "comment",
     "name": "This set resource will be added to MDSAL by provider code",
     "info": "Below we add to service-data.consumed-allotted-resource at last index",
     "comments": "",
-    "x": 710.0001754760742,
-    "y": 803.7781400680542,
-    "z": "9c3e2040.51e8d",
+    "x": 746.0001525878906,
+    "y": 833.7781400680542,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "48507d03.0cfd24",
+    "id": "7ee858c0.930c58",
     "type": "update",
     "name": "save AAI allotted-resource",
-    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n    <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"role\" value=\"`$prop.connection-attachment.role`\" />\t\n    <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sdwanVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
+    "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.service-information.service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n        pfx='pfx' local-only='false' force='false'>\n    <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"role\" value=\"`$prop.connection-attachment.role`\" />\t\n    <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sdwanVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 620.6908798217773,
-    "y": 1763.531904220581,
-    "z": "9c3e2040.51e8d",
+    "x": 656.6908569335938,
+    "y": 1793.531904220581,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "d0cb3ffb.0f22",
-        "8cbfcb17.5674d8"
+        "54e2f563.b3af5c",
+        "291816ed.18393a"
       ]
     ]
   },
   {
-    "id": "d0cb3ffb.0f22",
+    "id": "54e2f563.b3af5c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 815.4528160095215,
-    "y": 1754.4845056533813,
-    "z": "9c3e2040.51e8d",
+    "x": 851.4527931213379,
+    "y": 1784.4845056533813,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "551edb9d.a56dc4"
+        "a3778d99.3c015"
       ]
     ]
   },
   {
-    "id": "551edb9d.a56dc4",
+    "id": "a3778d99.3c015",
     "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": 981.9766960144043,
-    "y": 1766.1035766601562,
-    "z": "9c3e2040.51e8d",
+    "x": 1017.9766731262207,
+    "y": 1796.1035766601562,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "8cbfcb17.5674d8",
+    "id": "291816ed.18393a",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 822.5481033325195,
-    "y": 1787.246473312378,
-    "z": "9c3e2040.51e8d",
+    "x": 858.5480804443359,
+    "y": 1817.246473312378,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "551edb9d.a56dc4"
+        "a3778d99.3c015"
       ]
     ]
   },
   {
-    "id": "7964b486.89bffc",
+    "id": "ac365c56.4b2",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 654.5005569458008,
-    "y": 1731.833875656128,
-    "z": "9c3e2040.51e8d",
+    "x": 690.5005340576172,
+    "y": 1761.833875656128,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "24a443b3.cdd5dc",
+    "id": "81ef7e04.cd917",
     "type": "comment",
     "name": "Set allotted resource type if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 656.0000228881836,
-    "y": 205.00000095367432,
-    "z": "9c3e2040.51e8d",
+    "x": 692,
+    "y": 235.00000095367432,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "e3b4ab98.b00c28",
+    "id": "3718c342.00f4ac",
     "type": "switchNode",
     "name": "switch allotted-resource-type",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 617.9233322143555,
-    "y": 245.5660572052002,
-    "z": "9c3e2040.51e8d",
+    "x": 653.9233093261719,
+    "y": 275.5660572052002,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "7cb47d8a.56e0d4",
-        "161c8b14.4822c5"
+        "64aa0e9c.b1d09",
+        "7800ea8d.a7f124"
       ]
     ]
   },
   {
-    "id": "7cb47d8a.56e0d4",
+    "id": "64aa0e9c.b1d09",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 820.9234848022461,
-    "y": 230.56606006622314,
-    "z": "9c3e2040.51e8d",
+    "x": 856.9234619140625,
+    "y": 260.56606006622314,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "b02b0441.1428c8"
+        "f530af4a.706e5"
       ]
     ]
   },
   {
-    "id": "161c8b14.4822c5",
+    "id": "7800ea8d.a7f124",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 813.9233131408691,
-    "y": 270.5660800933838,
-    "z": "9c3e2040.51e8d",
+    "x": 849.9232902526855,
+    "y": 300.5660800933838,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "40a66352.bcb05c"
+        "7a986711.0ca2d8"
       ]
     ]
   },
   {
-    "id": "40a66352.bcb05c",
+    "id": "7a986711.0ca2d8",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-type",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />\n",
     "comments": "",
-    "x": 1045.92329788208,
-    "y": 270.56608486175537,
-    "z": "9c3e2040.51e8d",
+    "x": 1081.9232749938965,
+    "y": 300.56608486175537,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "8a266541.a12688",
+    "id": "369cb772.706cb8",
     "type": "comment",
     "name": "For storage in AAI connection-attachment-topology",
     "info": "",
     "comments": "",
-    "x": 680.9999847412109,
-    "y": 340.0000009536743,
-    "z": "9c3e2040.51e8d",
+    "x": 716.9999618530273,
+    "y": 370.0000009536743,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "755897d2.b185f8",
+    "id": "492255d4.2adf4c",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 655.9999694824219,
-    "y": 421.8889102935791,
-    "z": "9c3e2040.51e8d",
+    "x": 691.9999465942383,
+    "y": 451.8889102935791,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "6815830a.cf38ec",
+    "id": "ddea3893.c96cd8",
     "type": "comment",
     "name": "Used for Put AR by id to MDSAL",
     "info": "",
     "comments": "",
-    "x": 622.0000534057617,
-    "y": 510.8889274597168,
-    "z": "9c3e2040.51e8d",
+    "x": 658.0000305175781,
+    "y": 540.8889274597168,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "6533f8ad.391638",
+    "id": "a440e95e.3176f8",
     "type": "comment",
     "name": "Obtain the last index in services",
     "info": "ServiceData is added by Provider code",
     "comments": "",
-    "x": 623.4444961547852,
-    "y": 696.8888721466064,
-    "z": "9c3e2040.51e8d",
+    "x": 659.4444732666016,
+    "y": 726.8888721466064,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "55176b7b.204274",
+    "id": "a79587b.c624178",
     "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='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
     "comments": "",
-    "x": 606.2681655883789,
-    "y": 1670.359203338623,
-    "z": "9c3e2040.51e8d",
+    "x": 642.2681427001953,
+    "y": 1700.359203338623,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "e7eec3f2.e0455",
+    "id": "9d0211a4.58ce8",
     "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": 574.6812515258789,
-    "y": 1832.9749298095703,
-    "z": "9c3e2040.51e8d",
+    "x": 610.6812286376953,
+    "y": 1862.9749298095703,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "b02b0441.1428c8",
+    "id": "f530af4a.706e5",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-type",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value=\"SDWANAttachmentInstance\" />\n",
     "comments": "",
-    "x": 1060.000171661377,
-    "y": 230.99998664855957,
-    "z": "9c3e2040.51e8d",
+    "x": 1096.0001487731934,
+    "y": 260.99998664855957,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "6d2b2eaf.a08e",
+    "id": "30825693.105b0a",
     "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.sdwan-attachment.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": 657.0002975463867,
-    "y": 1604.00013256073,
-    "z": "9c3e2040.51e8d",
+    "x": 693.0002746582031,
+    "y": 1634.00013256073,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "2544cf2e.7797d",
-        "d0176f37.1631f",
-        "3214e8f5.c864c8"
+        "7725804e.b7ea",
+        "ff126c78.d9f65",
+        "34ce7aa1.c96186"
       ]
     ]
   },
   {
-    "id": "2544cf2e.7797d",
+    "id": "7725804e.b7ea",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 906.6416511535645,
-    "y": 1642.3314628601074,
-    "z": "9c3e2040.51e8d",
+    "x": 942.6416282653809,
+    "y": 1672.3314628601074,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "93bb925b.d10a9"
+        "d7cd6db2.d2286"
       ]
     ]
   },
   {
-    "id": "d0176f37.1631f",
+    "id": "ff126c78.d9f65",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 897.6417007446289,
-    "y": 1610.831488609314,
-    "z": "9c3e2040.51e8d",
+    "x": 933.6416778564453,
+    "y": 1640.831488609314,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "93bb925b.d10a9"
+        "d7cd6db2.d2286"
       ]
     ]
   },
   {
-    "id": "3214e8f5.c864c8",
+    "id": "34ce7aa1.c96186",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 901.3917388916016,
-    "y": 1581.1885934844613,
-    "z": "9c3e2040.51e8d",
+    "x": 937.391716003418,
+    "y": 1611.1885934844613,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "92a0c9d6.d7b8b8"
+        "6ccc24c6.03b4dc"
       ]
     ]
   },
   {
-    "id": "93bb925b.d10a9",
+    "id": "d7cd6db2.d2286",
     "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 connection-attachment-allotted-resource\" />\n",
     "comments": "",
-    "x": 1067.3917388916016,
-    "y": 1611.5815124511719,
-    "z": "9c3e2040.51e8d",
+    "x": 1103.391716003418,
+    "y": 1641.5815124511719,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "92a0c9d6.d7b8b8",
+    "id": "6ccc24c6.03b4dc",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1043.047706604004,
-    "y": 1577.3807626739144,
-    "z": "9c3e2040.51e8d",
+    "x": 1079.0476837158203,
+    "y": 1607.3807626739144,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e23f7239.d2c",
+    "id": "7c0d6a4c.141ba4",
     "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='PUT' />\n    <parameter name=\"responsePrefix\" value=\"parent\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 721.9999771118164,
-    "y": 1120.000165939331,
-    "z": "9c3e2040.51e8d",
+    "x": 757.9999542236328,
+    "y": 1150.000165939331,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "42d4726.f4b8f8c",
-        "fcb14e51.71cdd",
-        "ed9689dc.1ce198"
+        "494a716e.866ba",
+        "227c3021.44dc4",
+        "ff8b452c.8d9bc8"
       ]
     ]
   },
   {
-    "id": "42d4726.f4b8f8c",
+    "id": "494a716e.866ba",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1030.3080368041992,
-    "y": 1151.998441696167,
-    "z": "9c3e2040.51e8d",
+    "x": 1066.3080139160156,
+    "y": 1181.998441696167,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "91022749.be6058"
+        "aaeb645f.80fed8"
       ]
     ]
   },
   {
-    "id": "fcb14e51.71cdd",
+    "id": "227c3021.44dc4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1021.3080863952637,
-    "y": 1120.4984674453735,
-    "z": "9c3e2040.51e8d",
+    "x": 1057.30806350708,
+    "y": 1150.4984674453735,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "91022749.be6058"
+        "aaeb645f.80fed8"
       ]
     ]
   },
   {
-    "id": "ed9689dc.1ce198",
+    "id": "ff8b452c.8d9bc8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1025.0581245422363,
-    "y": 1090.8555723205209,
-    "z": "9c3e2040.51e8d",
+    "x": 1061.0581016540527,
+    "y": 1120.8555723205209,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "c35c0848.28fbf8"
+        "74f3a310.0128fc"
       ]
     ]
   },
   {
-    "id": "91022749.be6058",
+    "id": "aaeb645f.80fed8",
     "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 connection-attachment-allotted-resource\" />\n",
     "comments": "",
-    "x": 1191.0581245422363,
-    "y": 1121.2484912872314,
-    "z": "9c3e2040.51e8d",
+    "x": 1227.0581016540527,
+    "y": 1151.2484912872314,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "c35c0848.28fbf8",
+    "id": "74f3a310.0128fc",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1166.7140922546387,
-    "y": 1087.047741509974,
-    "z": "9c3e2040.51e8d",
+    "x": 1202.714069366455,
+    "y": 1117.047741509974,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "bd46d511.3b0d08",
+    "id": "9405156b.c649a8",
     "type": "comment",
     "name": "Put the parent allotted resource in mdsal",
     "info": "",
     "comments": "",
-    "x": 650.9999237060547,
-    "y": 1082.000072479248,
-    "z": "9c3e2040.51e8d",
+    "x": 686.9999008178711,
+    "y": 1112.000072479248,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "eae0ae19.16041",
+    "id": "cf809c65.e205f",
     "type": "set",
     "name": "set connection-attachment-ar-identifiers",
     "xml": "<set>\n<parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value=\"`$connection-attachment-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n",
     "comments": "",
-    "x": 647.3571090698242,
-    "y": 1284.5716915130615,
-    "z": "9c3e2040.51e8d",
+    "x": 683.3570861816406,
+    "y": 1314.5716915130615,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "c7cc4539.500a68",
+    "id": "605ed84a.e90ef8",
     "type": "set",
     "name": "set ar-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.` \" />",
     "comments": "",
-    "x": 567.2139358520508,
-    "y": 1252.381194114685,
-    "z": "9c3e2040.51e8d",
+    "x": 603.2139129638672,
+    "y": 1282.381194114685,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "d8cd962c.832e98",
+    "id": "5ffc39de.e33178",
     "type": "set",
     "name": "set identifiers in overall structure",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' \nvalue=\"`$connection-attachment-ar-identifiers.`\" />\n\n\n",
     "comments": "",
-    "x": 626.1669082641602,
-    "y": 1318.6668767929077,
-    "z": "9c3e2040.51e8d",
+    "x": 662.1668853759766,
+    "y": 1348.6668767929077,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "81f242e0.4cfb8",
+    "id": "b70e6d89.61807",
     "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": 578.4997482299805,
-    "y": 1392.0004043579102,
-    "z": "9c3e2040.51e8d",
+    "x": 614.4997253417969,
+    "y": 1422.0004043579102,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "a785b9fe.8e2b78",
+    "id": "2fe0bf35.0314b",
     "type": "set",
     "name": "set allotted-resource-oper-status",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
     "comments": "",
-    "x": 629.4867858886719,
-    "y": 1447.9516372680664,
-    "z": "9c3e2040.51e8d",
+    "x": 665.4867630004883,
+    "y": 1477.9516372680664,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "e1b91be4.687fd8",
+    "id": "4b90a515.ea737c",
     "type": "set",
     "name": "set model-data",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
     "comments": "",
-    "x": 574.0554046630859,
-    "y": 1353.5557622909546,
-    "z": "9c3e2040.51e8d",
+    "x": 610.0553817749023,
+    "y": 1383.5557622909546,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "4b42ac54.3e0884",
+    "id": "a3fd3ef0.9cf2",
     "type": "comment",
     "name": "Prepare data for allotted-resource addition to MDSAL",
     "info": "This will add to allotted-resource which is present inside service.",
     "comments": "",
-    "x": 691.3888931274414,
-    "y": 1218.5556087493896,
-    "z": "9c3e2040.51e8d",
+    "x": 727.3888702392578,
+    "y": 1248.5556087493896,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "145b2990.9f1986",
+    "id": "aec371b2.f4eb6",
     "type": "execute",
     "name": "generate parent-ar url - replace allotted-resource-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.parent-ar-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.parent-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": 686.5000381469727,
-    "y": 1046.0000114440918,
-    "z": "9c3e2040.51e8d",
+    "x": 722.5000152587891,
+    "y": 1076.0000114440918,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "d6792827.57dcf8",
+    "id": "cc1d8a7e.c8e908",
     "type": "execute",
     "name": "generate parent-ar url - replace service-instance-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.parent-provided-resource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 682.4999618530273,
-    "y": 1003.000147819519,
-    "z": "9c3e2040.51e8d",
+    "x": 718.4999389648438,
+    "y": 1033.000147819519,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "78c9708b.d276a",
+    "id": "af622d17.e96e6",
     "type": "comment",
     "name": "Prepare Parent AR URL",
     "info": "Preparation to set provided-allotted-resource in parent service instance",
     "comments": "",
-    "x": 600.5004196166992,
-    "y": 932.0001010894775,
-    "z": "9c3e2040.51e8d",
+    "x": 636.5003967285156,
+    "y": 962.0001010894775,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "33eb09e.c2f17f6",
+    "id": "99b25b64.985da8",
     "type": "set",
     "name": "set tmp.ar.parent-service-instance-id",
     "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
     "comments": "",
-    "x": 639.5002136230469,
-    "y": 965.5000405311584,
-    "z": "9c3e2040.51e8d",
+    "x": 675.5001907348633,
+    "y": 995.5000405311584,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "98cf5592.16f948",
+    "id": "cec76fbc.ec734",
     "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 connection-attachment-allotted-resource as cosumed allotted resource already exists.\" />\n",
     "comments": "",
-    "x": 2196.756996154785,
-    "y": 803.645830154419,
-    "z": "9c3e2040.51e8d",
+    "x": 2232.7569732666016,
+    "y": 833.645830154419,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "eedafcbb.09c83",
+    "id": "6dd5cf93.f0258",
     "type": "set",
     "name": "set tmp.found-cidx",
     "xml": "<set>\n<parameter name='tmp.found-cidx' value=\"`false`\" />\n\n\n",
     "comments": "",
-    "x": 1322.646167755127,
-    "y": 715.3125731945038,
-    "z": "9c3e2040.51e8d",
+    "x": 1358.6461448669434,
+    "y": 745.3125731945038,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "e5b4f922.408cd8",
+    "id": "fcf58d3f.726c9",
     "type": "comment",
     "name": "Add to parent services provided-allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 711.201530456543,
-    "y": 899.9792575836182,
-    "z": "9c3e2040.51e8d",
+    "x": 747.2015075683594,
+    "y": 929.9792575836182,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "367dfa87.13b4b6",
+    "id": "edb39741.2151b8",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 631.9687194824219,
-    "y": 1185.9689378738403,
-    "z": "9c3e2040.51e8d",
+    "x": 667.9686965942383,
+    "y": 1215.9689378738403,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "926c698b.647238",
+    "id": "64a66d0e.2cab24",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1305.0000743865967,
-    "y": 613.2777614593506,
-    "z": "9c3e2040.51e8d",
+    "x": 1341.000051498413,
+    "y": 643.2777614593506,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "34cda0a8.01ed1"
+        "c5b1dd9f.c626c"
       ]
     ]
   },
   {
-    "id": "34cda0a8.01ed1",
+    "id": "c5b1dd9f.c626c",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1492.8574542999268,
-    "y": 613.8968968391418,
-    "z": "9c3e2040.51e8d",
+    "x": 1528.8574314117432,
+    "y": 643.8968968391418,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "4253f13d.3a8c2"
+        "dea64b0a.33d1a8"
       ]
     ]
   },
   {
-    "id": "4253f13d.3a8c2",
+    "id": "dea64b0a.33d1a8",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1692.1905765533447,
-    "y": 613.896975517273,
-    "z": "9c3e2040.51e8d",
+    "x": 1728.1905536651611,
+    "y": 643.896975517273,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "b4b47003.957fd"
+        "fd6c452f.f52a18"
       ]
     ]
   },
   {
-    "id": "a8dc15.338363e8",
+    "id": "5c590a79.9e0264",
     "type": "execute",
     "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
     "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": 777.0000762939453,
-    "y": 608.0000371932983,
-    "z": "9c3e2040.51e8d",
+    "x": 813.0000534057617,
+    "y": 638.0000371932983,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "4f647ff8.bc9ba",
-        "37dd5f16.a8f17"
+        "83948a24.3af768",
+        "a688402e.6a3a9"
       ]
     ]
   },
   {
-    "id": "37dd5f16.a8f17",
+    "id": "a688402e.6a3a9",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1145.0001068115234,
-    "y": 578.0000352859497,
-    "z": "9c3e2040.51e8d",
+    "x": 1181.0000839233398,
+    "y": 608.0000352859497,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "7fea5096.61664"
+        "a6697dc2.ce9f3"
       ]
     ]
   },
   {
-    "id": "7fea5096.61664",
+    "id": "a6697dc2.ce9f3",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1297.0001068115234,
-    "y": 577.0000352859497,
-    "z": "9c3e2040.51e8d",
+    "x": 1333.0000839233398,
+    "y": 607.0000352859497,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "3040fa3e.5fdf76",
+    "id": "adeabb6e.cf7758",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 583.0039443969727,
-    "y": 1523.2500038146973,
-    "z": "9c3e2040.51e8d",
+    "x": 619.0039215087891,
+    "y": 1553.2500038146973,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "a477b468.1a1198",
-        "df63659d.a31038"
+        "96f36120.1f9af",
+        "6b505cd5.c78924"
       ]
     ]
   },
   {
-    "id": "a477b468.1a1198",
+    "id": "96f36120.1f9af",
     "type": "for",
     "name": "for each sdwan-get-request-input-param",
     "xml": "<for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 918.0041427612305,
-    "y": 1469.2501260638237,
-    "z": "9c3e2040.51e8d",
+    "x": 954.0041198730469,
+    "y": 1499.2501260638237,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "f75d6e3.e38f69"
+        "7401fe63.179e9"
       ]
     ]
   },
   {
-    "id": "bcc416f0.2895c8",
+    "id": "4e61fb49.c94114",
     "type": "comment",
     "name": "Required for filling template values",
     "info": "This is done because connection-attachment is generic resource and doesn't have specific parameters",
     "comments": "",
-    "x": 940.4486465454102,
-    "y": 1503.0832867622375,
-    "z": "9c3e2040.51e8d",
+    "x": 976.4486236572266,
+    "y": 1533.0832867622375,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "40c178cb.5bcab8",
+    "id": "d4660c0f.147f3",
     "type": "comment",
     "name": "Remove VNFC prefix",
     "info": "",
     "comments": "",
-    "x": 1001.0039863586426,
-    "y": 1425.6944618225098,
-    "z": "9c3e2040.51e8d",
+    "x": 1037.003963470459,
+    "y": 1455.6944618225098,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "f75d6e3.e38f69",
+    "id": "7401fe63.179e9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1165.0039901733398,
-    "y": 1470.6943712234497,
-    "z": "9c3e2040.51e8d",
+    "x": 1201.0039672851562,
+    "y": 1500.6943712234497,
+    "z": "77e7049e.a5a37c",
     "wires": [
       [
-        "a64439d1.ae5a88",
-        "3b97b61d.424c1a"
+        "6a638cf5.ebb554",
+        "3e399a15.de4336"
       ]
     ]
   },
   {
-    "id": "9ddd821f.74043",
+    "id": "50ce4566.040d7c",
     "type": "comment",
     "name": "Take the parameter names by removing prefix",
     "info": "",
     "comments": "",
-    "x": 1433.0038375854492,
-    "y": 1386.250369310379,
-    "z": "9c3e2040.51e8d",
+    "x": 1469.0038146972656,
+    "y": 1416.250369310379,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "a64439d1.ae5a88",
+    "id": "6a638cf5.ebb554",
     "type": "execute",
     "name": "execute split parameterName",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1384.0385055541992,
-    "y": 1421.2294654846191,
-    "z": "9c3e2040.51e8d",
+    "x": 1420.0384826660156,
+    "y": 1451.2294654846191,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]
   },
   {
-    "id": "3b97b61d.424c1a",
+    "id": "3e399a15.de4336",
     "type": "set",
     "name": "set parameterName",
     "xml": "<set>\n<parameter name=\"`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
     "comments": "",
-    "x": 1372.4829788208008,
-    "y": 1525.2294359207153,
-    "z": "9c3e2040.51e8d",
+    "x": 1408.4829559326172,
+    "y": 1555.2294359207153,
+    "z": "77e7049e.a5a37c",
     "wires": []
   },
   {
-    "id": "df63659d.a31038",
+    "id": "6b505cd5.c78924",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sdwan-get-saved-ar-param",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-saved-ar-param' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 959.0039901733398,
-    "y": 1543.2500658035278,
-    "z": "9c3e2040.51e8d",
+    "x": 995.0039672851562,
+    "y": 1573.2500658035278,
+    "z": "77e7049e.a5a37c",
     "wires": [
       []
     ]