integration test issues fix for sdwan and sotn

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

Former-commit-id: 3e4fa46160a5d6d52bb7eccf08dbb790d96a4682

1 files changed, 467 insertions, 452 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
index 200f80ed..b785bc4a 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "5133686c.68eb98",
+    "id": "c96eae79.08813",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 103.01040649414062,
-    "y": 42.010414123535156,
-    "z": "3425547d.b4704c",
+    "x": 100,
+    "y": 40,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "496791b5.8488d"
+        "2bbd4a2b.66a236"
       ]
     ]
   },
   {
-    "id": "496791b5.8488d",
+    "id": "2bbd4a2b.66a236",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1284 +22,1299 @@
     "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": 315.0104103088379,
-    "y": 114.01043128967285,
-    "z": "3425547d.b4704c",
+    "x": 275.00000381469727,
+    "y": 112.0000171661377,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "177388c0.d59117"
+        "7de06dac.f33994"
       ]
     ]
   },
   {
-    "id": "177388c0.d59117",
+    "id": "7de06dac.f33994",
     "type": "method",
     "name": "sotn-attachment-topology-operation-create",
     "xml": "<method rpc='sotn-attachment-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 303.0105285644531,
-    "y": 202.01041412353516,
-    "z": "3425547d.b4704c",
+    "x": 263.0001220703125,
+    "y": 200,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "f8d7365b.409c58"
+        "8a29d369.0bab4"
       ]
     ]
   },
   {
-    "id": "f8d7365b.409c58",
+    "id": "8a29d369.0bab4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 223.01045989990234,
-    "y": 951.0106620788574,
-    "z": "3425547d.b4704c",
+    "x": 183.00005340576172,
+    "y": 949.0002479553223,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "9bdb10c1.b2c65",
-        "64a58452.ad453c",
-        "e271b8d5.7f00e8",
-        "1b3c993d.53c997",
-        "e93d7aa8.8afc58",
-        "52397993.71f7e8",
-        "e6318980.74cd38",
-        "461a26ad.352d08",
-        "99015db4.34427",
-        "302473e7.2159bc",
-        "8e35b842.c7d4f8",
-        "88bfb367.64d03",
-        "373e7d85.f8d5f2",
-        "ab686f72.f6d24",
-        "6568c68e.998458",
-        "42759b0d.8bfff4",
-        "7bc569ba.c7c2a8",
-        "aee1a7c1.04af88",
-        "c3e71ac5.708158",
-        "8031bd9b.aa492",
-        "b0b78151.f3bd1",
-        "13637009.f57bd",
-        "acf4df38.359e8"
+        "51f31211.8f114c",
+        "a2a65745.852438",
+        "f3044df1.6f232",
+        "5ba82df.f35b0d4",
+        "2da52da7.95c362",
+        "dc7e1c21.4599e",
+        "7bdd95f3.db24ac",
+        "371cf69b.dabcaa",
+        "c34405e1.82d938",
+        "46e15a07.ae9ba4",
+        "cd08d99a.10abb8",
+        "c56a158b.169088",
+        "3292b995.f13186",
+        "71214832.584f28",
+        "23b7a6d1.9a369a",
+        "4ebfff40.f0aa5",
+        "cb431e44.1b2d7",
+        "6c73a0d6.045f8",
+        "1f74500.b2f7fb",
+        "6d4b764b.a8a308",
+        "6e7b925f.51d77c",
+        "92f874df.f4a158",
+        "ea8d2a7c.dc1c98",
+        "5a956e5b.11a09"
       ]
     ]
   },
   {
-    "id": "f392c1a2.4633e",
+    "id": "dceaac22.2856",
     "type": "comment",
     "name": "Set allotted resource id if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 707.087158203125,
-    "y": 111.44433307647705,
-    "z": "3425547d.b4704c",
+    "x": 667.0767517089844,
+    "y": 109.4339189529419,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "9bdb10c1.b2c65",
+    "id": "51f31211.8f114c",
     "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": 653.0104370117188,
-    "y": 167.01040649414062,
-    "z": "3425547d.b4704c",
+    "x": 613.0000305175781,
+    "y": 164.99999237060547,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "61aacc9.ea6e934",
-        "1e985c69.1db8d4"
+        "5d06a5f3.384e7c",
+        "a9453642.a0afc8"
       ]
     ]
   },
   {
-    "id": "61aacc9.ea6e934",
+    "id": "5d06a5f3.384e7c",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 851.0105247497559,
-    "y": 137.01039505004883,
-    "z": "3425547d.b4704c",
+    "x": 811.0001182556152,
+    "y": 134.99998092651367,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "89d751a9.4634e"
+        "b367b4cb.81eda8"
       ]
     ]
   },
   {
-    "id": "1e985c69.1db8d4",
+    "id": "a9453642.a0afc8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 850.0104331970215,
-    "y": 174.0104055404663,
-    "z": "3425547d.b4704c",
+    "x": 810.0000267028809,
+    "y": 171.99999141693115,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "2d11e756.388fd8"
+        "b2cd00b8.57706"
       ]
     ]
   },
   {
-    "id": "2d11e756.388fd8",
+    "id": "b2cd00b8.57706",
     "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": 1048.0104217529297,
-    "y": 171.01042461395264,
-    "z": "3425547d.b4704c",
+    "x": 1008.0000152587891,
+    "y": 169.00001049041748,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "64a58452.ad453c",
+    "id": "a2a65745.852438",
     "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": 621.0103607177734,
-    "y": 388.01051330566406,
-    "z": "3425547d.b4704c",
+    "x": 580.9999542236328,
+    "y": 386.0000991821289,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "e271b8d5.7f00e8",
+    "id": "f3044df1.6f232",
     "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": 621.2722778320312,
-    "y": 469.6771945953369,
-    "z": "3425547d.b4704c",
+    "x": 581.2618713378906,
+    "y": 467.66678047180176,
+    "z": "307cdf1d.539fd",
     "wires": [
       []
     ]
   },
   {
-    "id": "1b3c993d.53c997",
+    "id": "5ba82df.f35b0d4",
     "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": 674.2723388671875,
-    "y": 556.6771125793457,
-    "z": "3425547d.b4704c",
+    "x": 634.2619323730469,
+    "y": 554.6666984558105,
+    "z": "307cdf1d.539fd",
     "wires": [
       []
     ]
   },
   {
-    "id": "89d751a9.4634e",
+    "id": "b367b4cb.81eda8",
     "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": 1066.0105018615723,
-    "y": 138.01040077209473,
-    "z": "3425547d.b4704c",
+    "x": 1026.0000953674316,
+    "y": 135.99998664855957,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "eb62b50e.452978"
+        "a3bb33e3.15368"
       ]
     ]
   },
   {
-    "id": "eb62b50e.452978",
+    "id": "a3bb33e3.15368",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1284.0105438232422,
-    "y": 138.0103645324707,
-    "z": "3425547d.b4704c",
+    "x": 1244.0001373291016,
+    "y": 135.99995040893555,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "21e39486.41c95c"
+        "1a685e2d.8d4cc2"
       ]
     ]
   },
   {
-    "id": "21e39486.41c95c",
+    "id": "1a685e2d.8d4cc2",
     "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": 1450.010498046875,
-    "y": 138.01037883758545,
-    "z": "3425547d.b4704c",
+    "x": 1410.0000915527344,
+    "y": 135.9999647140503,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "69607a16.ab23b4",
+    "id": "8b5477db.c5c9d8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1180.0106372833252,
-    "y": 628.7882852554321,
-    "z": "3425547d.b4704c",
+    "x": 1140.0002307891846,
+    "y": 626.777871131897,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "5509562b.e7bb48"
+        "5b1e701f.600c"
       ]
     ]
   },
   {
-    "id": "ff29c66f.d0c078",
+    "id": "cc9f7f26.8914e",
     "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": 1913.529016494751,
-    "y": 629.8543567657471,
-    "z": "3425547d.b4704c",
+    "x": 1873.5186100006104,
+    "y": 627.8439426422119,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "988573f5.64b22",
+    "id": "65a2f2cb.5edd4c",
     "type": "comment",
     "name": "Check for non existence of allotted resource",
     "info": "",
     "comments": "",
-    "x": 1036.0105590820312,
-    "y": 562.7883520126343,
-    "z": "3425547d.b4704c",
+    "x": 996.0001525878906,
+    "y": 560.7779378890991,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "ae4a4ff0.de2",
+    "id": "2eaa291f.8f6b46",
     "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": 1556.6771049499512,
-    "y": 773.0104644298553,
-    "z": "3425547d.b4704c",
+    "x": 1516.6666984558105,
+    "y": 771.0000503063202,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "79ba7554.7b000c"
+        "1bef4b2b.0d1235"
       ]
     ]
   },
   {
-    "id": "52397993.71f7e8",
+    "id": "dc7e1c21.4599e",
     "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": 738.6764297485352,
-    "y": 749.7244968414307,
-    "z": "3425547d.b4704c",
+    "x": 698.6660232543945,
+    "y": 747.7140827178955,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "ae3cba2c.22d388",
-        "70e9802d.1c53d"
+        "f0ad968c.edb0a8",
+        "6ec4508a.edb8"
       ]
     ]
   },
   {
-    "id": "ae3cba2c.22d388",
+    "id": "f0ad968c.edb0a8",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1042.8193283081055,
-    "y": 718.5819339752197,
-    "z": "3425547d.b4704c",
+    "x": 1002.8089218139648,
+    "y": 716.5715198516846,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "b72b861c.815eb8"
+        "1bdd00e8.bfe58f"
       ]
     ]
   },
   {
-    "id": "70e9802d.1c53d",
+    "id": "6ec4508a.edb8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1019.8193778991699,
-    "y": 779.5818891525269,
-    "z": "3425547d.b4704c",
+    "x": 979.8089714050293,
+    "y": 777.5714750289917,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "11ff47a3.643388"
+        "db245e97.27431"
       ]
     ]
   },
   {
-    "id": "11ff47a3.643388",
+    "id": "db245e97.27431",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1179.9464683532715,
-    "y": 777.7078657150269,
-    "z": "3425547d.b4704c",
+    "x": 1139.9360618591309,
+    "y": 775.6974515914917,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "ae4a4ff0.de2",
-        "73e79a71.cfae24",
-        "c9aa1cc3.3ec63"
+        "2eaa291f.8f6b46",
+        "493dd1d2.fc196",
+        "23139ea3.633f22"
       ]
     ]
   },
   {
-    "id": "b72b861c.815eb8",
+    "id": "1bdd00e8.bfe58f",
     "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": 1192.67631149292,
-    "y": 716.2959842681885,
-    "z": "3425547d.b4704c",
+    "x": 1152.6659049987793,
+    "y": 714.2855701446533,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "e6318980.74cd38",
+    "id": "7bdd95f3.db24ac",
     "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": 667.5337219238281,
-    "y": 853.2960615158081,
-    "z": "3425547d.b4704c",
+    "x": 627.5233154296875,
+    "y": 851.285647392273,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "73e79a71.cfae24",
+    "id": "493dd1d2.fc196",
     "type": "switchNode",
     "name": "switch tmp.found-cidx",
     "xml": "<switch test='`$tmp.found-cidx`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1369.0615158081055,
-    "y": 809.7193884849548,
-    "z": "3425547d.b4704c",
+    "x": 1329.0511093139648,
+    "y": 807.7089743614197,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "c00df3d6.a23ca"
+        "2ccff848.6a8838"
       ]
     ]
   },
   {
-    "id": "c00df3d6.a23ca",
+    "id": "2ccff848.6a8838",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1559.0614700317383,
-    "y": 809.71932554245,
-    "z": "3425547d.b4704c",
+    "x": 1519.0510635375977,
+    "y": 807.7089114189148,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "210f1d5f.874d72"
+        "d5d85369.7e688"
       ]
     ]
   },
   {
-    "id": "210f1d5f.874d72",
+    "id": "d5d85369.7e688",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1725.0614700317383,
-    "y": 809.71932554245,
-    "z": "3425547d.b4704c",
+    "x": 1685.0510635375977,
+    "y": 807.7089114189148,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "9f784ab7.a1a108"
+        "fa8e9142.85d7d"
       ]
     ]
   },
   {
-    "id": "79ba7554.7b000c",
+    "id": "1bef4b2b.0d1235",
     "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": 1973.7887344360352,
-    "y": 770.0104913711548,
-    "z": "3425547d.b4704c",
+    "x": 1933.7783279418945,
+    "y": 768.0000772476196,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "6f5753b3.9563cc"
+        "39a011f4.26c90e"
       ]
     ]
   },
   {
-    "id": "6f5753b3.9563cc",
+    "id": "39a011f4.26c90e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2155.5983085632324,
-    "y": 770.4749383926392,
-    "z": "3425547d.b4704c",
+    "x": 2115.587902069092,
+    "y": 768.464524269104,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "65ad78ab.417bb8"
+        "3bd67468.05082c"
       ]
     ]
   },
   {
-    "id": "9f784ab7.a1a108",
+    "id": "fa8e9142.85d7d",
     "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": 1886.9348526000977,
-    "y": 809.2310266494751,
-    "z": "3425547d.b4704c",
+    "x": 1846.924446105957,
+    "y": 807.2206125259399,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "829f78ea.771c88",
+    "id": "45f09705.29f058",
     "type": "comment",
     "name": "Add to consumed service consumed-allotted-resources in mdsal",
     "info": "Prepare data and add to service-data",
     "comments": "",
-    "x": 759.6776428222656,
-    "y": 680.0104608535767,
-    "z": "3425547d.b4704c",
+    "x": 719.667236328125,
+    "y": 678.0000467300415,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "8b9e14b0.ee2668",
+    "id": "7472ca93.259114",
     "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": 747.0105590820312,
-    "y": 818.788553237915,
-    "z": "3425547d.b4704c",
+    "x": 707.0001525878906,
+    "y": 816.7781391143799,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "13637009.f57bd",
+    "id": "ea8d2a7c.dc1c98",
     "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",
+    "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=\"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": 652.7012557983398,
-    "y": 1868.5423040390015,
-    "z": "3425547d.b4704c",
+    "x": 612.6908721923828,
+    "y": 1866.5318479537964,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "2383f0f.fe77a1",
-        "1726f753.540739"
+        "951bf335.bca52",
+        "3aff12ef.b5135e"
       ]
     ]
   },
   {
-    "id": "2383f0f.fe77a1",
+    "id": "951bf335.bca52",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 847.463191986084,
-    "y": 1859.4949054718018,
-    "z": "3425547d.b4704c",
+    "x": 807.4527854919434,
+    "y": 1857.4844913482666,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "bfb0685f.193b68"
+        "5683eb13.db5c34"
       ]
     ]
   },
   {
-    "id": "bfb0685f.193b68",
+    "id": "5683eb13.db5c34",
     "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": 1013.9870719909668,
-    "y": 1871.1139764785767,
-    "z": "3425547d.b4704c",
+    "x": 973.9766654968262,
+    "y": 1869.1035623550415,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "1726f753.540739",
+    "id": "3aff12ef.b5135e",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 854.558479309082,
-    "y": 1892.2568731307983,
-    "z": "3425547d.b4704c",
+    "x": 814.5480728149414,
+    "y": 1890.2464590072632,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "bfb0685f.193b68"
+        "5683eb13.db5c34"
       ]
     ]
   },
   {
-    "id": "da5dd301.64278",
+    "id": "9b778367.8c46a",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 628.5108871459961,
-    "y": 1830.8442754745483,
-    "z": "3425547d.b4704c",
+    "x": 589.50048828125,
+    "y": 1809.8338623046875,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "d50db86.5001548",
+    "id": "9719bb6e.70a358",
     "type": "comment",
     "name": "Set allotted resource type if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 693.0104064941406,
-    "y": 220.01041412353516,
-    "z": "3425547d.b4704c",
+    "x": 653,
+    "y": 218,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "e93d7aa8.8afc58",
+    "id": "2da52da7.95c362",
     "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": 654.9337158203125,
-    "y": 260.57647037506104,
-    "z": "3425547d.b4704c",
+    "x": 614.9233093261719,
+    "y": 258.5660562515259,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "f6469c6d.d6d7c",
-        "6b6259b5.f45218"
+        "684d8da4.b880e4",
+        "7ce6426e.522ebc"
       ]
     ]
   },
   {
-    "id": "f6469c6d.d6d7c",
+    "id": "684d8da4.b880e4",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 857.9338684082031,
-    "y": 245.57647323608398,
-    "z": "3425547d.b4704c",
+    "x": 817.9234619140625,
+    "y": 243.56605911254883,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "9e957e4b.c63b4"
+        "63c4923.3c3426c"
       ]
     ]
   },
   {
-    "id": "6b6259b5.f45218",
+    "id": "7ce6426e.522ebc",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 850.9336967468262,
-    "y": 285.57649326324463,
-    "z": "3425547d.b4704c",
+    "x": 810.9232902526855,
+    "y": 283.5660791397095,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "6a7aae3b.c248e"
+        "bca9b7c7.73b158"
       ]
     ]
   },
   {
-    "id": "6a7aae3b.c248e",
+    "id": "bca9b7c7.73b158",
     "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": 1082.933681488037,
-    "y": 285.5764980316162,
-    "z": "3425547d.b4704c",
+    "x": 1042.9232749938965,
+    "y": 283.56608390808105,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "9d9d583f.dbc9c8",
+    "id": "4c5ae3e7.94b54c",
     "type": "comment",
     "name": "For storage in AAI connection-attachment-topology",
     "info": "",
     "comments": "",
-    "x": 718.010368347168,
-    "y": 355.01041412353516,
-    "z": "3425547d.b4704c",
+    "x": 677.9999618530273,
+    "y": 353,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "2787339d.0e091c",
+    "id": "566d8977.bdc218",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 693.0103530883789,
-    "y": 436.89932346343994,
-    "z": "3425547d.b4704c",
+    "x": 652.9999465942383,
+    "y": 434.8889093399048,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "da385e9d.31c6e",
+    "id": "eba557cf.66dec8",
     "type": "comment",
     "name": "Used for Put AR by id to MDSAL",
     "info": "",
     "comments": "",
-    "x": 659.0104370117188,
-    "y": 525.8993406295776,
-    "z": "3425547d.b4704c",
+    "x": 619.0000305175781,
+    "y": 523.8889265060425,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "fb746d4c.98d2e",
+    "id": "6d67020a.67de0c",
     "type": "comment",
     "name": "Obtain the last index in services",
     "info": "ServiceData is added by Provider code",
     "comments": "",
-    "x": 660.4548797607422,
-    "y": 711.8992853164673,
-    "z": "3425547d.b4704c",
+    "x": 620.4444732666016,
+    "y": 709.8888711929321,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "c3e71ac5.708158",
+    "id": "1f74500.b2f7fb",
     "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": 638.2785415649414,
-    "y": 1775.3696031570435,
-    "z": "3425547d.b4704c",
+    "x": 598.2681350708008,
+    "y": 1773.3591890335083,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "8031bd9b.aa492",
+    "id": "6d4b764b.a8a308",
     "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": 606.6916198730469,
-    "y": 1916.9853897094727,
-    "z": "3425547d.b4704c",
+    "x": 566.6812324523926,
+    "y": 1977.9749908447266,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "9e957e4b.c63b4",
+    "id": "63c4923.3c3426c",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-type",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value=\"SOTNAttachmentInstance\" />\n",
     "comments": "",
-    "x": 1097.010555267334,
-    "y": 246.0103998184204,
-    "z": "3425547d.b4704c",
+    "x": 1057.0001487731934,
+    "y": 243.99998569488525,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "31ce0f6c.4be64",
+    "id": "e855335b.71b3c",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-get-saved-ar-param",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 940.0045623779297,
-    "y": 1624.5041437149048,
-    "z": "3425547d.b4704c",
+    "x": 899.9941558837891,
+    "y": 1622.4937295913696,
+    "z": "307cdf1d.539fd",
     "wires": [
       []
     ]
   },
   {
-    "id": "aee1a7c1.04af88",
+    "id": "6c73a0d6.045f8",
     "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.sotn-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": 689.0106735229492,
-    "y": 1709.0105323791504,
-    "z": "3425547d.b4704c",
+    "x": 649.0002670288086,
+    "y": 1707.0001182556152,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "8776bfe5.59d94",
-        "d7639202.15d54",
-        "3089b749.6674a8"
+        "17f1151d.06a5ab",
+        "ccace23a.27702",
+        "325329b.e9052d6"
       ]
     ]
   },
   {
-    "id": "8776bfe5.59d94",
+    "id": "17f1151d.06a5ab",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 938.652027130127,
-    "y": 1747.3418626785278,
-    "z": "3425547d.b4704c",
+    "x": 898.6416206359863,
+    "y": 1745.3314485549927,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "7514cc17.dfede4"
+        "503ba1c3.ce81b"
       ]
     ]
   },
   {
-    "id": "d7639202.15d54",
+    "id": "ccace23a.27702",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 929.6520767211914,
-    "y": 1715.8418884277344,
-    "z": "3425547d.b4704c",
+    "x": 889.6416702270508,
+    "y": 1713.8314743041992,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "7514cc17.dfede4"
+        "503ba1c3.ce81b"
       ]
     ]
   },
   {
-    "id": "3089b749.6674a8",
+    "id": "325329b.e9052d6",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 933.4021148681641,
-    "y": 1686.1989933028817,
-    "z": "3425547d.b4704c",
+    "x": 893.3917083740234,
+    "y": 1684.1885791793466,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "e2b27745.660088"
+        "565609af.5fb058"
       ]
     ]
   },
   {
-    "id": "7514cc17.dfede4",
+    "id": "503ba1c3.ce81b",
     "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": 1099.402114868164,
-    "y": 1716.5919122695923,
-    "z": "3425547d.b4704c",
+    "x": 1059.3917083740234,
+    "y": 1714.5814981460571,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "e2b27745.660088",
+    "id": "565609af.5fb058",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1075.0580825805664,
-    "y": 1682.3911624923348,
-    "z": "3425547d.b4704c",
+    "x": 1035.0476760864258,
+    "y": 1680.3807483687997,
+    "z": "307cdf1d.539fd",
     "wires": [
       []
     ]
   },
   {
-    "id": "8e35b842.c7d4f8",
+    "id": "cd08d99a.10abb8",
     "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": 759.0103607177734,
-    "y": 1135.010579109192,
-    "z": "3425547d.b4704c",
+    "x": 718.9999542236328,
+    "y": 1133.0001649856567,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "4a784746.dec008",
-        "c64e1e39.2251",
-        "be9dd1f.2b8ae3"
+        "ef2f7f10.9941b",
+        "b03054a4.69fc18",
+        "8aa9a171.e089b"
       ]
     ]
   },
   {
-    "id": "4a784746.dec008",
+    "id": "ef2f7f10.9941b",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1067.3184204101562,
-    "y": 1167.0088548660278,
-    "z": "3425547d.b4704c",
+    "x": 1027.3080139160156,
+    "y": 1164.9984407424927,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "fa176469.0fc3f8"
+        "65c0c4d1.41acbc"
       ]
     ]
   },
   {
-    "id": "c64e1e39.2251",
+    "id": "b03054a4.69fc18",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1058.3184700012207,
-    "y": 1135.5088806152344,
-    "z": "3425547d.b4704c",
+    "x": 1018.3080635070801,
+    "y": 1133.4984664916992,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "fa176469.0fc3f8"
+        "65c0c4d1.41acbc"
       ]
     ]
   },
   {
-    "id": "be9dd1f.2b8ae3",
+    "id": "8aa9a171.e089b",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1062.0685081481934,
-    "y": 1105.8659854903817,
-    "z": "3425547d.b4704c",
+    "x": 1022.0581016540527,
+    "y": 1103.8555713668466,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "a7887873.602db8"
+        "c70fcaaf.55a4c8"
       ]
     ]
   },
   {
-    "id": "fa176469.0fc3f8",
+    "id": "65c0c4d1.41acbc",
     "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": 1228.0685081481934,
-    "y": 1136.2589044570923,
-    "z": "3425547d.b4704c",
+    "x": 1188.0581016540527,
+    "y": 1134.2484903335571,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "a7887873.602db8",
+    "id": "c70fcaaf.55a4c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1203.7244758605957,
-    "y": 1102.0581546798348,
-    "z": "3425547d.b4704c",
+    "x": 1163.714069366455,
+    "y": 1100.0477405562997,
+    "z": "307cdf1d.539fd",
     "wires": [
       []
     ]
   },
   {
-    "id": "21d4e2e4.5ed5fe",
+    "id": "4609b233.9d833c",
     "type": "comment",
     "name": "Put the parent allotted resource in mdsal",
     "info": "",
     "comments": "",
-    "x": 688.0103073120117,
-    "y": 1097.010485649109,
-    "z": "3425547d.b4704c",
+    "x": 647.9999008178711,
+    "y": 1095.0000715255737,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "373e7d85.f8d5f2",
+    "id": "3292b995.f13186",
     "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": 684.3674926757812,
-    "y": 1299.5821046829224,
-    "z": "3425547d.b4704c",
+    "x": 644.3570861816406,
+    "y": 1297.5716905593872,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "88bfb367.64d03",
+    "id": "c56a158b.169088",
     "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": 598.2242736816406,
-    "y": 1267.3914613723755,
-    "z": "3425547d.b4704c",
+    "x": 558.2138671875,
+    "y": 1265.3810472488403,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "ab686f72.f6d24",
+    "id": "71214832.584f28",
     "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": 663.1772918701172,
-    "y": 1333.6772899627686,
-    "z": "3425547d.b4704c",
+    "x": 623.1668853759766,
+    "y": 1331.6668758392334,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "6568c68e.998458",
+    "id": "23b7a6d1.9a369a",
     "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": 615.5101318359375,
-    "y": 1407.010817527771,
-    "z": "3425547d.b4704c",
+    "x": 575.4997253417969,
+    "y": 1405.0004034042358,
+    "z": "307cdf1d.539fd",
     "wires": [
       []
     ]
   },
   {
-    "id": "42759b0d.8bfff4",
+    "id": "4ebfff40.f0aa5",
     "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": 666.4971694946289,
-    "y": 1462.9620504379272,
-    "z": "3425547d.b4704c",
+    "x": 626.4867630004883,
+    "y": 1460.951636314392,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "7bc569ba.c7c2a8",
+    "id": "cb431e44.1b2d7",
     "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": 611.065788269043,
-    "y": 1368.5661754608154,
-    "z": "3425547d.b4704c",
+    "x": 571.0553817749023,
+    "y": 1366.5557613372803,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "5eda0baa.a6ac24",
+    "id": "10171c26.195644",
     "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": 728.3992767333984,
-    "y": 1233.5660219192505,
-    "z": "3425547d.b4704c",
+    "x": 688.3888702392578,
+    "y": 1231.5556077957153,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "302473e7.2159bc",
+    "id": "46e15a07.ae9ba4",
     "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": 723.5104217529297,
-    "y": 1061.0104246139526,
-    "z": "3425547d.b4704c",
+    "x": 683.5000152587891,
+    "y": 1059.0000104904175,
+    "z": "307cdf1d.539fd",
     "wires": [
       []
     ]
   },
   {
-    "id": "99015db4.34427",
+    "id": "c34405e1.82d938",
     "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": 719.5103454589844,
-    "y": 1018.0105609893799,
-    "z": "3425547d.b4704c",
+    "x": 679.4999389648438,
+    "y": 1016.0001468658447,
+    "z": "307cdf1d.539fd",
     "wires": [
       []
     ]
   },
   {
-    "id": "ac4fa77d.cd6878",
+    "id": "a521acad.d004d",
     "type": "comment",
     "name": "Prepare Parent AR URL",
     "info": "Preparation to set provided-allotted-resource in parent service instance",
     "comments": "",
-    "x": 637.5108032226562,
-    "y": 947.0105142593384,
-    "z": "3425547d.b4704c",
+    "x": 597.5003967285156,
+    "y": 945.0001001358032,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "461a26ad.352d08",
+    "id": "371cf69b.dabcaa",
     "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": 676.5105972290039,
-    "y": 980.5104537010193,
-    "z": "3425547d.b4704c",
+    "x": 636.5001907348633,
+    "y": 978.5000395774841,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "fc5e8c6b.8fefa",
+    "id": "471a396d.b72ac8",
     "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": 866.0107650756836,
-    "y": 1587.5102167129517,
-    "z": "3425547d.b4704c",
+    "x": 826.000358581543,
+    "y": 1585.4998025894165,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "65ad78ab.417bb8",
+    "id": "3bd67468.05082c",
     "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": 2233.767379760742,
-    "y": 818.6562433242798,
-    "z": "3425547d.b4704c",
+    "x": 2193.7569732666016,
+    "y": 816.6458292007446,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "c9aa1cc3.3ec63",
+    "id": "23139ea3.633f22",
     "type": "set",
     "name": "set tmp.found-cidx",
     "xml": "<set>\n<parameter name='tmp.found-cidx' value=\"`false`\" />\n\n\n",
     "comments": "",
-    "x": 1359.656551361084,
-    "y": 730.3229863643646,
-    "z": "3425547d.b4704c",
+    "x": 1319.6461448669434,
+    "y": 728.3125722408295,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "ff67ccb2.50d8",
+    "id": "572750a4.da966",
     "type": "comment",
     "name": "Add to parent services provided-allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 748.2119140625,
-    "y": 914.989670753479,
-    "z": "3425547d.b4704c",
+    "x": 708.2015075683594,
+    "y": 912.9792566299438,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "a5a8871f.3c0658",
+    "id": "c22af7ab.9a1898",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 668.9791030883789,
-    "y": 1200.9793510437012,
-    "z": "3425547d.b4704c",
+    "x": 628.9686965942383,
+    "y": 1198.968936920166,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "5509562b.e7bb48",
+    "id": "5b1e701f.600c",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1342.0104579925537,
-    "y": 628.2881746292114,
-    "z": "3425547d.b4704c",
+    "x": 1302.000051498413,
+    "y": 626.2777605056763,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "f6f2507e.ba037"
+        "f33fd165.6af9d"
       ]
     ]
   },
   {
-    "id": "f6f2507e.ba037",
+    "id": "f33fd165.6af9d",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1529.8678379058838,
-    "y": 628.9073100090027,
-    "z": "3425547d.b4704c",
+    "x": 1489.8574314117432,
+    "y": 626.8968958854675,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "7ebe7287.439dec"
+        "30bd1249.6e0cce"
       ]
     ]
   },
   {
-    "id": "7ebe7287.439dec",
+    "id": "30bd1249.6e0cce",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1729.2009601593018,
-    "y": 628.9073886871338,
-    "z": "3425547d.b4704c",
+    "x": 1689.1905536651611,
+    "y": 626.8969745635986,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "ff29c66f.d0c078"
+        "cc9f7f26.8914e"
       ]
     ]
   },
   {
-    "id": "b0b78151.f3bd1",
+    "id": "6e7b925f.51d77c",
     "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": 814.0104598999023,
-    "y": 623.0104503631592,
-    "z": "3425547d.b4704c",
+    "x": 774.0000534057617,
+    "y": 621.000036239624,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "69607a16.ab23b4",
-        "4afffe17.752bc"
+        "8b5477db.c5c9d8",
+        "94a8a58d.dee408"
       ]
     ]
   },
   {
-    "id": "4afffe17.752bc",
+    "id": "94a8a58d.dee408",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1182.0104904174805,
-    "y": 593.0104484558105,
-    "z": "3425547d.b4704c",
+    "x": 1142.0000839233398,
+    "y": 591.0000343322754,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "5d7e4f7b.5aaa4"
+        "9c37a2ea.b7b0a"
       ]
     ]
   },
   {
-    "id": "5d7e4f7b.5aaa4",
+    "id": "9c37a2ea.b7b0a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1334.0104904174805,
-    "y": 592.0104484558105,
-    "z": "3425547d.b4704c",
+    "x": 1294.0000839233398,
+    "y": 590.0000343322754,
+    "z": "307cdf1d.539fd",
     "wires": [
       []
     ]
   },
   {
-    "id": "acf4df38.359e8",
+    "id": "92f874df.f4a158",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 610.5660171508789,
-    "y": 1542.6770677566528,
-    "z": "3425547d.b4704c",
+    "x": 570.5556106567383,
+    "y": 1540.6666536331177,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "e883ed0e.70e5",
-        "31ce0f6c.4be64"
+        "53c527c9.b22648",
+        "e855335b.71b3c"
       ]
     ]
   },
   {
-    "id": "e883ed0e.70e5",
+    "id": "53c527c9.b22648",
     "type": "for",
     "name": "for each sotn-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": 880.5660820007324,
-    "y": 1542.6771154403687,
-    "z": "3425547d.b4704c",
+    "x": 840.5556755065918,
+    "y": 1540.6667013168335,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "c8bff3cc.09d2c"
+        "261e5f2.fe442a"
       ]
     ]
   },
   {
-    "id": "8e066326.71f27",
+    "id": "d5857a39.639db8",
     "type": "comment",
     "name": "Take the parameter names by removing prefix",
     "info": "",
     "comments": "",
-    "x": 1420.5658645629883,
-    "y": 1498.6771488189697,
-    "z": "3425547d.b4704c",
+    "x": 1380.5554580688477,
+    "y": 1496.6667346954346,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "a6906228.fcd97",
+    "id": "6df2fba8.889c14",
     "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": 1378.6005325317383,
-    "y": 1533.65629196167,
-    "z": "3425547d.b4704c",
+    "x": 1338.5901260375977,
+    "y": 1531.6458778381348,
+    "z": "307cdf1d.539fd",
     "wires": [
       []
     ]
   },
   {
-    "id": "d3547289.18d19",
+    "id": "bd5f9072.2a8a7",
     "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[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
+    "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": 1349.0450592041016,
-    "y": 1566.65629196167,
-    "z": "3425547d.b4704c",
+    "x": 1309.034652709961,
+    "y": 1564.6458778381348,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "80d52421.de6378",
+    "id": "4a2aa60e.ed5c08",
     "type": "comment",
     "name": "Remove VNFC prefix",
     "info": "",
     "comments": "",
-    "x": 821.5660095214844,
-    "y": 1510.1214294433594,
-    "z": "3425547d.b4704c",
+    "x": 781.5556030273438,
+    "y": 1508.1110153198242,
+    "z": "307cdf1d.539fd",
     "wires": []
   },
   {
-    "id": "c8bff3cc.09d2c",
+    "id": "261e5f2.fe442a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1127.56591796875,
-    "y": 1541.1214599609375,
-    "z": "3425547d.b4704c",
+    "x": 1087.5555114746094,
+    "y": 1539.1110458374023,
+    "z": "307cdf1d.539fd",
     "wires": [
       [
-        "a6906228.fcd97",
-        "d3547289.18d19"
+        "6df2fba8.889c14",
+        "bd5f9072.2a8a7"
       ]
     ]
+  },
+  {
+    "id": "5a956e5b.11a09",
+    "type": "save",
+    "name": "save srcLTP relationship in AAI",
+    "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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $prop.connection-attachment.access-ltp-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 619.0039329528809,
+    "y": 1925.0039825439453,
+    "z": "307cdf1d.539fd",
+    "wires": [
+      []
+    ]
   }
 ]