From 07d173c059f15fe9959deec9650246b173a3b50c Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Fri, 24 Aug 2018 19:21:33 +0530
Subject: SDWAN flow based end-end test and issue fix

SDWAN DGs and restapi templates issue fixes

Change-Id: I5d1d4e6cb17e9b187ea4f0942ca837472738fe62
Issue-ID: SDNC-357
Signed-off-by: Prakash.E <prakash.e@huawei.com>

Former-commit-id: b1da373ad0e08400b4c1f2a8cfbb69524df745a2
---
 ...sdwan-attachment-topology-operation-create.json | 897 +++++++++++----------
 1 file changed, 449 insertions(+), 448 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json')

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 1e6cf419..8dbd089a 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": "61863820.711ea8",
+    "id": "d0edaee0.371d2",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 88,
-    "y": 36,
-    "z": "8a925a2b.b01bd8",
+    "x": 130.00390625,
+    "y": 68.99999856948853,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "14f9537d.79772d"
+        "ccac73a.016209"
       ]
     ]
   },
   {
-    "id": "14f9537d.79772d",
+    "id": "ccac73a.016209",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1281 +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": 271.00000381469727,
-    "y": 110.00001811981201,
-    "z": "8a925a2b.b01bd8",
+    "x": 313.00391006469727,
+    "y": 143.00001668930054,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "d19b9445.194798"
+        "20c8ba03.7fc266"
       ]
     ]
   },
   {
-    "id": "d19b9445.194798",
+    "id": "20c8ba03.7fc266",
     "type": "method",
     "name": "sdwan-attachment-topology-operation-create",
     "xml": "<method rpc='sdwan-attachment-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 259.0001220703125,
-    "y": 198.00000095367432,
-    "z": "8a925a2b.b01bd8",
+    "x": 301.0040283203125,
+    "y": 230.99999952316284,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "3526110c.60448e"
+        "7fb8a0a8.cc16e"
       ]
     ]
   },
   {
-    "id": "3526110c.60448e",
+    "id": "7fb8a0a8.cc16e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 179.00005340576172,
-    "y": 947.0002489089966,
-    "z": "8a925a2b.b01bd8",
+    "x": 221.00395965576172,
+    "y": 980.0002474784851,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "99952776.e81ae8",
-        "9b94537c.a4dfa",
-        "9596dbd6.648298",
-        "636ccd57.e35144",
-        "43bd9b90.f9bb04",
-        "4e3d9f6f.e48ca",
-        "a91b49df.3ab368",
-        "af03f775.1849d8",
-        "a399f576.497928",
-        "86a651b6.fa2c1",
-        "27a69ba7.020164",
-        "e417171b.b17d78",
-        "a85450f9.54be5",
-        "8337596d.6afa48",
-        "5db0bc82.831f24",
-        "757f6754.1033f8",
-        "e6e8c666.3550b8",
-        "7955fe12.58b57",
-        "9077e61b.e6a3a8",
-        "8e980e4e.121e8",
-        "8bf022a6.d0cbb",
-        "3aa5d5fd.f4649a"
+        "2437dbcf.331264",
+        "730eea74.2853a4",
+        "3eb4cc5.e84ab34",
+        "98a0f1ed.ad821",
+        "48d3a6f4.7a9f68",
+        "5e870da5.d4b9c4",
+        "f395bfa7.29021",
+        "a35c1852.b6d228",
+        "128728fe.ad5877",
+        "7f796e7c.de4f4",
+        "52f115fe.31e7bc",
+        "6a649bce.b1cf84",
+        "549597d0.2434c8",
+        "b67f723e.a2fdd",
+        "e622a70a.fb3f98",
+        "3c5561ef.3b198e",
+        "34b5882f.c7cb48",
+        "273cbd63.ba5da2",
+        "7cadc884.11c378",
+        "f028e514.462408",
+        "2fe2b50e.b3feea",
+        "b0371fd5.a7b76",
+        "fdbceac6.217498"
       ]
     ]
   },
   {
-    "id": "aa8c6e8b.e30e",
+    "id": "ce81891c.9bbbd8",
     "type": "comment",
     "name": "Set allotted resource id if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 663.0767517089844,
-    "y": 107.43391990661621,
-    "z": "8a925a2b.b01bd8",
+    "x": 705.0806579589844,
+    "y": 140.43391847610474,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "99952776.e81ae8",
+    "id": "2437dbcf.331264",
     "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": 609.0000305175781,
-    "y": 162.99999332427979,
-    "z": "8a925a2b.b01bd8",
+    "x": 651.0039367675781,
+    "y": 195.9999918937683,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "6811d51c.3757dc",
-        "513b9b13.594134"
+        "ae4415d.9e44fe8",
+        "c8d7b3ce.5e5a2"
       ]
     ]
   },
   {
-    "id": "6811d51c.3757dc",
+    "id": "ae4415d.9e44fe8",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 807.0001182556152,
-    "y": 132.999981880188,
-    "z": "8a925a2b.b01bd8",
+    "x": 849.0040245056152,
+    "y": 165.9999804496765,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "7f9fc121.cd5a5"
+        "349de4b3.2e578c"
       ]
     ]
   },
   {
-    "id": "513b9b13.594134",
+    "id": "c8d7b3ce.5e5a2",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 806.0000267028809,
-    "y": 169.99999237060547,
-    "z": "8a925a2b.b01bd8",
+    "x": 848.0039329528809,
+    "y": 202.999990940094,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "28a76577.73245a"
+        "106c46a5.0a2af9"
       ]
     ]
   },
   {
-    "id": "28a76577.73245a",
+    "id": "106c46a5.0a2af9",
     "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": 1004.0000152587891,
-    "y": 167.0000114440918,
-    "z": "8a925a2b.b01bd8",
+    "x": 1046.003921508789,
+    "y": 200.00001001358032,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "9b94537c.a4dfa",
+    "id": "730eea74.2853a4",
     "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": 576.9999542236328,
-    "y": 384.0001001358032,
-    "z": "8a925a2b.b01bd8",
+    "x": 619.0038604736328,
+    "y": 417.00009870529175,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "9596dbd6.648298",
+    "id": "3eb4cc5.e84ab34",
     "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": 577.2618713378906,
-    "y": 465.6667814254761,
-    "z": "8a925a2b.b01bd8",
+    "x": 619.2657775878906,
+    "y": 498.6667799949646,
+    "z": "28b033ee.a901cc",
     "wires": [
       []
     ]
   },
   {
-    "id": "636ccd57.e35144",
+    "id": "98a0f1ed.ad821",
     "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": 630.2619323730469,
-    "y": 552.6666994094849,
-    "z": "8a925a2b.b01bd8",
+    "x": 672.2658386230469,
+    "y": 585.6666979789734,
+    "z": "28b033ee.a901cc",
     "wires": [
       []
     ]
   },
   {
-    "id": "7f9fc121.cd5a5",
+    "id": "349de4b3.2e578c",
     "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": 1022.0000953674316,
-    "y": 133.9999876022339,
-    "z": "8a925a2b.b01bd8",
+    "x": 1064.0040016174316,
+    "y": 166.9999861717224,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "88221720.7c95b8"
+        "5d37f876.0cc698"
       ]
     ]
   },
   {
-    "id": "88221720.7c95b8",
+    "id": "5d37f876.0cc698",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1240.0001373291016,
-    "y": 133.99995136260986,
-    "z": "8a925a2b.b01bd8",
+    "x": 1282.0040435791016,
+    "y": 166.9999499320984,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "aa4b0ebd.72265"
+        "b5e2a2dc.0d71c"
       ]
     ]
   },
   {
-    "id": "aa4b0ebd.72265",
+    "id": "b5e2a2dc.0d71c",
     "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": 1406.0000915527344,
-    "y": 133.9999656677246,
-    "z": "8a925a2b.b01bd8",
+    "x": 1448.0039978027344,
+    "y": 166.99996423721313,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "1ec18fe8.aa439",
+    "id": "8f7a89d.e442878",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1136.0002307891846,
-    "y": 624.7778720855713,
-    "z": "8a925a2b.b01bd8",
+    "x": 1178.0041370391846,
+    "y": 657.7778706550598,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "14fc1138.5da1ef"
+        "b23dd04a.37b72"
       ]
     ]
   },
   {
-    "id": "9378fa3a.19c018",
+    "id": "7072a3ba.59cbcc",
     "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": 1869.5186100006104,
-    "y": 625.8439435958862,
-    "z": "8a925a2b.b01bd8",
+    "x": 1911.5225162506104,
+    "y": 658.8439421653748,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "b12c1e8e.81e23",
+    "id": "3b5bc99a.d557b6",
     "type": "comment",
     "name": "Check for non existence of allotted resource",
     "info": "",
     "comments": "",
-    "x": 992.0001525878906,
-    "y": 558.7779388427734,
-    "z": "8a925a2b.b01bd8",
+    "x": 1034.0040588378906,
+    "y": 591.777937412262,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "da203e6.ea028c",
+    "id": "340e57cb.5c86a8",
     "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": 1512.6666984558105,
-    "y": 769.0000512599945,
-    "z": "8a925a2b.b01bd8",
+    "x": 1554.6706047058105,
+    "y": 802.000049829483,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "98ae415a.0e4e6"
+        "3cebd63.269772a"
       ]
     ]
   },
   {
-    "id": "4e3d9f6f.e48ca",
+    "id": "5e870da5.d4b9c4",
     "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": 694.6660232543945,
-    "y": 745.7140836715698,
-    "z": "8a925a2b.b01bd8",
+    "x": 736.6699295043945,
+    "y": 778.7140822410583,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "210abe50.d12562",
-        "fd87de34.5f561"
+        "9df6142.79785e8",
+        "58099c96.2c7e34"
       ]
     ]
   },
   {
-    "id": "210abe50.d12562",
+    "id": "9df6142.79785e8",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 998.8089218139648,
-    "y": 714.5715208053589,
-    "z": "8a925a2b.b01bd8",
+    "x": 1040.8128280639648,
+    "y": 747.5715193748474,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "230c326a.73559e"
+        "be192375.06e28"
       ]
     ]
   },
   {
-    "id": "fd87de34.5f561",
+    "id": "58099c96.2c7e34",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 975.8089714050293,
-    "y": 775.571475982666,
-    "z": "8a925a2b.b01bd8",
+    "x": 1017.8128776550293,
+    "y": 808.5714745521545,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "6fcbf8ba.f19558"
+        "96b3b48a.902058"
       ]
     ]
   },
   {
-    "id": "6fcbf8ba.f19558",
+    "id": "96b3b48a.902058",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1135.9360618591309,
-    "y": 773.697452545166,
-    "z": "8a925a2b.b01bd8",
+    "x": 1177.9399681091309,
+    "y": 806.6974511146545,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "da203e6.ea028c",
-        "aac67e51.e0669",
-        "1472489a.f6dd67"
+        "340e57cb.5c86a8",
+        "718d194e.2e6788",
+        "a28f94f9.cae788"
       ]
     ]
   },
   {
-    "id": "230c326a.73559e",
+    "id": "be192375.06e28",
     "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": 1148.6659049987793,
-    "y": 712.2855710983276,
-    "z": "8a925a2b.b01bd8",
+    "x": 1190.6698112487793,
+    "y": 745.2855696678162,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "a91b49df.3ab368",
+    "id": "f395bfa7.29021",
     "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": 623.5233154296875,
-    "y": 849.2856483459473,
-    "z": "8a925a2b.b01bd8",
+    "x": 665.5272216796875,
+    "y": 882.2856469154358,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "aac67e51.e0669",
+    "id": "718d194e.2e6788",
     "type": "switchNode",
     "name": "switch tmp.found-cidx",
     "xml": "<switch test='`$tmp.found-cidx`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1325.0511093139648,
-    "y": 805.708975315094,
-    "z": "8a925a2b.b01bd8",
+    "x": 1367.0550155639648,
+    "y": 838.7089738845825,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "83192091.f2dbe"
+        "144fdd18.b7f4c3"
       ]
     ]
   },
   {
-    "id": "83192091.f2dbe",
+    "id": "144fdd18.b7f4c3",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1515.0510635375977,
-    "y": 805.7089123725891,
-    "z": "8a925a2b.b01bd8",
+    "x": 1557.0549697875977,
+    "y": 838.7089109420776,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "edcd9f1b.5f174"
+        "67e912a8.6bc78c"
       ]
     ]
   },
   {
-    "id": "edcd9f1b.5f174",
+    "id": "67e912a8.6bc78c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1681.0510635375977,
-    "y": 805.7089123725891,
-    "z": "8a925a2b.b01bd8",
+    "x": 1723.0549697875977,
+    "y": 838.7089109420776,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "41ea1034.cd583"
+        "95e82f8c.b9b06"
       ]
     ]
   },
   {
-    "id": "98ae415a.0e4e6",
+    "id": "3cebd63.269772a",
     "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": 1929.7783279418945,
-    "y": 766.000078201294,
-    "z": "8a925a2b.b01bd8",
+    "x": 1971.7822341918945,
+    "y": 799.0000767707825,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "f6ba2e93.3a869"
+        "77a3d234.ab1d9c"
       ]
     ]
   },
   {
-    "id": "f6ba2e93.3a869",
+    "id": "77a3d234.ab1d9c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2111.587902069092,
-    "y": 766.4645252227783,
-    "z": "8a925a2b.b01bd8",
+    "x": 2153.591808319092,
+    "y": 799.4645237922668,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "135a37d3.398c28"
+        "c2bb18ee.6afb98"
       ]
     ]
   },
   {
-    "id": "41ea1034.cd583",
+    "id": "95e82f8c.b9b06",
     "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": 1842.924446105957,
-    "y": 805.2206134796143,
-    "z": "8a925a2b.b01bd8",
+    "x": 1884.928352355957,
+    "y": 838.2206120491028,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "3a0c681c.87b8c8",
+    "id": "f6050ba6.e3a988",
     "type": "comment",
     "name": "Add to consumed service consumed-allotted-resources in mdsal",
     "info": "Prepare data and add to service-data",
     "comments": "",
-    "x": 715.667236328125,
-    "y": 676.0000476837158,
-    "z": "8a925a2b.b01bd8",
+    "x": 757.671142578125,
+    "y": 709.0000462532043,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "4601b662.be85f8",
+    "id": "950d939a.d6aa9",
     "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": 703.0001525878906,
-    "y": 814.7781400680542,
-    "z": "8a925a2b.b01bd8",
+    "x": 745.0040588378906,
+    "y": 847.7781386375427,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "6c13b6ba.f1d808",
+    "id": "fdbceac6.217498",
     "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 = $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=\"name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"access-provider-id\" value=\"`$prop.connection-attachment.access-provider-id`\" />\n\t<parameter name=\"access-client-id\" value=\"`$prop.connection-attachment.access-client-id`\" />\n\t<parameter name=\"access-topology-id\" value=\"`$prop.connection-attachment.access-topology-id`\" />\n\t<parameter name=\"access-node-id\" value=\"`$prop.connection-attachment.access-node-id`\" />\n\t<parameter name=\"access-ltp-id\" value=\"`$prop.connection-attachment.access-ltp-id`\" />\t\n\t<parameter name=\"cvlan\" value=\"`$prop.connection-attachment.cVLAN`\" />\n    <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\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": 613.6908569335938,
-    "y": 1774.531904220581,
-    "z": "8a925a2b.b01bd8",
+    "x": 655.6947631835938,
+    "y": 1807.5319027900696,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "cc11f86f.a05c98",
-        "2748d678.9b155a"
+        "49ae8647.6b2328",
+        "62f42f4e.42781"
       ]
     ]
   },
   {
-    "id": "cc11f86f.a05c98",
+    "id": "49ae8647.6b2328",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 808.4527931213379,
-    "y": 1765.4845056533813,
-    "z": "8a925a2b.b01bd8",
+    "x": 850.4566993713379,
+    "y": 1798.4845042228699,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "ad7d0ba7.e370e8"
+        "c8a49936.3deaf8"
       ]
     ]
   },
   {
-    "id": "ad7d0ba7.e370e8",
+    "id": "c8a49936.3deaf8",
     "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": 974.9766731262207,
-    "y": 1777.1035766601562,
-    "z": "8a925a2b.b01bd8",
+    "x": 1016.9805793762207,
+    "y": 1810.1035752296448,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "2748d678.9b155a",
+    "id": "62f42f4e.42781",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 815.5480804443359,
-    "y": 1798.246473312378,
-    "z": "8a925a2b.b01bd8",
+    "x": 857.5519866943359,
+    "y": 1831.2464718818665,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "ad7d0ba7.e370e8"
+        "c8a49936.3deaf8"
       ]
     ]
   },
   {
-    "id": "65ec4e22.c3de6",
+    "id": "f380425c.83892",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 647.5005340576172,
-    "y": 1742.833875656128,
-    "z": "8a925a2b.b01bd8",
+    "x": 689.5044403076172,
+    "y": 1775.8338742256165,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "cf325757.026c08",
+    "id": "c58c2e54.58ab4",
     "type": "comment",
     "name": "Set allotted resource type if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 649,
-    "y": 216.00000095367432,
-    "z": "8a925a2b.b01bd8",
+    "x": 691.00390625,
+    "y": 248.99999952316284,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "43bd9b90.f9bb04",
+    "id": "48d3a6f4.7a9f68",
     "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": 610.9233093261719,
-    "y": 256.5660572052002,
-    "z": "8a925a2b.b01bd8",
+    "x": 652.9272155761719,
+    "y": 289.5660557746887,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "b8faf677.a88b58",
-        "cb37a8ac.844d88"
+        "a5628a44.6843d8",
+        "9e87888a.c266e8"
       ]
     ]
   },
   {
-    "id": "b8faf677.a88b58",
+    "id": "a5628a44.6843d8",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 813.9234619140625,
-    "y": 241.56606006622314,
-    "z": "8a925a2b.b01bd8",
+    "x": 855.9273681640625,
+    "y": 274.56605863571167,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "fb16264e.206978"
+        "eafc3b17.674668"
       ]
     ]
   },
   {
-    "id": "cb37a8ac.844d88",
+    "id": "9e87888a.c266e8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 806.9232902526855,
-    "y": 281.5660800933838,
-    "z": "8a925a2b.b01bd8",
+    "x": 848.9271965026855,
+    "y": 314.5660786628723,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "46a12ee1.3eb2e"
+        "1455473e.f663e9"
       ]
     ]
   },
   {
-    "id": "46a12ee1.3eb2e",
+    "id": "1455473e.f663e9",
     "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": 1038.9232749938965,
-    "y": 281.56608486175537,
-    "z": "8a925a2b.b01bd8",
+    "x": 1080.9271812438965,
+    "y": 314.5660834312439,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "e0d4b358.f0111",
+    "id": "f29b8b09.a0de68",
     "type": "comment",
     "name": "For storage in AAI connection-attachment-topology",
     "info": "",
     "comments": "",
-    "x": 673.9999618530273,
-    "y": 351.0000009536743,
-    "z": "8a925a2b.b01bd8",
+    "x": 716.0038681030273,
+    "y": 383.99999952316284,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "2c1dc14e.d8696e",
+    "id": "c8d768ea.3ebd78",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 648.9999465942383,
-    "y": 432.8889102935791,
-    "z": "8a925a2b.b01bd8",
+    "x": 691.0038528442383,
+    "y": 465.8889088630676,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "41be4404.2062fc",
+    "id": "40de4362.ae07ec",
     "type": "comment",
     "name": "Used for Put AR by id to MDSAL",
     "info": "",
     "comments": "",
-    "x": 615.0000305175781,
-    "y": 521.8889274597168,
-    "z": "8a925a2b.b01bd8",
+    "x": 657.0039367675781,
+    "y": 554.8889260292053,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "e088f78d.0cd8b8",
+    "id": "1f6351e.76805ae",
     "type": "comment",
     "name": "Obtain the last index in services",
     "info": "ServiceData is added by Provider code",
     "comments": "",
-    "x": 616.4444732666016,
-    "y": 707.8888721466064,
-    "z": "8a925a2b.b01bd8",
+    "x": 658.4483795166016,
+    "y": 740.888870716095,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "9077e61b.e6a3a8",
+    "id": "7cadc884.11c378",
     "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": 599.2681427001953,
-    "y": 1681.359203338623,
-    "z": "8a925a2b.b01bd8",
+    "x": 641.2720489501953,
+    "y": 1714.3592019081116,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "8e980e4e.121e8",
+    "id": "f028e514.462408",
     "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": 567.6812286376953,
-    "y": 1843.9749298095703,
-    "z": "8a925a2b.b01bd8",
+    "x": 609.6851348876953,
+    "y": 1876.9749283790588,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "fb16264e.206978",
+    "id": "eafc3b17.674668",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-type",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value=\"SDWANAttachmentInstance\" />\n",
     "comments": "",
-    "x": 1053.0001487731934,
-    "y": 241.99998664855957,
-    "z": "8a925a2b.b01bd8",
+    "x": 1095.0040550231934,
+    "y": 274.9999852180481,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "7955fe12.58b57",
+    "id": "273cbd63.ba5da2",
     "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": 650.0002746582031,
-    "y": 1615.00013256073,
-    "z": "8a925a2b.b01bd8",
+    "x": 692.0041809082031,
+    "y": 1648.0001311302185,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "7e102bff.eb07f4",
-        "11a3c1ef.0f585e",
-        "cbe02c45.fd392"
+        "98032a32.e6e0f8",
+        "aa969973.4cd018",
+        "1764b80a.4c5668"
       ]
     ]
   },
   {
-    "id": "7e102bff.eb07f4",
+    "id": "98032a32.e6e0f8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 899.6416282653809,
-    "y": 1653.3314628601074,
-    "z": "8a925a2b.b01bd8",
+    "x": 941.6455345153809,
+    "y": 1686.331461429596,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "d199a2ac.4c653"
+        "2942de2a.1ad962"
       ]
     ]
   },
   {
-    "id": "11a3c1ef.0f585e",
+    "id": "aa969973.4cd018",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 890.6416778564453,
-    "y": 1621.831488609314,
-    "z": "8a925a2b.b01bd8",
+    "x": 932.6455841064453,
+    "y": 1654.8314871788025,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "d199a2ac.4c653"
+        "2942de2a.1ad962"
       ]
     ]
   },
   {
-    "id": "cbe02c45.fd392",
+    "id": "1764b80a.4c5668",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 894.391716003418,
-    "y": 1592.1885934844613,
-    "z": "8a925a2b.b01bd8",
+    "x": 936.395622253418,
+    "y": 1625.1885920539498,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "d05ce36c.67312"
+        "801134b3.e6dc28"
       ]
     ]
   },
   {
-    "id": "d199a2ac.4c653",
+    "id": "2942de2a.1ad962",
     "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": 1060.391716003418,
-    "y": 1622.5815124511719,
-    "z": "8a925a2b.b01bd8",
+    "x": 1102.395622253418,
+    "y": 1655.5815110206604,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "d05ce36c.67312",
+    "id": "801134b3.e6dc28",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1036.0476837158203,
-    "y": 1588.3807626739144,
-    "z": "8a925a2b.b01bd8",
+    "x": 1078.0515899658203,
+    "y": 1621.380761243403,
+    "z": "28b033ee.a901cc",
     "wires": [
       []
     ]
   },
   {
-    "id": "27a69ba7.020164",
+    "id": "52f115fe.31e7bc",
     "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": 714.9999542236328,
-    "y": 1131.000165939331,
-    "z": "8a925a2b.b01bd8",
+    "x": 757.0038604736328,
+    "y": 1164.0001645088196,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "2ac08c5a.9ea264",
-        "9091e2db.32589",
-        "bcd16107.cb13d"
+        "d67d9a08.605298",
+        "22fe8dcf.9c57d2",
+        "85578012.048c2"
       ]
     ]
   },
   {
-    "id": "2ac08c5a.9ea264",
+    "id": "d67d9a08.605298",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1023.3080139160156,
-    "y": 1162.998441696167,
-    "z": "8a925a2b.b01bd8",
+    "x": 1065.3119201660156,
+    "y": 1195.9984402656555,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "900f543a.444328"
+        "5c849a0e.1b8584"
       ]
     ]
   },
   {
-    "id": "9091e2db.32589",
+    "id": "22fe8dcf.9c57d2",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1014.3080635070801,
-    "y": 1131.4984674453735,
-    "z": "8a925a2b.b01bd8",
+    "x": 1056.31196975708,
+    "y": 1164.498466014862,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "900f543a.444328"
+        "5c849a0e.1b8584"
       ]
     ]
   },
   {
-    "id": "bcd16107.cb13d",
+    "id": "85578012.048c2",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1018.0581016540527,
-    "y": 1101.8555723205209,
-    "z": "8a925a2b.b01bd8",
+    "x": 1060.0620079040527,
+    "y": 1134.8555708900094,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "1404ab79.5b1245"
+        "6e0abfa0.4ac64"
       ]
     ]
   },
   {
-    "id": "900f543a.444328",
+    "id": "5c849a0e.1b8584",
     "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": 1184.0581016540527,
-    "y": 1132.2484912872314,
-    "z": "8a925a2b.b01bd8",
+    "x": 1226.0620079040527,
+    "y": 1165.24848985672,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "1404ab79.5b1245",
+    "id": "6e0abfa0.4ac64",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1159.714069366455,
-    "y": 1098.047741509974,
-    "z": "8a925a2b.b01bd8",
+    "x": 1201.717975616455,
+    "y": 1131.0477400794625,
+    "z": "28b033ee.a901cc",
     "wires": [
       []
     ]
   },
   {
-    "id": "39d4184a.092378",
+    "id": "d900fe90.080fa",
     "type": "comment",
     "name": "Put the parent allotted resource in mdsal",
     "info": "",
     "comments": "",
-    "x": 643.9999008178711,
-    "y": 1093.000072479248,
-    "z": "8a925a2b.b01bd8",
+    "x": 686.0038070678711,
+    "y": 1126.0000710487366,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "a85450f9.54be5",
+    "id": "549597d0.2434c8",
     "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": 640.3570861816406,
-    "y": 1295.5716915130615,
-    "z": "8a925a2b.b01bd8",
+    "x": 682.3609924316406,
+    "y": 1328.57169008255,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "e417171b.b17d78",
+    "id": "6a649bce.b1cf84",
     "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": 560.2139129638672,
-    "y": 1263.381194114685,
-    "z": "8a925a2b.b01bd8",
+    "x": 602.2178192138672,
+    "y": 1296.3811926841736,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "8337596d.6afa48",
+    "id": "b67f723e.a2fdd",
     "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": 619.1668853759766,
-    "y": 1329.6668767929077,
-    "z": "8a925a2b.b01bd8",
+    "x": 661.1707916259766,
+    "y": 1362.6668753623962,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "5db0bc82.831f24",
+    "id": "e622a70a.fb3f98",
     "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": 571.4997253417969,
-    "y": 1403.0004043579102,
-    "z": "8a925a2b.b01bd8",
+    "x": 613.5036315917969,
+    "y": 1436.0004029273987,
+    "z": "28b033ee.a901cc",
     "wires": [
       []
     ]
   },
   {
-    "id": "757f6754.1033f8",
+    "id": "3c5561ef.3b198e",
     "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": 622.4867630004883,
-    "y": 1458.9516372680664,
-    "z": "8a925a2b.b01bd8",
+    "x": 664.4906692504883,
+    "y": 1491.951635837555,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "e6e8c666.3550b8",
+    "id": "34b5882f.c7cb48",
     "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": 567.0553817749023,
-    "y": 1364.5557622909546,
-    "z": "8a925a2b.b01bd8",
+    "x": 609.0592880249023,
+    "y": 1397.5557608604431,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "99a7dd56.4fb72",
+    "id": "f1efc3d3.15b9f",
     "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": 684.3888702392578,
-    "y": 1229.5556087493896,
-    "z": "8a925a2b.b01bd8",
+    "x": 726.3927764892578,
+    "y": 1262.5556073188782,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "86a651b6.fa2c1",
+    "id": "7f796e7c.de4f4",
     "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": 679.5000152587891,
-    "y": 1057.0000114440918,
-    "z": "8a925a2b.b01bd8",
+    "x": 721.5039215087891,
+    "y": 1090.0000100135803,
+    "z": "28b033ee.a901cc",
     "wires": [
       []
     ]
   },
   {
-    "id": "a399f576.497928",
+    "id": "128728fe.ad5877",
     "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": 675.4999389648438,
-    "y": 1014.000147819519,
-    "z": "8a925a2b.b01bd8",
+    "x": 717.5038452148438,
+    "y": 1047.0001463890076,
+    "z": "28b033ee.a901cc",
     "wires": [
       []
     ]
   },
   {
-    "id": "b106df9f.5ad7c",
+    "id": "6a7cea15.b62614",
     "type": "comment",
     "name": "Prepare Parent AR URL",
     "info": "Preparation to set provided-allotted-resource in parent service instance",
     "comments": "",
-    "x": 593.5003967285156,
-    "y": 943.0001010894775,
-    "z": "8a925a2b.b01bd8",
+    "x": 635.5043029785156,
+    "y": 976.0000996589661,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "af03f775.1849d8",
+    "id": "a35c1852.b6d228",
     "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": 632.5001907348633,
-    "y": 976.5000405311584,
-    "z": "8a925a2b.b01bd8",
+    "x": 674.5040969848633,
+    "y": 1009.500039100647,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "135a37d3.398c28",
+    "id": "c2bb18ee.6afb98",
     "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": 2189.7569732666016,
-    "y": 814.645830154419,
-    "z": "8a925a2b.b01bd8",
+    "x": 2231.7608795166016,
+    "y": 847.6458287239075,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "1472489a.f6dd67",
+    "id": "a28f94f9.cae788",
     "type": "set",
     "name": "set tmp.found-cidx",
     "xml": "<set>\n<parameter name='tmp.found-cidx' value=\"`false`\" />\n\n\n",
     "comments": "",
-    "x": 1315.6461448669434,
-    "y": 726.3125731945038,
-    "z": "8a925a2b.b01bd8",
+    "x": 1357.6500511169434,
+    "y": 759.3125717639923,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "a78b3889.5b8998",
+    "id": "c891031.324ba",
     "type": "comment",
     "name": "Add to parent services provided-allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 704.2015075683594,
-    "y": 910.9792575836182,
-    "z": "8a925a2b.b01bd8",
+    "x": 746.2054138183594,
+    "y": 943.9792561531067,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "67269130.185f5",
+    "id": "2273a66f.0415ca",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 624.9686965942383,
-    "y": 1196.9689378738403,
-    "z": "8a925a2b.b01bd8",
+    "x": 666.9726028442383,
+    "y": 1229.9689364433289,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "14fc1138.5da1ef",
+    "id": "b23dd04a.37b72",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1298.000051498413,
-    "y": 624.2777614593506,
-    "z": "8a925a2b.b01bd8",
+    "x": 1340.003957748413,
+    "y": 657.2777600288391,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "4695b038.898f5"
+        "a6dda7d3.822f38"
       ]
     ]
   },
   {
-    "id": "4695b038.898f5",
+    "id": "a6dda7d3.822f38",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1485.8574314117432,
-    "y": 624.8968968391418,
-    "z": "8a925a2b.b01bd8",
+    "x": 1527.8613376617432,
+    "y": 657.8968954086304,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "207b23e6.6bd71c"
+        "5bd5d251.e9afcc"
       ]
     ]
   },
   {
-    "id": "207b23e6.6bd71c",
+    "id": "5bd5d251.e9afcc",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1685.1905536651611,
-    "y": 624.896975517273,
-    "z": "8a925a2b.b01bd8",
+    "x": 1727.1944599151611,
+    "y": 657.8969740867615,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "9378fa3a.19c018"
+        "7072a3ba.59cbcc"
       ]
     ]
   },
   {
-    "id": "8bf022a6.d0cbb",
+    "id": "2fe2b50e.b3feea",
     "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": 770.0000534057617,
-    "y": 619.0000371932983,
-    "z": "8a925a2b.b01bd8",
+    "x": 812.0039596557617,
+    "y": 652.0000357627869,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "1ec18fe8.aa439",
-        "a8c0bcfd.baccb"
+        "8f7a89d.e442878",
+        "3a286aef.d7f3b6"
       ]
     ]
   },
   {
-    "id": "a8c0bcfd.baccb",
+    "id": "3a286aef.d7f3b6",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1138.0000839233398,
-    "y": 589.0000352859497,
-    "z": "8a925a2b.b01bd8",
+    "x": 1180.0039901733398,
+    "y": 622.0000338554382,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "e7c1d5d7.6402e8"
+        "13ffa20f.c9e16e"
       ]
     ]
   },
   {
-    "id": "e7c1d5d7.6402e8",
+    "id": "13ffa20f.c9e16e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1290.0000839233398,
-    "y": 588.0000352859497,
-    "z": "8a925a2b.b01bd8",
+    "x": 1332.0039901733398,
+    "y": 621.0000338554382,
+    "z": "28b033ee.a901cc",
     "wires": [
       []
     ]
   },
   {
-    "id": "3aa5d5fd.f4649a",
+    "id": "b0371fd5.a7b76",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 576.0039215087891,
-    "y": 1534.2500038146973,
-    "z": "8a925a2b.b01bd8",
+    "x": 618.0078277587891,
+    "y": 1567.2500023841858,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "eae96cd9.5875e",
-        "23f6c134.a5bc8e"
+        "54125d93.5f9234",
+        "a3376785.58e1f8"
       ]
     ]
   },
   {
-    "id": "eae96cd9.5875e",
+    "id": "54125d93.5f9234",
     "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": 911.0041198730469,
-    "y": 1480.2501260638237,
-    "z": "8a925a2b.b01bd8",
+    "x": 953.0080261230469,
+    "y": 1513.2501246333122,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "34a921aa.b7fb2e"
+        "e2f37c7a.7e92e"
       ]
     ]
   },
   {
-    "id": "b45075fd.7aae48",
+    "id": "36f9a762.8e3a68",
     "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": 933.4486236572266,
-    "y": 1514.0832867622375,
-    "z": "8a925a2b.b01bd8",
+    "x": 975.4525299072266,
+    "y": 1547.083285331726,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "933f50a4.98d0e",
+    "id": "5c5d6d04.0459d4",
     "type": "comment",
     "name": "Remove VNFC prefix",
     "info": "",
     "comments": "",
-    "x": 994.003963470459,
-    "y": 1436.6944618225098,
-    "z": "8a925a2b.b01bd8",
+    "x": 1036.007869720459,
+    "y": 1469.6944603919983,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "34a921aa.b7fb2e",
+    "id": "e2f37c7a.7e92e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1158.0039672851562,
-    "y": 1481.6943712234497,
-    "z": "8a925a2b.b01bd8",
+    "x": 1200.0078735351562,
+    "y": 1514.6943697929382,
+    "z": "28b033ee.a901cc",
     "wires": [
       [
-        "d1aee21e.a2d11",
-        "7c70d1bd.e91da"
+        "c041009d.8b993",
+        "2dcd0480.dbffec"
       ]
     ]
   },
   {
-    "id": "f68facaa.6f9bc",
+    "id": "cfd8cad0.68f218",
     "type": "comment",
     "name": "Take the parameter names by removing prefix",
     "info": "",
     "comments": "",
-    "x": 1426.0038146972656,
-    "y": 1397.250369310379,
-    "z": "8a925a2b.b01bd8",
+    "x": 1468.0077209472656,
+    "y": 1430.2503678798676,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "d1aee21e.a2d11",
+    "id": "c041009d.8b993",
     "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": 1377.0384826660156,
-    "y": 1432.2294654846191,
-    "z": "8a925a2b.b01bd8",
+    "x": 1419.0423889160156,
+    "y": 1465.2294640541077,
+    "z": "28b033ee.a901cc",
     "wires": [
       []
     ]
   },
   {
-    "id": "7c70d1bd.e91da",
+    "id": "2dcd0480.dbffec",
     "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": 1365.4829559326172,
-    "y": 1536.2294359207153,
-    "z": "8a925a2b.b01bd8",
+    "x": 1407.4868621826172,
+    "y": 1569.2294344902039,
+    "z": "28b033ee.a901cc",
     "wires": []
   },
   {
-    "id": "23f6c134.a5bc8e",
+    "id": "a3376785.58e1f8",
     "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": 952.0039672851562,
-    "y": 1554.2500658035278,
-    "z": "8a925a2b.b01bd8",
+    "x": 994.0078735351562,
+    "y": 1587.2500643730164,
+    "z": "28b033ee.a901cc",
     "wires": [
       []
     ]
-- 
cgit 1.2.3-korg