From: Dan Timoney <dt5972@att.com>
Date: Fri, 3 Aug 2018 11:43:00 +0000 (+0000)
Subject: Merge "Updates to SOTN DG"
X-Git-Tag: 1.4.1~93
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ba632f05d29e535185a3693f944dcbe6e1c2f3a8;hp=b9873d6afaab6c76ebce39aa9cba852a16abf41f;p=sdnc%2Foam.git

Merge "Updates to SOTN DG"

Former-commit-id: 8826276da083f4798387a5ee631b7300e0862326
---

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
index 4b055d10..5729a236 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "a77629b2.29acf8",
+    "id": "13403d5.5be54c3",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 104.03125,
-    "y": 31.999999523162842,
-    "z": "205403e9.560efc",
+    "x": 112.00390625,
+    "y": 46.00390625,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "2a935009.ef91b"
+        "8694bff7.45011"
       ]
     ]
   },
   {
-    "id": "2a935009.ef91b",
+    "id": "8694bff7.45011",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,115 +22,115 @@
     "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": 316.03125381469727,
-    "y": 104.00001668930054,
-    "z": "205403e9.560efc",
+    "x": 324.00391006469727,
+    "y": 118.0039234161377,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "394d3966.f7a306"
+        "ce5f4d71.3c80b"
       ]
     ]
   },
   {
-    "id": "394d3966.f7a306",
+    "id": "ce5f4d71.3c80b",
     "type": "method",
     "name": "sotn-attachment-topology-operation-activate",
     "xml": "<method rpc='sotn-attachment-topology-operation-activate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 304.0313720703125,
-    "y": 191.99999952316284,
-    "z": "205403e9.560efc",
+    "x": 312.0040283203125,
+    "y": 206.00390625,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "3355788a.12aa08"
+        "e7e7b5c7.7cb0c8"
       ]
     ]
   },
   {
-    "id": "3355788a.12aa08",
+    "id": "e7e7b5c7.7cb0c8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 320.0313720703125,
-    "y": 747.000244140625,
-    "z": "205403e9.560efc",
+    "x": 328.0040283203125,
+    "y": 761.0041508674622,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "3df84881.f08dd8",
-        "d2f1b91d.444978",
-        "e6d1c52b.520cc8",
-        "1587558f.923b5a",
-        "606696e.6cc0f68",
-        "6558b5c9.5b8bec",
-        "d1e1bdb5.615f1",
-        "c7d4c837.69f1a8",
-        "f3e22a0c.d8db48",
-        "cb89d188.f33cc",
-        "3bc10ee7.beb432",
-        "bef55f2e.ad6b3",
-        "36004db7.4505d2",
-        "d7f464d6.9ac5f8",
-        "a66d68ee.9308e8",
-        "9ab0f309.357b6",
-        "f9e2a4f.0cf5858",
-        "6afb5fe5.f951c",
-        "7b232ea8.d345"
+        "581b91b6.06ff3",
+        "680895fb.4f588c",
+        "dc05cef1.a51f5",
+        "89ef32f1.d5d63",
+        "7184e2e7.8c461c",
+        "f440893f.3eb748",
+        "80cf693a.7220c8",
+        "cab0e236.de21f",
+        "84e0eeac.a2ba4",
+        "602ccaa6.5c1754",
+        "85ce847d.6d7528",
+        "447e9068.877d",
+        "4b7801cc.5bfc5",
+        "195a1754.387c79",
+        "17bafb78.38c045",
+        "69a30b87.057684",
+        "a26aed10.bae5b",
+        "4c5d18d9.d86fb8",
+        "bc43d14.b5aca3"
       ]
     ]
   },
   {
-    "id": "3df84881.f08dd8",
+    "id": "581b91b6.06ff3",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-id,etc",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
     "comments": "",
-    "x": 717.0248107910156,
-    "y": 145.99348640441895,
-    "z": "205403e9.560efc",
+    "x": 724.9974670410156,
+    "y": 159.9973931312561,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "66bc483f.e63618",
+    "id": "c2f92da0.ae67f",
     "type": "comment",
     "name": "set tmp ar-id to fetch resource from MDSAL",
     "info": "",
     "comments": "",
-    "x": 745.9851226806641,
-    "y": 110.02528238296509,
-    "z": "205403e9.560efc",
+    "x": 753.9577789306641,
+    "y": 124.02918910980225,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "d2f1b91d.444978",
+    "id": "680895fb.4f588c",
     "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": 671.0247497558594,
-    "y": 238.99349164962769,
-    "z": "205403e9.560efc",
+    "x": 678.9974060058594,
+    "y": 252.99739837646484,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "c7d4c837.69f1a8",
+    "id": "cab0e236.de21f",
     "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": 677.2866401672363,
-    "y": 326.66022062301636,
-    "z": "205403e9.560efc",
+    "x": 685.2592964172363,
+    "y": 340.6641273498535,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
         
@@ -138,15 +138,15 @@
     ]
   },
   {
-    "id": "e6d1c52b.520cc8",
+    "id": "dc05cef1.a51f5",
     "type": "execute",
     "name": "generate allotted-resource url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.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": 709.2866668701172,
-    "y": 414.6602020263672,
-    "z": "205403e9.560efc",
+    "x": 717.2593231201172,
+    "y": 428.66410875320435,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
         
@@ -154,307 +154,307 @@
     ]
   },
   {
-    "id": "1587558f.923b5a",
+    "id": "89ef32f1.d5d63",
     "type": "get-resource",
     "name": "get-resource connection-attachment-allotted-resource",
     "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 780.0247650146484,
-    "y": 504.7712607383728,
-    "z": "205403e9.560efc",
+    "x": 787.9974212646484,
+    "y": 518.77516746521,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "9d21fc06.56c9b",
-        "b5f5dd22.5d92a"
+        "c4c666a0.dc3b68",
+        "2a74b364.08117c"
       ]
     ]
   },
   {
-    "id": "4c5a1d8d.682774",
+    "id": "74acb38d.a8df3c",
     "type": "comment",
     "name": "GET connection-attachment-allotted-resource from mdsal",
     "info": "",
     "comments": "",
-    "x": 786.8395614624023,
-    "y": 476.53857946395874,
-    "z": "205403e9.560efc",
+    "x": 794.8122177124023,
+    "y": 490.5424861907959,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "6cf9a5a4.2b253c",
+    "id": "f5129fcf.6a5ca",
     "type": "comment",
     "name": "Used for setting output to API Handler",
     "info": "",
     "comments": "",
-    "x": 725.0247802734375,
-    "y": 205.99350118637085,
-    "z": "205403e9.560efc",
+    "x": 732.9974365234375,
+    "y": 219.997407913208,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "15f9c1a1.7257ee",
+    "id": "d590f72a.b09d08",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 743.0247459411621,
-    "y": 291.88238191604614,
-    "z": "205403e9.560efc",
+    "x": 750.9974021911621,
+    "y": 305.8862886428833,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "b17883ed.6bb59",
+    "id": "609f412.aec83c",
     "type": "comment",
     "name": "Used to Get AR by id to MDSAL, same as self-link",
     "info": "",
     "comments": "",
-    "x": 769.0247650146484,
-    "y": 378.88234090805054,
-    "z": "205403e9.560efc",
+    "x": 776.9974212646484,
+    "y": 392.8862476348877,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "9d21fc06.56c9b",
+    "id": "c4c666a0.dc3b68",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1079.6979675292969,
-    "y": 489.9999918937683,
-    "z": "205403e9.560efc",
+    "x": 1087.6706237792969,
+    "y": 504.00389862060547,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "a51a2d9d.383d"
+        "2a674d20.0005d2"
       ]
     ]
   },
   {
-    "id": "a51a2d9d.383d",
+    "id": "2a674d20.0005d2",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1248.6979713439941,
-    "y": 488.4998927116394,
-    "z": "205403e9.560efc",
+    "x": 1256.6706275939941,
+    "y": 502.50379943847656,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "1edb162f.f7047a"
+        "801d5833.48d068"
       ]
     ]
   },
   {
-    "id": "1edb162f.f7047a",
+    "id": "801d5833.48d068",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1459.5552139282227,
-    "y": 488.1190218925476,
-    "z": "205403e9.560efc",
+    "x": 1467.5278701782227,
+    "y": 502.12292861938477,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "2c727498.5563ec",
-        "cc396d19.c6009"
+        "eb4c62e2.ed59e",
+        "e1cf5942.513c08"
       ]
     ]
   },
   {
-    "id": "2c727498.5563ec",
+    "id": "eb4c62e2.ed59e",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1648.8885192871094,
-    "y": 488.1189799308777,
-    "z": "205403e9.560efc",
+    "x": 1656.8611755371094,
+    "y": 502.12288665771484,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "94f9a14a.aa9d1"
+        "6ded2c0c.68e914"
       ]
     ]
   },
   {
-    "id": "94f9a14a.aa9d1",
+    "id": "6ded2c0c.68e914",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic='true'>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1833.4124088287354,
-    "y": 485.0238137245178,
-    "z": "205403e9.560efc",
+    "x": 1841.3850650787354,
+    "y": 499.027720451355,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "ccbbcb55.91af38",
-        "ca13a843.2cf298",
-        "b1755c5c.5e7d2"
+        "f931a889.3afae8",
+        "bd538141.56707",
+        "57b77b8c.0f7844"
       ]
     ]
   },
   {
-    "id": "151fea4f.a51286",
+    "id": "482ef87f.84eaa8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 1792.5502090454102,
-    "y": 566.0660452842712,
-    "z": "205403e9.560efc",
+    "x": 1800.5228652954102,
+    "y": 580.0699520111084,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "b5f5dd22.5d92a",
+    "id": "2a74b364.08117c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1071.5497703552246,
-    "y": 525.0660767555237,
-    "z": "205403e9.560efc",
+    "x": 1079.5224266052246,
+    "y": 539.0699834823608,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "318eef9c.54777"
+        "ab1859dd.20d8a8"
       ]
     ]
   },
   {
-    "id": "318eef9c.54777",
+    "id": "ab1859dd.20d8a8",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1251.5497207641602,
-    "y": 525.7326273918152,
-    "z": "205403e9.560efc",
+    "x": 1259.5223770141602,
+    "y": 539.7365341186523,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "151fea4f.a51286"
+        "482ef87f.84eaa8"
       ]
     ]
   },
   {
-    "id": "cc396d19.c6009",
+    "id": "e1cf5942.513c08",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1637.2164726257324,
-    "y": 525.3993401527405,
-    "z": "205403e9.560efc",
+    "x": 1645.1891288757324,
+    "y": 539.4032468795776,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "151fea4f.a51286"
+        "482ef87f.84eaa8"
       ]
     ]
   },
   {
-    "id": "ccbbcb55.91af38",
+    "id": "f931a889.3afae8",
     "type": "set",
     "name": "set connection-attachment-ar from get",
     "xml": "<set>\n<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />\n",
     "comments": "",
-    "x": 2201.4758911132812,
-    "y": 454.0000534057617,
-    "z": "205403e9.560efc",
+    "x": 2209.4485473632812,
+    "y": 468.0039601325989,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "b1755c5c.5e7d2",
+    "id": "57b77b8c.0f7844",
     "type": "set",
     "name": "set oper-status",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
     "comments": "",
-    "x": 2135.4759216308594,
-    "y": 527.4285559654236,
-    "z": "205403e9.560efc",
+    "x": 2143.4485778808594,
+    "y": 541.4324626922607,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "ca13a843.2cf298",
+    "id": "bd538141.56707",
     "type": "switchNode",
     "name": "switch order-status",
     "xml": "<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2145.475700378418,
-    "y": 492.9999899864197,
-    "z": "205403e9.560efc",
+    "x": 2153.448356628418,
+    "y": 507.00389671325684,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "c5c8df87.d7496",
-        "96fbbcc4.3796a"
+        "dff36ce6.7bfdb",
+        "68d26983.d39818"
       ]
     ]
   },
   {
-    "id": "c5c8df87.d7496",
+    "id": "dff36ce6.7bfdb",
     "type": "outcome",
     "name": "outcome Created",
     "xml": "<outcome value='Created'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2381.075782775879,
-    "y": 487.00002098083496,
-    "z": "205403e9.560efc",
+    "x": 2389.048439025879,
+    "y": 501.0039277076721,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "88f78e4e.b4f9"
+        "a20d7036.b7b91"
       ]
     ]
   },
   {
-    "id": "96fbbcc4.3796a",
+    "id": "68d26983.d39818",
     "type": "outcome",
     "name": "outcome Other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2374.7902221679688,
-    "y": 526.4286289215088,
-    "z": "205403e9.560efc",
+    "x": 2382.7628784179688,
+    "y": 540.432535648346,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "935468c0.294618"
+        "95ec04c5.68c058"
       ]
     ]
   },
   {
-    "id": "88f78e4e.b4f9",
+    "id": "a20d7036.b7b91",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2595.546298980713,
-    "y": 488.37565517425537,
-    "z": "205403e9.560efc",
+    "x": 2603.518955230713,
+    "y": 502.37956190109253,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
         
@@ -462,28 +462,28 @@
     ]
   },
   {
-    "id": "935468c0.294618",
+    "id": "95ec04c5.68c058",
     "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\" \n    value=\"`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n",
     "comments": "",
-    "x": 2614.6980018615723,
-    "y": 529.0000190734863,
-    "z": "205403e9.560efc",
+    "x": 2622.6706581115723,
+    "y": 543.0039258003235,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "cd666072.c4472",
+    "id": "a6cc9265.33dd9",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-get-request-input-param",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 967.3342895507812,
-    "y": 594.4935550689697,
-    "z": "205403e9.560efc",
+    "x": 975.3069458007812,
+    "y": 608.4974617958069,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
         
@@ -491,264 +491,264 @@
     ]
   },
   {
-    "id": "f3e22a0c.d8db48",
+    "id": "84e0eeac.a2ba4",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 649.3403663635254,
-    "y": 594.4998416900635,
-    "z": "205403e9.560efc",
+    "x": 657.3130226135254,
+    "y": 608.5037484169006,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "cd666072.c4472"
+        "a6cc9265.33dd9"
       ]
     ]
   },
   {
-    "id": "606696e.6cc0f68",
+    "id": "7184e2e7.8c461c",
     "type": "get-resource",
     "name": "get-resource parent-service-data",
     "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 714.0316772460938,
-    "y": 736.5316162109375,
-    "z": "205403e9.560efc",
+    "x": 722.0043334960938,
+    "y": 750.5355229377747,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "f37fbd01.3a27c",
-        "a7659493.fc2068"
+        "1665d4d8.fb3cab",
+        "7f1aaa67.966654"
       ]
     ]
   },
   {
-    "id": "3f9c5fc2.bcfea",
+    "id": "2d977877.2cdd28",
     "type": "comment",
     "name": "GET parent-service-data from mdsal to check existence of other End point",
     "info": "",
     "comments": "",
-    "x": 834.0316162109375,
-    "y": 665.5315551757812,
-    "z": "205403e9.560efc",
+    "x": 842.0042724609375,
+    "y": 679.5354619026184,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "a4aef874.7e7e88",
+    "id": "413accea.8047d4",
     "type": "for",
     "name": "for pidx..mdsal-psd.provided-allotted-resources.provided-allotted-resource[]",
     "xml": "<for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1723.2160968780518,
-    "y": 904.0041084289551,
-    "z": "205403e9.560efc",
+    "x": 1731.1887531280518,
+    "y": 918.0080151557922,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "c0e3f5d5.ead6e8"
+        "bf28fd20.e4d9d"
       ]
     ]
   },
   {
-    "id": "6558b5c9.5b8bec",
+    "id": "f440893f.3eb748",
     "type": "switchNode",
     "name": "switch mdsal-psd.provided-allotted-resources_length",
     "xml": "<switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 780.2154541015625,
-    "y": 880.7180786132812,
-    "z": "205403e9.560efc",
+    "x": 788.1881103515625,
+    "y": 894.7219853401184,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "c8d5ad22.c170b",
-        "7c868dde.220b24",
-        "5e4728c1.e810e8"
+        "d800a1f4.f7982",
+        "d253364d.d38c98",
+        "2dc2ac81.8fbcc4"
       ]
     ]
   },
   {
-    "id": "c8d5ad22.c170b",
+    "id": "d800a1f4.f7982",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1112.3582763671875,
-    "y": 1157.5755004882812,
-    "z": "205403e9.560efc",
+    "x": 1120.3309326171875,
+    "y": 1171.5794072151184,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "bad30438.d05408"
+        "c302abb6.eb05c8"
       ]
     ]
   },
   {
-    "id": "3a4d0461.4005dc",
+    "id": "c4d4c7bb.632948",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1306.4856853485107,
-    "y": 898.7015209197998,
-    "z": "205403e9.560efc",
+    "x": 1314.4583415985107,
+    "y": 912.705427646637,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "a4aef874.7e7e88",
-        "e5572f4b.0166d"
+        "413accea.8047d4",
+        "ce0b3f4a.08eea"
       ]
     ]
   },
   {
-    "id": "c0e3f5d5.ead6e8",
+    "id": "bf28fd20.e4d9d",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test=\"`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2158.3274974823,
-    "y": 904.0040054321289,
-    "z": "205403e9.560efc",
+    "x": 2166.3001537323,
+    "y": 918.0079121589661,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "ac0df227.58a1c",
-        "39a3c95.9a56f36"
+        "1a1bdd33.763073",
+        "f9268b46.a58948"
       ]
     ]
   },
   {
-    "id": "ac0df227.58a1c",
+    "id": "1a1bdd33.763073",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2367.1377239227295,
-    "y": 876.4684953689575,
-    "z": "205403e9.560efc",
+    "x": 2375.1103801727295,
+    "y": 890.4724020957947,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "22a29502.ccff9a"
+        "c5aa7e99.1a51b"
       ]
     ]
   },
   {
-    "id": "64186f05.4be35",
+    "id": "9c7d5f29.63bbc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2546.8984203338623,
-    "y": 940.3256740570068,
-    "z": "205403e9.560efc",
+    "x": 2554.8710765838623,
+    "y": 954.329580783844,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "482d5120.f30ca",
-        "a13cbdb.502bd4"
+        "dc636dab.29589",
+        "1d4567ac.71fcc8"
       ]
     ]
   },
   {
-    "id": "482d5120.f30ca",
+    "id": "dc636dab.29589",
     "type": "set",
     "name": "set tmp.pidx and ptx.consumed-ar",
     "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n<parameter name='tmp.provided-ar.' value='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$pidx].`' />\n<parameter name='tmp.found-in-ar' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
     "comments": "",
-    "x": 2803.755926132202,
-    "y": 914.8971881866455,
-    "z": "205403e9.560efc",
+    "x": 2811.728582382202,
+    "y": 928.9010949134827,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "a13cbdb.502bd4",
+    "id": "1d4567ac.71fcc8",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 2714.6166439056396,
-    "y": 961.6532039642334,
-    "z": "205403e9.560efc",
+    "x": 2722.5893001556396,
+    "y": 975.6571106910706,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "f72ddcab.98ba7",
+    "id": "b1ecb95e.fe19d8",
     "type": "comment",
     "name": "Check existence of other AR in parent service data",
     "info": "Check if other allotted resource is available.",
     "comments": "",
-    "x": 769.993896484375,
-    "y": 814.8928833007812,
-    "z": "205403e9.560efc",
+    "x": 777.966552734375,
+    "y": 828.8967900276184,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "7c868dde.220b24",
+    "id": "d253364d.d38c98",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1124.0107231140137,
-    "y": 1028.6772651672363,
-    "z": "205403e9.560efc",
+    "x": 1131.9833793640137,
+    "y": 1042.6811718940735,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "4884d527.f966cc"
+        "72798bd.8ed1174"
       ]
     ]
   },
   {
-    "id": "bad30438.d05408",
+    "id": "c302abb6.eb05c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 1285.0106201171875,
-    "y": 1156.6772422790527,
-    "z": "205403e9.560efc",
+    "x": 1292.9832763671875,
+    "y": 1170.68114900589,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "5e4728c1.e810e8",
+    "id": "2dc2ac81.8fbcc4",
     "type": "other",
     "name": "outcome 2",
     "xml": "<outcome value='2'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1132.010705947876,
-    "y": 899.6772212982178,
-    "z": "205403e9.560efc",
+    "x": 1139.983362197876,
+    "y": 913.6811280250549,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "3a4d0461.4005dc"
+        "c4d4c7bb.632948"
       ]
     ]
   },
   {
-    "id": "22a29502.ccff9a",
+    "id": "c5aa7e99.1a51b",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2525.1219387054443,
-    "y": 875.6772384643555,
-    "z": "205403e9.560efc",
+    "x": 2533.0945949554443,
+    "y": 889.6811451911926,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
         
@@ -756,386 +756,386 @@
     ]
   },
   {
-    "id": "39a3c95.9a56f36",
+    "id": "f9268b46.a58948",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2366.1219387054443,
-    "y": 938.6772384643555,
-    "z": "205403e9.560efc",
+    "x": 2374.0945949554443,
+    "y": 952.6811451911926,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "64186f05.4be35"
+        "9c7d5f29.63bbc"
       ]
     ]
   },
   {
-    "id": "e5572f4b.0166d",
+    "id": "ce0b3f4a.08eea",
     "type": "switchNode",
     "name": "switch tmp.found-in-ar",
     "xml": "<switch test='`$tmp.found-in-ar`'>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1553.0106105804443,
-    "y": 975.4549942016602,
-    "z": "205403e9.560efc",
+    "x": 1560.9832668304443,
+    "y": 989.4589009284973,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "23e2fd66.fcd7c2"
+        "e09e23ee.bea8f"
       ]
     ]
   },
   {
-    "id": "23e2fd66.fcd7c2",
+    "id": "e09e23ee.bea8f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1776.0106563568115,
-    "y": 974.5661640167236,
-    "z": "205403e9.560efc",
+    "x": 1783.9833126068115,
+    "y": 988.5700707435608,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "8fa1eba4.3c67f8"
+        "8dfd0c85.a915"
       ]
     ]
   },
   {
-    "id": "8fa1eba4.3c67f8",
+    "id": "8dfd0c85.a915",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1966.0106868743896,
-    "y": 974.5662136077881,
-    "z": "205403e9.560efc",
+    "x": 1973.9833431243896,
+    "y": 988.5701203346252,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "5c438258.2817dc"
+        "c01e9fb3.005a4"
       ]
     ]
   },
   {
-    "id": "5c438258.2817dc",
+    "id": "c01e9fb3.005a4",
     "type": "get-resource",
     "name": "get-resource provided-ar.allotted-resource",
     "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$tmp.provided-ar.allotted-resource-id/' pfx='mdsal-other-ar' >",
     "comments": "",
     "outputs": 1,
-    "x": 2271.4550399780273,
-    "y": 1026.5662593841553,
-    "z": "205403e9.560efc",
+    "x": 2279.4276962280273,
+    "y": 1040.5701661109924,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "75e596c5.28a268",
-        "3fc2682f.986b78"
+        "cdcbe6d0.564cd8",
+        "d4c31f68.30c06"
       ]
     ]
   },
   {
-    "id": "75e596c5.28a268",
+    "id": "cdcbe6d0.564cd8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2571.128242492676,
-    "y": 1011.7949905395508,
-    "z": "205403e9.560efc",
+    "x": 2579.100898742676,
+    "y": 1025.798897266388,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "2d352ea7.0e12c2"
+        "a8542804.b5e6c8"
       ]
     ]
   },
   {
-    "id": "3fc2682f.986b78",
+    "id": "d4c31f68.30c06",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2562.9800453186035,
-    "y": 1046.8610754013062,
-    "z": "205403e9.560efc",
+    "x": 2570.9527015686035,
+    "y": 1060.8649821281433,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "1ccb7b0b.274855"
+        "7d0763b3.444adc"
       ]
     ]
   },
   {
-    "id": "abb4ba72.e83978",
+    "id": "4f1efc93.85dab4",
     "type": "switchNode",
     "name": "switch mdsal-psd.networks_length",
     "xml": "<switch test='`$mdsal-psd.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1550.3441162109375,
-    "y": 1127.8997802734375,
-    "z": "205403e9.560efc",
+    "x": 1558.3167724609375,
+    "y": 1141.9036870002747,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "7abae666.d51f58",
-        "f199acdb.1cc56"
+        "6774f061.befc3",
+        "82b7323.6fb02d"
       ]
     ]
   },
   {
-    "id": "f199acdb.1cc56",
+    "id": "82b7323.6fb02d",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1829.343994140625,
-    "y": 1137.78857421875,
-    "z": "205403e9.560efc",
+    "x": 1837.316650390625,
+    "y": 1151.7924809455872,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "362dc46c.af4b8c"
+        "90c3e5fe.809838"
       ]
     ]
   },
   {
-    "id": "7abae666.d51f58",
+    "id": "6774f061.befc3",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1823.3441162109375,
-    "y": 1197.78857421875,
-    "z": "205403e9.560efc",
+    "x": 1831.3167724609375,
+    "y": 1211.7924809455872,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "7c1c105.99f43f"
+        "f2dc069d.22e408"
       ]
     ]
   },
   {
-    "id": "7c1c105.99f43f",
+    "id": "f2dc069d.22e408",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Incorrect state found more then 1 network\" />\n    \n",
     "comments": "",
-    "x": 1979.9964599609375,
-    "y": 1198.890380859375,
-    "z": "205403e9.560efc",
+    "x": 1987.9691162109375,
+    "y": 1212.8942875862122,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "df5ebca6.dc1ea",
+    "id": "7296fdef.71a454",
     "type": "set",
     "name": "set tmp.network.",
     "xml": "<set>\n<parameter name='tmp.network.' value='`$mdsal-psd.networks.network[0].`' />\n",
     "comments": "",
-    "x": 2276.7888259887695,
-    "y": 1121.7887411117554,
-    "z": "205403e9.560efc",
+    "x": 2284.7614822387695,
+    "y": 1135.7926478385925,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "4884d527.f966cc",
+    "id": "72798bd.8ed1174",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1296.455078125,
-    "y": 1029.7885131835938,
-    "z": "205403e9.560efc",
+    "x": 1304.427734375,
+    "y": 1043.792419910431,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "abb4ba72.e83978"
+        "4f1efc93.85dab4"
       ]
     ]
   },
   {
-    "id": "362dc46c.af4b8c",
+    "id": "90c3e5fe.809838",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2021.1217041015625,
-    "y": 1140.7884521484375,
-    "z": "205403e9.560efc",
+    "x": 2029.0943603515625,
+    "y": 1154.7923588752747,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "df5ebca6.dc1ea",
-        "37668a8f.d84a36"
+        "7296fdef.71a454",
+        "f71acaf7.a5e418"
       ]
     ]
   },
   {
-    "id": "37668a8f.d84a36",
+    "id": "f71acaf7.a5e418",
     "type": "for",
     "name": "for nidx..tmp.network.network-data.network-request-input.network...[]",
     "xml": "<for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 2438.1218338012695,
-    "y": 1188.7885284423828,
-    "z": "205403e9.560efc",
+    "x": 2446.0944900512695,
+    "y": 1202.79243516922,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "8d783898.486c38"
+        "bef42353.ac417"
       ]
     ]
   },
   {
-    "id": "8d783898.486c38",
+    "id": "bef42353.ac417",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2809.67724609375,
-    "y": 1221.7884521484375,
-    "z": "205403e9.560efc",
+    "x": 2817.64990234375,
+    "y": 1235.7923588752747,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "f4f7612.08260a",
-        "4421135d.084d2c",
-        "5f144f0e.31549",
-        "37e78cdf.278a44",
-        "ed440eb3.36c94",
-        "f75e941b.01edb8",
-        "5523625.526319c",
-        "882c3718.7bb828",
-        "dae6d839.a75e08",
-        "bc77042c.0ab858"
+        "7c3ef39d.83f20c",
+        "18cbc1f3.8102ae",
+        "d4ff5a6.b2eb6a8",
+        "42092cc3.b6ed84",
+        "297544d9.6ec98c",
+        "66d53edd.cdef9",
+        "b4d50d62.6f88a",
+        "64cab1cd.5d443",
+        "10c9f83a.94e8c8",
+        "17843ccd.4f45d3"
       ]
     ]
   },
   {
-    "id": "f4f7612.08260a",
+    "id": "7c3ef39d.83f20c",
     "type": "switchNode",
     "name": "switch access-node-id",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 3015.1881942749023,
-    "y": 1069.7990770339966,
-    "z": "205403e9.560efc",
+    "x": 3023.1608505249023,
+    "y": 1083.8029837608337,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "5989197c.f6f7f8"
+        "19483932.311cc7"
       ]
     ]
   },
   {
-    "id": "5989197c.f6f7f8",
+    "id": "19483932.311cc7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3204.1878204345703,
-    "y": 1071.7989416122437,
-    "z": "205403e9.560efc",
+    "x": 3212.1604766845703,
+    "y": 1085.8028483390808,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "b51d0ed2.6b0e5"
+        "3b79183c.e90878"
       ]
     ]
   },
   {
-    "id": "b51d0ed2.6b0e5",
+    "id": "3b79183c.e90878",
     "type": "set",
     "name": "set tmp.found-in-network tmp.ep-available",
     "xml": "<set>\n<parameter name='tmp.found-in-network' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
     "comments": "",
-    "x": 3457.1879959106445,
-    "y": 1071.3989877700806,
-    "z": "205403e9.560efc",
+    "x": 3465.1606521606445,
+    "y": 1085.4028944969177,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "4421135d.084d2c",
+    "id": "18cbc1f3.8102ae",
     "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": 2996.1772994995117,
-    "y": 1526.7884120941162,
-    "z": "205403e9.560efc",
+    "x": 3004.1499557495117,
+    "y": 1540.7923188209534,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "d1e1bdb5.615f1",
+    "id": "80cf693a.7220c8",
     "type": "switchNode",
     "name": "switch tmp.ep-available",
     "xml": "<switch test='`$tmp.ep-available`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 706.3440551757812,
-    "y": 1292.2327880859375,
-    "z": "205403e9.560efc",
+    "x": 714.3167114257812,
+    "y": 1306.2366948127747,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "32c06766.90eaa8",
-        "3e428e4a.b1f8b2"
+        "6819776a.dd6ac8",
+        "786155e4.c1358c"
       ]
     ]
   },
   {
-    "id": "3e428e4a.b1f8b2",
+    "id": "786155e4.c1358c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 925.0107746124268,
-    "y": 1341.5661449432373,
-    "z": "205403e9.560efc",
+    "x": 932.9834308624268,
+    "y": 1355.5700516700745,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "5db74705.3b89f8"
+        "86bbb2c8.73a38"
       ]
     ]
   },
   {
-    "id": "32c06766.90eaa8",
+    "id": "6819776a.dd6ac8",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 929.8995761871338,
-    "y": 1250.5662059783936,
-    "z": "205403e9.560efc",
+    "x": 937.8722324371338,
+    "y": 1264.5701127052307,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "64e7831f.72ebbc"
+        "766accfd.fad464"
       ]
     ]
   },
   {
-    "id": "64e7831f.72ebbc",
+    "id": "766accfd.fad464",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1076.8995723724365,
-    "y": 1252.4550189971924,
-    "z": "205403e9.560efc",
+    "x": 1084.8722286224365,
+    "y": 1266.4589257240295,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
         
@@ -1143,199 +1143,199 @@
     ]
   },
   {
-    "id": "5db74705.3b89f8",
+    "id": "86bbb2c8.73a38",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1095.121862411499,
-    "y": 1339.5661029815674,
-    "z": "205403e9.560efc",
+    "x": 1103.094518661499,
+    "y": 1353.5700097084045,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "3c2f6627.61512a",
-        "380c3c36.553114",
-        "42f94a2e.999604"
+        "1a3bb9ea.5fc846",
+        "bafdeb31.9bf788",
+        "8302661e.daec38"
       ]
     ]
   },
   {
-    "id": "3c2f6627.61512a",
+    "id": "1a3bb9ea.5fc846",
     "type": "switchNode",
     "name": "switch tmp.found-in-ar",
     "xml": "<switch test='`$tmp.found-in-ar`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1325.23291015625,
-    "y": 1274.566162109375,
-    "z": "205403e9.560efc",
+    "x": 1333.20556640625,
+    "y": 1288.5700688362122,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "d79615f7.087d78",
-        "1c319701.787ef9"
+        "2dbd7031.b0f13",
+        "840dbee8.b38c3"
       ]
     ]
   },
   {
-    "id": "d79615f7.087d78",
+    "id": "2dbd7031.b0f13",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1545.677282333374,
-    "y": 1260.5661029815674,
-    "z": "205403e9.560efc",
+    "x": 1553.649938583374,
+    "y": 1274.5700097084045,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "ba9cd8cc.15f248"
+        "26e907a2.2afef8"
       ]
     ]
   },
   {
-    "id": "1c319701.787ef9",
+    "id": "840dbee8.b38c3",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1546.67724609375,
-    "y": 1306.566162109375,
-    "z": "205403e9.560efc",
+    "x": 1554.64990234375,
+    "y": 1320.5700688362122,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "719bb92a.4ee018"
+        "adf3229f.c54ae"
       ]
     ]
   },
   {
-    "id": "ba9cd8cc.15f248",
+    "id": "26e907a2.2afef8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1733.232946395874,
-    "y": 1257.5661029815674,
-    "z": "205403e9.560efc",
+    "x": 1741.205602645874,
+    "y": 1271.5700097084045,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "a6fc819d.1ebca"
+        "87392ac2.70f368"
       ]
     ]
   },
   {
-    "id": "719bb92a.4ee018",
+    "id": "adf3229f.c54ae",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1734.23291015625,
-    "y": 1305.566162109375,
-    "z": "205403e9.560efc",
+    "x": 1742.20556640625,
+    "y": 1319.5700688362122,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "815fbac.230c748"
+        "e8d19413.2d1f98"
       ]
     ]
   },
   {
-    "id": "25783fac.20762",
+    "id": "ea1f1cf0.78972",
     "type": "comment",
     "name": "GET connection-attachment-ar to store AR data from mdsal",
     "info": "",
     "comments": "",
-    "x": 2265.5040397644043,
-    "y": 416.5039129257202,
-    "z": "205403e9.560efc",
+    "x": 2273.4766960144043,
+    "y": 430.5078196525574,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "b02bb1b6.e7f4b",
+    "id": "9aaa3746.59be18",
     "type": "comment",
     "name": "Set source end point",
     "info": "",
     "comments": "",
-    "x": 671.0039176940918,
-    "y": 562.2539224624634,
-    "z": "205403e9.560efc",
+    "x": 678.9765739440918,
+    "y": 576.2578291893005,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "cb89d188.f33cc",
+    "id": "602ccaa6.5c1754",
     "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": 725,
-    "y": 701,
-    "z": "205403e9.560efc",
+    "x": 732.97265625,
+    "y": 715.0039067268372,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "f37fbd01.3a27c",
+    "id": "1665d4d8.fb3cab",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 961,
-    "y": 729,
-    "z": "205403e9.560efc",
+    "x": 968.97265625,
+    "y": 743.0039067268372,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "204f751a.862bca"
+        "d2585978.579578"
       ]
     ]
   },
   {
-    "id": "a7659493.fc2068",
+    "id": "7f1aaa67.966654",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 952.8518028259277,
-    "y": 764.0660848617554,
-    "z": "205403e9.560efc",
+    "x": 960.8244590759277,
+    "y": 778.0699915885925,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "7b61e92b.2f9e78"
+        "417b4b0.5e31db4"
       ]
     ]
   },
   {
-    "id": "7b61e92b.2f9e78",
+    "id": "417b4b0.5e31db4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 1128.00048828125,
-    "y": 760.3334350585938,
-    "z": "205403e9.560efc",
+    "x": 1135.97314453125,
+    "y": 774.3373417854309,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "204f751a.862bca",
+    "id": "d2585978.579578",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1112,
-    "y": 727,
-    "z": "205403e9.560efc",
+    "x": 1119.97265625,
+    "y": 741.0039067268372,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
         
@@ -1343,29 +1343,29 @@
     ]
   },
   {
-    "id": "1ccb7b0b.274855",
+    "id": "7d0763b3.444adc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN provided attachment resource not found\" />\n    \n",
     "comments": "",
-    "x": 2732.9999256134033,
-    "y": 1048.0000953674316,
-    "z": "205403e9.560efc",
+    "x": 2740.9725818634033,
+    "y": 1062.0040020942688,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "2d352ea7.0e12c2",
+    "id": "a8542804.b5e6c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2716.9999256134033,
-    "y": 1009.0000953674316,
-    "z": "205403e9.560efc",
+    "x": 2724.9725818634033,
+    "y": 1023.0040020942688,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
         
@@ -1373,364 +1373,364 @@
     ]
   },
   {
-    "id": "3bc10ee7.beb432",
+    "id": "85ce847d.6d7528",
     "type": "set",
     "name": "set tmp.found-in-ar tmp.found-in-network tmp.ep-available to false",
     "xml": "<set>\n<parameter name='tmp.found-in-ar' value='false' />\n<parameter name='tmp.found-in-network' value='false' />\n<parameter name='tmp.ep-available' value='false' />",
     "comments": "",
-    "x": 817,
-    "y": 846,
-    "z": "205403e9.560efc",
+    "x": 824.97265625,
+    "y": 860.0039067268372,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "c79a6189.fcf2c",
+    "id": "3af7f371.2bc2ac",
     "type": "comment",
     "name": "If other EP exists set destination end point",
     "info": "Check if other allotted resource is available.",
     "comments": "",
-    "x": 757,
-    "y": 1217,
-    "z": "205403e9.560efc",
+    "x": 764.97265625,
+    "y": 1231.0039067268372,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "bac44858.bd4fb8",
+    "id": "5c493845.192678",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1524,
-    "y": 1423,
-    "z": "205403e9.560efc",
+    "x": 1531.97265625,
+    "y": 1437.0039067268372,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "43736465.ded50c",
-        "1f0536d6.03d209",
-        "1c6c8b83.e7b554",
-        "804dff2.f416",
-        "faab91d9.9baa6",
-        "40922023.6161",
-        "cce7fa52.3ac5b8",
-        "afdc2a42.250d98"
+        "3869f025.0085f",
+        "6d83eb1f.c06da4",
+        "4ef9f41a.4cbccc",
+        "6ef50d20.7a2d94",
+        "1ec5a1f5.39482e",
+        "2020b84a.aa3f78",
+        "2fc4c609.3e5f6a",
+        "8d865fcb.ed997"
       ]
     ]
   },
   {
-    "id": "43736465.ded50c",
+    "id": "3869f025.0085f",
     "type": "switchNode",
     "name": "switch access-node-id",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-node-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1760.51025390625,
-    "y": 1356.0103759765625,
-    "z": "205403e9.560efc",
+    "x": 1768.48291015625,
+    "y": 1370.0142827033997,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "327e9777.bfc4d8"
+        "c5fce3c7.fd67c"
       ]
     ]
   },
   {
-    "id": "1f0536d6.03d209",
+    "id": "6d83eb1f.c06da4",
     "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": 1733.5002059936523,
-    "y": 1661.0003395080566,
-    "z": "205403e9.560efc",
+    "x": 1741.4728622436523,
+    "y": 1675.0042462348938,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "1c6c8b83.e7b554",
+    "id": "4ef9f41a.4cbccc",
     "type": "switchNode",
     "name": "switch access-ltp-id",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-ltp-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1752.0000839233398,
-    "y": 1399.777907371521,
-    "z": "205403e9.560efc",
+    "x": 1759.9727401733398,
+    "y": 1413.7818140983582,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "a140ea29.0beb08"
+        "28368228.3fc38e"
       ]
     ]
   },
   {
-    "id": "804dff2.f416",
+    "id": "6ef50d20.7a2d94",
     "type": "switchNode",
     "name": "switch clientSignal",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1746.0001220703125,
-    "y": 1445.7779541015625,
-    "z": "205403e9.560efc",
+    "x": 1753.9727783203125,
+    "y": 1459.7818608283997,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "ce02a989.0990f8"
+        "acc31d1c.59732"
       ]
     ]
   },
   {
-    "id": "faab91d9.9baa6",
+    "id": "1ec5a1f5.39482e",
     "type": "switchNode",
     "name": "switch cVLAN",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1729.9896240234375,
-    "y": 1484.7674560546875,
-    "z": "205403e9.560efc",
+    "x": 1737.9622802734375,
+    "y": 1498.7713627815247,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "f26df0a2.edf49"
+        "d493c625.a30ae8"
       ]
     ]
   },
   {
-    "id": "327e9777.bfc4d8",
+    "id": "c5fce3c7.fd67c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1938.22216796875,
-    "y": 1356.666748046875,
-    "z": "205403e9.560efc",
+    "x": 1946.19482421875,
+    "y": 1370.6706547737122,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "ded3a3b2.bb6de"
+        "11ae82e.b231c7d"
       ]
     ]
   },
   {
-    "id": "ded3a3b2.bb6de",
+    "id": "11ae82e.b231c7d",
     "type": "set",
     "name": "set dst-access-node-id",
     "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$tmp.ep.parameters.param[$idx].value`' />",
     "comments": "",
-    "x": 2111.22216796875,
-    "y": 1356.2667236328125,
-    "z": "205403e9.560efc",
+    "x": 2119.19482421875,
+    "y": 1370.2706303596497,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "a140ea29.0beb08",
+    "id": "28368228.3fc38e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1933.7120361328125,
-    "y": 1399.4342041015625,
-    "z": "205403e9.560efc",
+    "x": 1941.6846923828125,
+    "y": 1413.4381108283997,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "d26fb8e0.ff59f8"
+        "304613c.5ad2cec"
       ]
     ]
   },
   {
-    "id": "ce02a989.0990f8",
+    "id": "acc31d1c.59732",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1933.7120361328125,
-    "y": 1445.4342041015625,
-    "z": "205403e9.560efc",
+    "x": 1941.6846923828125,
+    "y": 1459.4381108283997,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "ee911b75.034b28"
+        "fab4a63a.f922d8"
       ]
     ]
   },
   {
-    "id": "f26df0a2.edf49",
+    "id": "d493c625.a30ae8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1933.7015380859375,
-    "y": 1484.423828125,
-    "z": "205403e9.560efc",
+    "x": 1941.6741943359375,
+    "y": 1498.4277348518372,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "16f5641b.4b39fc"
+        "2e48f16d.306a3e"
       ]
     ]
   },
   {
-    "id": "380c3c36.553114",
+    "id": "bafdeb31.9bf788",
     "type": "for",
     "name": "for idx..tmp.ep.parameters[]",
     "xml": "<for index='idx' start='0' end='`$tmp.ep.parameters.param_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 1342,
-    "y": 1356,
-    "z": "205403e9.560efc",
+    "x": 1349.97265625,
+    "y": 1370.0039067268372,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "bac44858.bd4fb8"
+        "5c493845.192678"
       ]
     ]
   },
   {
-    "id": "a6fc819d.1ebca",
+    "id": "87392ac2.70f368",
     "type": "set",
     "name": "set tmp.ep.parameters",
     "xml": "<set>\n<parameter name='tmp.ep.parameters' value='`$mdsal-other-ar.allotted-resource-data.connection-attachment-topology.connection-attachment-parameters`' />",
     "comments": "",
-    "x": 1945,
-    "y": 1257,
-    "z": "205403e9.560efc",
+    "x": 1952.97265625,
+    "y": 1271.0039067268372,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "815fbac.230c748",
+    "id": "e8d19413.2d1f98",
     "type": "set",
     "name": "set tmp.ep.parameters",
     "xml": "<set>\n<parameter name='tmp.ep.parameters' value='`$tmp.network.network-data.network-request-input.network-input-parameters`' />\n",
     "comments": "",
-    "x": 1945.999963760376,
-    "y": 1301.0000591278076,
-    "z": "205403e9.560efc",
+    "x": 1953.972620010376,
+    "y": 1315.0039658546448,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "d26fb8e0.ff59f8",
+    "id": "304613c.5ad2cec",
     "type": "set",
     "name": "set dst-access-node-id",
     "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$tmp.ep.parameters.param[$idx].value`' />",
     "comments": "",
-    "x": 2111,
-    "y": 1399,
-    "z": "205403e9.560efc",
+    "x": 2118.97265625,
+    "y": 1413.0039067268372,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "ee911b75.034b28",
+    "id": "fab4a63a.f922d8",
     "type": "set",
     "name": "set dst-clientSignal",
     "xml": "<set>\n<parameter name='prop.remote.connection-attachment.clientSignal' value='`$tmp.ep.parameters.param[$idx].value`' />",
     "comments": "",
-    "x": 2105,
-    "y": 1443,
-    "z": "205403e9.560efc",
+    "x": 2112.97265625,
+    "y": 1457.0039067268372,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "16f5641b.4b39fc",
+    "id": "2e48f16d.306a3e",
     "type": "set",
     "name": "set dst-cVLAN",
     "xml": "<set>\n<parameter name='prop.remote.connection-attachment.cVLAN' value='`$tmp.ep.parameters.param[$idx].value`' />",
     "comments": "",
-    "x": 2096,
-    "y": 1482,
-    "z": "205403e9.560efc",
+    "x": 2103.97265625,
+    "y": 1496.0039067268372,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "42f94a2e.999604",
+    "id": "8302661e.daec38",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 736,
-    "y": 1584,
-    "z": "205403e9.560efc",
+    "x": 743.97265625,
+    "y": 1598.0039067268372,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "cb687dc5.52b2d",
-        "4ed51df6.e8ec54"
+        "fe3d007c.a7b3a",
+        "d535134a.50d41"
       ]
     ]
   },
   {
-    "id": "164aff86.323ed",
+    "id": "bec1e4c7.8b8598",
     "type": "comment",
     "name": "Get controller info and send request",
     "info": "",
     "comments": "",
-    "x": 686,
-    "y": 1546,
-    "z": "205403e9.560efc",
+    "x": 693.97265625,
+    "y": 1560.0039067268372,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "9edea41a.d68a58",
+    "id": "17954934.ffd177",
     "type": "execute",
     "name": "execute RestApiCallNode Create ethernet Service",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1379.0000305175781,
-    "y": 2062.0007610321045,
-    "z": "205403e9.560efc",
+    "x": 1386.9726867675781,
+    "y": 2076.0046677589417,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "616e1655.379198",
-        "b0089735.e037f8"
+        "cabe4ed3.59977",
+        "efc13d2a.c27fa"
       ]
     ]
   },
   {
-    "id": "616e1655.379198",
+    "id": "cabe4ed3.59977",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1666.0000228881836,
-    "y": 2083.0007104873657,
-    "z": "205403e9.560efc",
+    "x": 1673.9726791381836,
+    "y": 2097.004617214203,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "96c14b60.8835b8"
+        "4d9476e4.ffbd08"
       ]
     ]
   },
   {
-    "id": "96c14b60.8835b8",
+    "id": "4d9476e4.ffbd08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1835.9999618530273,
-    "y": 2086.0007104873657,
-    "z": "205403e9.560efc",
+    "x": 1843.9726181030273,
+    "y": 2100.004617214203,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
         
@@ -1738,221 +1738,221 @@
     ]
   },
   {
-    "id": "a39478d4.ff01e8",
+    "id": "cb5d2c8f.264c6",
     "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 executing Create vpn rest api\" />\n",
     "comments": "",
-    "x": 1836.0000839233398,
-    "y": 2042.0007104873657,
-    "z": "205403e9.560efc",
+    "x": 1843.9727401733398,
+    "y": 2056.004617214203,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "b0089735.e037f8",
+    "id": "efc13d2a.c27fa",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1668.9999618530273,
-    "y": 2042.0007104873657,
-    "z": "205403e9.560efc",
+    "x": 1676.9726181030273,
+    "y": 2056.004617214203,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "a39478d4.ff01e8"
+        "cb5d2c8f.264c6"
       ]
     ]
   },
   {
-    "id": "ed031fec.cf219",
+    "id": "e2b1aa80.433d58",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1018.7622451782227,
-    "y": 2481.953144431114,
-    "z": "205403e9.560efc",
+    "x": 994.7349166870117,
+    "y": 2668.9571779966354,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "2bd27313.7e4a0c"
+        "49e7952b.6308dc"
       ]
     ]
   },
   {
-    "id": "2bd27313.7e4a0c",
+    "id": "49e7952b.6308dc",
     "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": 1185.2861251831055,
-    "y": 2493.572215437889,
-    "z": "205403e9.560efc",
+    "x": 1161.2587966918945,
+    "y": 2680.5762490034103,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "581d8c50.26f904",
+    "id": "b0220db9.73208",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1025.8575325012207,
-    "y": 2514.715112090111,
-    "z": "205403e9.560efc",
+    "x": 1001.8302040100098,
+    "y": 2701.719145655632,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "2bd27313.7e4a0c"
+        "49e7952b.6308dc"
       ]
     ]
   },
   {
-    "id": "9aeb74dd.a24a08",
+    "id": "8836c87e.2127d8",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 737.8099594116211,
-    "y": 2464.302532672882,
-    "z": "205403e9.560efc",
+    "x": 713.7826309204102,
+    "y": 2651.3065662384033,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "9158a090.142c2",
+    "id": "ae69a5b4.bcb4d8",
     "type": "comment",
     "name": "TODO: Rework after confirmation from AAI",
     "info": "",
     "comments": "",
-    "x": 1038.1688690185547,
-    "y": 2441.873571395874,
-    "z": "205403e9.560efc",
+    "x": 1014.1415405273438,
+    "y": 2628.8776049613953,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "f9e2a4f.0cf5858",
+    "id": "a26aed10.bae5b",
     "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": 752.5776557922363,
-    "y": 2385.828013896942,
-    "z": "205403e9.560efc",
+    "x": 728.5503273010254,
+    "y": 2572.8320474624634,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "6afb5fe5.f951c",
+    "id": "4c5d18d9.d86fb8",
     "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": 720.9907379150391,
-    "y": 2546.443766117096,
-    "z": "205403e9.560efc",
+    "x": 696.9634094238281,
+    "y": 2733.447799682617,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "9ab0f309.357b6",
+    "id": "69a30b87.057684",
     "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": 802.309757232666,
-    "y": 2293.4687876701355,
-    "z": "205403e9.560efc",
+    "x": 778.2824287414551,
+    "y": 2480.4728212356567,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "cf614e80.0a4b3",
-        "6d53da86.669ad4",
-        "131ccd05.2f3143"
+        "28d10010.8846d",
+        "a946bcd6.894fb",
+        "dceabbc6.4f8628"
       ]
     ]
   },
   {
-    "id": "cf614e80.0a4b3",
+    "id": "28d10010.8846d",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1070.9511337280273,
-    "y": 2344.8001994118094,
-    "z": "205403e9.560efc",
+    "x": 1046.9238052368164,
+    "y": 2531.8042329773307,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "ef1dfc84.71501"
+        "8ae56ed5.c0311"
       ]
     ]
   },
   {
-    "id": "6d53da86.669ad4",
+    "id": "a946bcd6.894fb",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1061.9511833190918,
-    "y": 2313.300225161016,
-    "z": "205403e9.560efc",
+    "x": 1037.9238548278809,
+    "y": 2500.3042587265372,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "ef1dfc84.71501"
+        "8ae56ed5.c0311"
       ]
     ]
   },
   {
-    "id": "131ccd05.2f3143",
+    "id": "dceabbc6.4f8628",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1065.7012214660645,
-    "y": 2283.6573300361633,
-    "z": "205403e9.560efc",
+    "x": 1041.6738929748535,
+    "y": 2470.6613636016846,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "e18bb85.a259b48"
+        "fec8c7a7.259eb8"
       ]
     ]
   },
   {
-    "id": "ef1dfc84.71501",
+    "id": "8ae56ed5.c0311",
     "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": 1231.7012214660645,
-    "y": 2314.050249002874,
-    "z": "205403e9.560efc",
+    "x": 1207.6738929748535,
+    "y": 2501.054282568395,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "e18bb85.a259b48",
+    "id": "fec8c7a7.259eb8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1207.3571891784668,
-    "y": 2279.8494992256165,
-    "z": "205403e9.560efc",
+    "x": 1183.3298606872559,
+    "y": 2466.8535327911377,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
         
@@ -1960,28 +1960,28 @@
     ]
   },
   {
-    "id": "bef55f2e.ad6b3",
+    "id": "447e9068.877d",
     "type": "set",
     "name": "set ar-data",
     "xml": "<set>\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.` \" />",
     "comments": "",
-    "x": 707.5233535766602,
-    "y": 2144.849767923355,
-    "z": "205403e9.560efc",
+    "x": 683.4960250854492,
+    "y": 2331.8538014888763,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "d7f464d6.9ac5f8",
+    "id": "195a1754.387c79",
     "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": 724.809196472168,
-    "y": 2217.4693655967712,
-    "z": "205403e9.560efc",
+    "x": 700.781867980957,
+    "y": 2404.4733991622925,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
         
@@ -1989,118 +1989,118 @@
     ]
   },
   {
-    "id": "a66d68ee.9308e8",
+    "id": "17bafb78.38c045",
     "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='Active' />\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": 774.7962760925293,
-    "y": 2254.420445919037,
-    "z": "205403e9.560efc",
+    "x": 750.7689476013184,
+    "y": 2441.424479484558,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "36004db7.4505d2",
+    "id": "4b7801cc.5bfc5",
     "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": 721.3648948669434,
-    "y": 2184.0244183540344,
-    "z": "205403e9.560efc",
+    "x": 697.3375663757324,
+    "y": 2371.0284519195557,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "8c652fd0.4d9e2",
+    "id": "4bbe982e.918098",
     "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": 834.698356628418,
-    "y": 2105.0243704319,
-    "z": "205403e9.560efc",
+    "x": 810.671028137207,
+    "y": 2292.0284039974213,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "69186aa2.60ef84",
+    "id": "cbc69d8c.531e6",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 776.2781829833984,
-    "y": 2072.437672138214,
-    "z": "205403e9.560efc",
+    "x": 752.2508544921875,
+    "y": 2259.4417057037354,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "7b232ea8.d345",
+    "id": "bc43d14.b5aca3",
     "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\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$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=\"Active\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 764.2542381286621,
-    "y": 2501.754675388336,
-    "z": "205403e9.560efc",
+    "x": 740.2269096374512,
+    "y": 2688.7587089538574,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "ed031fec.cf219",
-        "581d8c50.26f904"
+        "e2b1aa80.433d58",
+        "b0220db9.73208"
       ]
     ]
   },
   {
-    "id": "cb687dc5.52b2d",
+    "id": "fe3d007c.a7b3a",
     "type": "execute",
     "name": "execute RestApiCallNode getPath from OOF",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1043.0040130615234,
-    "y": 1572.2544918060303,
-    "z": "205403e9.560efc",
+    "x": 1050.9766693115234,
+    "y": 1586.2583985328674,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "e275a7ba.f6ec08",
-        "ec20f395.66c91"
+        "4a299f49.a1b2",
+        "c4483a2a.ee5b88"
       ]
     ]
   },
   {
-    "id": "e275a7ba.f6ec08",
+    "id": "4a299f49.a1b2",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1350.0039558410645,
-    "y": 1593.2543387413025,
-    "z": "205403e9.560efc",
+    "x": 1357.9766120910645,
+    "y": 1607.2582454681396,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "d000e963.b327a8"
+        "5d2783a1.6d3b9c"
       ]
     ]
   },
   {
-    "id": "d000e963.b327a8",
+    "id": "5d2783a1.6d3b9c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1520.0038948059082,
-    "y": 1596.2543387413025,
-    "z": "205403e9.560efc",
+    "x": 1527.9765510559082,
+    "y": 1610.2582454681396,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
         
@@ -2108,863 +2108,959 @@
     ]
   },
   {
-    "id": "773ede9b.4ecb",
+    "id": "17a7cdf5.434e32",
     "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 executing Create vpn rest api\" />\n",
     "comments": "",
-    "x": 1520.0040168762207,
-    "y": 1552.2543387413025,
-    "z": "205403e9.560efc",
+    "x": 1527.9766731262207,
+    "y": 1566.2582454681396,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "ec20f395.66c91",
+    "id": "c4483a2a.ee5b88",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1353.0038948059082,
-    "y": 1552.2543387413025,
-    "z": "205403e9.560efc",
+    "x": 1360.9765510559082,
+    "y": 1566.2582454681396,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "773ede9b.4ecb"
+        "17a7cdf5.434e32"
       ]
     ]
   },
   {
-    "id": "461ac2a4.5bdfec",
+    "id": "f41dba91.d30b78",
     "type": "comment",
     "name": "Get VPNs from OOF",
     "info": "",
     "comments": "",
-    "x": 963.0079040527344,
-    "y": 1535.2584590911865,
-    "z": "205403e9.560efc",
+    "x": 970.9805603027344,
+    "y": 1549.2623658180237,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "4ed51df6.e8ec54",
+    "id": "d535134a.50d41",
     "type": "for",
     "name": "for vidx..oof.vpns_length[]",
     "xml": "<for index='vidx' start='0' end='`$oof.vpns_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 994.0039024353027,
-    "y": 1656.5040574073792,
-    "z": "205403e9.560efc",
+    "x": 1001.9765586853027,
+    "y": 1670.5079641342163,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "fa8596fd.dc6fb8"
+        "1e57fa4c.c37666"
       ]
     ]
   },
   {
-    "id": "9e6cff97.3e047",
+    "id": "39fad139.2c54be",
     "type": "comment",
     "name": "Loop through VPN and configure them",
     "info": "",
     "comments": "",
-    "x": 1016.004020690918,
-    "y": 1620.0043177604675,
-    "z": "205403e9.560efc",
+    "x": 1023.976676940918,
+    "y": 1634.0082244873047,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "5f144f0e.31549",
+    "id": "d4ff5a6.b2eb6a8",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2994.7882919311523,
-    "y": 1167.1217517852783,
-    "z": "205403e9.560efc",
+    "x": 3002.7609481811523,
+    "y": 1181.1256585121155,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "36d080c6.aaac9"
+        "3a16beb3.77fd72"
       ]
     ]
   },
   {
-    "id": "36d080c6.aaac9",
+    "id": "3a16beb3.77fd72",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3181.788299560547,
-    "y": 1161.1216888427734,
-    "z": "205403e9.560efc",
+    "x": 3189.760955810547,
+    "y": 1175.1255955696106,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "dd94e80d.e79a58"
+        "16ef01df.25c11e"
       ]
     ]
   },
   {
-    "id": "dd94e80d.e79a58",
+    "id": "16ef01df.25c11e",
     "type": "set",
     "name": "set etht-svc-name & bandwidth-profile-name",
     "xml": "<set>\n<parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n<parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 3443.788589477539,
-    "y": 1147.721715927124,
-    "z": "205403e9.560efc",
+    "x": 3451.761245727539,
+    "y": 1161.7256226539612,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "37e78cdf.278a44",
+    "id": "42092cc3.b6ed84",
     "type": "switchNode",
     "name": "switch description",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'description'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3005.627960205078,
-    "y": 1205.1216869354248,
-    "z": "205403e9.560efc",
+    "x": 3013.600616455078,
+    "y": 1219.125593662262,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "87cfc59c.1be938"
+        "23eb9630.e037ca"
       ]
     ]
   },
   {
-    "id": "87cfc59c.1be938",
+    "id": "23eb9630.e037ca",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3175.627960205078,
-    "y": 1201.1216869354248,
-    "z": "205403e9.560efc",
+    "x": 3183.600616455078,
+    "y": 1215.125593662262,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "af30cb49.aad268"
+        "eb3f5617.6e6248"
       ]
     ]
   },
   {
-    "id": "af30cb49.aad268",
+    "id": "eb3f5617.6e6248",
     "type": "set",
     "name": "set etht-svc-descr",
     "xml": "<set>\n<parameter name='prop.global.sotn.etht-svc-descr' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 3362.961400985718,
-    "y": 1199.5828437805176,
-    "z": "205403e9.560efc",
+    "x": 3370.934057235718,
+    "y": 1213.5867505073547,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "ed440eb3.36c94",
+    "id": "297544d9.6ec98c",
     "type": "switchNode",
     "name": "switch tenantId",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2991.010353088379,
-    "y": 1251.455090522766,
-    "z": "205403e9.560efc",
+    "x": 2998.983009338379,
+    "y": 1265.4589972496033,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "824d6eab.2a9f8"
+        "dbc7c34c.cdaf7"
       ]
     ]
   },
   {
-    "id": "824d6eab.2a9f8",
+    "id": "dbc7c34c.cdaf7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3183.010341644287,
-    "y": 1244.4550142288208,
-    "z": "205403e9.560efc",
+    "x": 3190.982997894287,
+    "y": 1258.458920955658,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "58ea9e80.950b3"
+        "6550e027.0b278"
       ]
     ]
   },
   {
-    "id": "58ea9e80.950b3",
+    "id": "6550e027.0b278",
     "type": "set",
     "name": "set tenantId",
     "xml": "<set>\n<parameter name='prop.global.sotn.tenantId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 3351.010341644287,
-    "y": 1245.0550203323364,
-    "z": "205403e9.560efc",
+    "x": 3358.982997894287,
+    "y": 1259.0589270591736,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "5523625.526319c",
+    "id": "b4d50d62.6f88a",
     "type": "switchNode",
     "name": "switch CIR",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'CIR'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2977.849998474121,
-    "y": 1338.455072402954,
-    "z": "205403e9.560efc",
+    "x": 2985.822654724121,
+    "y": 1352.4589791297913,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "6cc5147d.9f838c"
+        "451e6ff5.dd741"
       ]
     ]
   },
   {
-    "id": "6cc5147d.9f838c",
+    "id": "451e6ff5.dd741",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3185.850067138672,
-    "y": 1334.4550857543945,
-    "z": "205403e9.560efc",
+    "x": 3193.822723388672,
+    "y": 1348.4589924812317,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "5119c20c.53e31c"
+        "4615d379.ef895c"
       ]
     ]
   },
   {
-    "id": "5119c20c.53e31c",
+    "id": "4615d379.ef895c",
     "type": "set",
     "name": "set cir",
     "xml": "<set>\n<parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 3335.1833877563477,
-    "y": 1332.9162330627441,
-    "z": "205403e9.560efc",
+    "x": 3343.1560440063477,
+    "y": 1346.9201397895813,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "f75e941b.01edb8",
+    "id": "66d53edd.cdef9",
     "type": "switchNode",
     "name": "switch vpnType",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2997.1584701538086,
-    "y": 1292.2327914237976,
-    "z": "205403e9.560efc",
+    "x": 3005.1311264038086,
+    "y": 1306.2366981506348,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "94f8c651.7d4c68"
+        "654a7b17.6fec94"
       ]
     ]
   },
   {
-    "id": "94f8c651.7d4c68",
+    "id": "654a7b17.6fec94",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3184.1584701538086,
-    "y": 1288.2327914237976,
-    "z": "205403e9.560efc",
+    "x": 3192.1311264038086,
+    "y": 1302.2366981506348,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "a2401fbd.0e5a6"
+        "2fb4b95a.7ae496"
       ]
     ]
   },
   {
-    "id": "a2401fbd.0e5a6",
+    "id": "2fb4b95a.7ae496",
     "type": "set",
     "name": "set vpnType",
     "xml": "<set>\n<parameter name='prop.global.sotn.vpnType' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 3353.49210357666,
-    "y": 1285.693956375122,
-    "z": "205403e9.560efc",
+    "x": 3361.46475982666,
+    "y": 1299.6978631019592,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "882c3718.7bb828",
+    "id": "64cab1cd.5d443",
     "type": "switchNode",
     "name": "switch EIR",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'EIR'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2979.140449523926,
-    "y": 1381.1529388427734,
-    "z": "205403e9.560efc",
+    "x": 2987.113105773926,
+    "y": 1395.1568455696106,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "6a090cfc.b29bc4"
+        "6c9f358b.4ef8ec"
       ]
     ]
   },
   {
-    "id": "6a090cfc.b29bc4",
+    "id": "6c9f358b.4ef8ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3181.140411376953,
-    "y": 1376.152958869934,
-    "z": "205403e9.560efc",
+    "x": 3189.113067626953,
+    "y": 1390.1568655967712,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "7cfdc8c0.796128"
+        "e70be1bb.0faca"
       ]
     ]
   },
   {
-    "id": "7cfdc8c0.796128",
+    "id": "e70be1bb.0faca",
     "type": "set",
     "name": "set eir",
     "xml": "<set>\n<parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 3337.4739151000977,
-    "y": 1375.614094734192,
-    "z": "205403e9.560efc",
+    "x": 3345.4465713500977,
+    "y": 1389.618001461029,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "dae6d839.a75e08",
+    "id": "10c9f83a.94e8c8",
     "type": "switchNode",
     "name": "switch color-aware",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'color-aware'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3006.1407203674316,
-    "y": 1435.152904510498,
-    "z": "205403e9.560efc",
+    "x": 3014.1133766174316,
+    "y": 1449.1568112373352,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "1c170ed.c3c73f1"
+        "1f4cc1a3.6b11ee"
       ]
     ]
   },
   {
-    "id": "1c170ed.c3c73f1",
+    "id": "1f4cc1a3.6b11ee",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3184.140724182129,
-    "y": 1429.1528968811035,
-    "z": "205403e9.560efc",
+    "x": 3192.113380432129,
+    "y": 1443.1568036079407,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "aafef618.cfb6d8"
+        "9c3700e2.9346b"
       ]
     ]
   },
   {
-    "id": "aafef618.cfb6d8",
+    "id": "9c3700e2.9346b",
     "type": "set",
     "name": "set colorAware",
     "xml": "<set>\n<parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 3365.4741020202637,
-    "y": 1428.614055633545,
-    "z": "205403e9.560efc",
+    "x": 3373.4467582702637,
+    "y": 1442.617962360382,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "bc77042c.0ab858",
+    "id": "17843ccd.4f45d3",
     "type": "switchNode",
     "name": "switch coupling-flag",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'coupling-flag'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 3006.140727996826,
-    "y": 1481.1529293060303,
-    "z": "205403e9.560efc",
+    "x": 3014.113384246826,
+    "y": 1495.1568360328674,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "9c20abd0.a9e0c8"
+        "1a061794.0a46a8"
       ]
     ]
   },
   {
-    "id": "9c20abd0.a9e0c8",
+    "id": "1a061794.0a46a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3184.1407203674316,
-    "y": 1473.1528978347778,
-    "z": "205403e9.560efc",
+    "x": 3192.1133766174316,
+    "y": 1487.156804561615,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "28950acd.c17166"
+        "17025d4a.2f4a83"
       ]
     ]
   },
   {
-    "id": "28950acd.c17166",
+    "id": "17025d4a.2f4a83",
     "type": "set",
     "name": "set couplingFlag",
     "xml": "<set>\n<parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 3369.4741020202637,
-    "y": 1473.6140804290771,
-    "z": "205403e9.560efc",
+    "x": 3377.4467582702637,
+    "y": 1487.6179871559143,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "dddada55.283bb8",
+    "id": "894df50e.725b18",
     "type": "comment",
     "name": "Check if other EP exists in SOTNConnectionResource",
     "info": "",
     "comments": "",
-    "x": 3109.3440551757812,
-    "y": 1034.7883319854736,
-    "z": "205403e9.560efc",
+    "x": 3117.3167114257812,
+    "y": 1048.7922387123108,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "e2fb1fc.98e08e",
+    "id": "cac8b97a.954468",
     "type": "comment",
     "name": "Get other global parameters from network",
     "info": "",
     "comments": "",
-    "x": 3080.3438568115234,
-    "y": 1126.7882843017578,
-    "z": "205403e9.560efc",
+    "x": 3088.3165130615234,
+    "y": 1140.792191028595,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "40922023.6161",
+    "id": "2020b84a.aa3f78",
     "type": "switchNode",
     "name": "switch access-provider-id",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-provider-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1767.56591796875,
-    "y": 1530.232666015625,
-    "z": "205403e9.560efc",
+    "x": 1775.53857421875,
+    "y": 1544.2365727424622,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "dcc5b1ab.d080a"
+        "b2fc0056.5b557"
       ]
     ]
   },
   {
-    "id": "dcc5b1ab.d080a",
+    "id": "b2fc0056.5b557",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1954.56591796875,
-    "y": 1526.232666015625,
-    "z": "205403e9.560efc",
+    "x": 1962.53857421875,
+    "y": 1540.2365727424622,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "61749b73.8eae04"
+        "d84c0472.872308"
       ]
     ]
   },
   {
-    "id": "61749b73.8eae04",
+    "id": "d84c0472.872308",
     "type": "set",
     "name": "set access-provider-id",
     "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2122.56591796875,
-    "y": 1526.8326721191406,
-    "z": "205403e9.560efc",
+    "x": 2130.53857421875,
+    "y": 1540.8365788459778,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "cce7fa52.3ac5b8",
+    "id": "2fc4c609.3e5f6a",
     "type": "switchNode",
     "name": "switch access-client-id",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-client-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1758.565933227539,
-    "y": 1573.2431144714355,
-    "z": "205403e9.560efc",
+    "x": 1766.538589477539,
+    "y": 1587.2470211982727,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "17cba761.8a69d9"
+        "d33716c2.7a5c08"
       ]
     ]
   },
   {
-    "id": "17cba761.8a69d9",
+    "id": "d33716c2.7a5c08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1945.565933227539,
-    "y": 1569.2431144714355,
-    "z": "205403e9.560efc",
+    "x": 1953.538589477539,
+    "y": 1583.2470211982727,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "e72fdf36.f1b28"
+        "f4503085.70e8"
       ]
     ]
   },
   {
-    "id": "e72fdf36.f1b28",
+    "id": "f4503085.70e8",
     "type": "set",
     "name": "set access-client-id",
     "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2113.565933227539,
-    "y": 1569.8431205749512,
-    "z": "205403e9.560efc",
+    "x": 2121.538589477539,
+    "y": 1583.8470273017883,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "afdc2a42.250d98",
+    "id": "8d865fcb.ed997",
     "type": "switchNode",
     "name": "switch access-topology-id",
     "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-topology-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 1771.5658779144287,
-    "y": 1615.2431454658508,
-    "z": "205403e9.560efc",
+    "x": 1779.5385341644287,
+    "y": 1629.247052192688,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "d336b3c.0b7875"
+        "2b04431a.afbcfc"
       ]
     ]
   },
   {
-    "id": "d336b3c.0b7875",
+    "id": "2b04431a.afbcfc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1958.5658779144287,
-    "y": 1611.2431454658508,
-    "z": "205403e9.560efc",
+    "x": 1966.5385341644287,
+    "y": 1625.247052192688,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "85508473.900a98"
+        "28052521.1d41ea"
       ]
     ]
   },
   {
-    "id": "85508473.900a98",
+    "id": "28052521.1d41ea",
     "type": "set",
     "name": "set access-topology-id",
     "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2126.5658779144287,
-    "y": 1611.8431515693665,
-    "z": "205403e9.560efc",
+    "x": 2134.5385341644287,
+    "y": 1625.8470582962036,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "fa8596fd.dc6fb8",
+    "id": "1e57fa4c.c37666",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1066.1213836669922,
-    "y": 1742.3442287445068,
-    "z": "205403e9.560efc",
+    "x": 1074.0940399169922,
+    "y": 1756.348135471344,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "9edea41a.d68a58",
-        "abb09171.f6ee",
-        "abc114d6.41e528",
-        "9b39618e.ffe5f"
+        "17954934.ffd177",
+        "edff10aa.4477f",
+        "4a7a7654.befdb8",
+        "d70e06b2.ae06d8",
+        "fb8e8802.2321a8",
+        "c8bfc2b1.75cdd",
+        "b738f9eb.4faa78",
+        "73934aff.e9fd34",
+        "e16ca07c.f4def",
+        "44ac5fd1.a9ce3"
       ]
     ]
   },
   {
-    "id": "521aa066.c8761",
+    "id": "741fad04.c0bcd4",
     "type": "set",
     "name": "set controller data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
     "comments": "",
-    "x": 1764.56591796875,
-    "y": 1896.6771240234375,
-    "z": "205403e9.560efc",
+    "x": 1772.53857421875,
+    "y": 1910.6810307502747,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "abb09171.f6ee",
+    "id": "edff10aa.4477f",
     "type": "get-resource",
     "name": "get-resource esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1328.0658569335938,
-    "y": 1955.6771240234375,
-    "z": "205403e9.560efc",
+    "x": 1336.0385131835938,
+    "y": 1969.6810307502747,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "b2bcb2cd.da9e",
-        "d1f1ad90.96011",
-        "bed51f39.f008"
+        "b6132182.e115",
+        "b6234a23.02b418",
+        "52c7285a.09ea48"
       ]
     ]
   },
   {
-    "id": "b2bcb2cd.da9e",
+    "id": "b6132182.e115",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1567.0658569335938,
-    "y": 1908.6771240234375,
-    "z": "205403e9.560efc",
+    "x": 1575.0385131835938,
+    "y": 1922.6810307502747,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "521aa066.c8761"
+        "741fad04.c0bcd4"
       ]
     ]
   },
   {
-    "id": "d1f1ad90.96011",
+    "id": "b6234a23.02b418",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1570.5568237304688,
-    "y": 1956.2511596679688,
-    "z": "205403e9.560efc",
+    "x": 1578.5294799804688,
+    "y": 1970.255066394806,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "d02c15ce.c1c438"
+        "39fa3945.b568c6"
       ]
     ]
   },
   {
-    "id": "bed51f39.f008",
+    "id": "52c7285a.09ea48",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1565.8898315429688,
-    "y": 1997.58447265625,
-    "z": "205403e9.560efc",
+    "x": 1573.8624877929688,
+    "y": 2011.5883793830872,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "1dfb5bf0.cbb2c4"
+        "5bc6d6e6.4253f8"
       ]
     ]
   },
   {
-    "id": "d02c15ce.c1c438",
+    "id": "39fa3945.b568c6",
     "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1747.1282348632812,
-    "y": 1944.5368957519531,
-    "z": "205403e9.560efc",
+    "x": 1755.1008911132812,
+    "y": 1958.5408024787903,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "1dfb5bf0.cbb2c4",
+    "id": "5bc6d6e6.4253f8",
     "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1753.6623878479004,
-    "y": 1993.0236654281616,
-    "z": "205403e9.560efc",
+    "x": 1761.6350440979004,
+    "y": 2007.0275721549988,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "abc114d6.41e528",
+    "id": "4a7a7654.befdb8",
     "type": "get-resource",
     "name": "get-resource pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $oof.vpn.access-node-id AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1274.56591796875,
-    "y": 1768.6771240234375,
-    "z": "205403e9.560efc",
+    "x": 1282.53857421875,
+    "y": 1782.6810307502747,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "e5c7f4bb.a977b8",
-        "c9ac24e7.49a298",
-        "89a637ca.249d28"
+        "c669a474.548c18",
+        "49f40d92.f6bd74",
+        "a24623ca.7bac3"
       ]
     ]
   },
   {
-    "id": "e5c7f4bb.a977b8",
+    "id": "c669a474.548c18",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1621.5658569335938,
-    "y": 1772.6771545410156,
-    "z": "205403e9.560efc",
+    "x": 1629.5385131835938,
+    "y": 1786.6810612678528,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "9bb25e1d.4626"
+        "d3849e4d.16c6c"
       ]
     ]
   },
   {
-    "id": "c9ac24e7.49a298",
+    "id": "49f40d92.f6bd74",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1625.0568237304688,
-    "y": 1820.2511901855469,
-    "z": "205403e9.560efc",
+    "x": 1633.0294799804688,
+    "y": 1834.255096912384,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "700f50e2.2becf"
+        "cbab0518.f00ef8"
       ]
     ]
   },
   {
-    "id": "89a637ca.249d28",
+    "id": "a24623ca.7bac3",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1620.3898315429688,
-    "y": 1861.5845031738281,
-    "z": "205403e9.560efc",
+    "x": 1628.3624877929688,
+    "y": 1875.5884099006653,
+    "z": "4f77841b.f6c90c",
     "wires": [
       [
-        "634a1d02.90e474"
+        "4095ec2a.4a6c64"
       ]
     ]
   },
   {
-    "id": "700f50e2.2becf",
+    "id": "cbab0518.f00ef8",
     "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=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 1801.6282348632812,
-    "y": 1808.5369262695312,
-    "z": "205403e9.560efc",
+    "x": 1809.6008911132812,
+    "y": 1822.5408329963684,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "634a1d02.90e474",
+    "id": "4095ec2a.4a6c64",
     "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=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 1808.1623878479004,
-    "y": 1857.0236959457397,
-    "z": "205403e9.560efc",
+    "x": 1816.1350440979004,
+    "y": 1871.027602672577,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "9bb25e1d.4626",
+    "id": "d3849e4d.16c6c",
     "type": "set",
     "name": "set tmp.thirdparty-sdnc-id",
     "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 1825.5658569335938,
-    "y": 1759.6771545410156,
-    "z": "205403e9.560efc",
+    "x": 1833.5385131835938,
+    "y": 1773.6810612678528,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "f371e386.134de",
+    "id": "b5630d7.89ad9f",
     "type": "comment",
     "name": "get domain controller information",
     "info": "",
     "comments": "",
-    "x": 1319.0697860717773,
-    "y": 1734.6810216903687,
-    "z": "205403e9.560efc",
+    "x": 1327.0424423217773,
+    "y": 1748.6849284172058,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "9b39618e.ffe5f",
+    "id": "d70e06b2.ae06d8",
     "type": "set",
     "name": "set oof.vpn",
     "xml": "<set>\n<parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />",
     "comments": "",
-    "x": 1256.5658874511719,
-    "y": 1695.7881488800049,
-    "z": "205403e9.560efc",
+    "x": 1264.5385437011719,
+    "y": 1709.792055606842,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
   },
   {
-    "id": "ab06a549.912008",
+    "id": "fb8e8802.2321a8",
+    "type": "save",
+    "name": "save VPN resource in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n<parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\n<parameter name='cvlan-tag-entry' value='`$prop.connection-attachment.cVLAN`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='configuration-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1313.00390625,
+    "y": 2214.7540521621704,
+    "z": "4f77841b.f6c90c",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "c8bfc2b1.75cdd",
+    "type": "set",
+    "name": "set tmp.vpnName",
+    "xml": "<set>\n<parameter name='tmp.vpnName' value='`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`' />",
+    "comments": "",
+    "x": 1288.5039520263672,
+    "y": 2176.2539596557617,
+    "z": "4f77841b.f6c90c",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "b738f9eb.4faa78",
+    "type": "save",
+    "name": "save connectivity relationship in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $mdsal-psd.networks.network[0].network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$mdsal-psd.networks.network[0].network-id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1340.0039367675781,
+    "y": 2252.7539653778076,
+    "z": "4f77841b.f6c90c",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "4b44bb19.a886d4",
     "type": "comment",
-    "name": "TODO: Add VPN resource and its relation with SOTN Connectivity resource",
+    "name": "save vpn and its relation to AAI",
     "info": "",
     "comments": "",
-    "x": 1452.0103912353516,
-    "y": 2134.6769676208496,
-    "z": "205403e9.560efc",
+    "x": 1325.0039596557617,
+    "y": 2140.7539899349213,
+    "z": "4f77841b.f6c90c",
     "wires": [
       
     ]
+  },
+  {
+    "id": "e16ca07c.f4def",
+    "type": "set",
+    "name": "set src-ltpId dst-ltpId",
+    "xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`\" />\n<parameter name='dst-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`\" />",
+    "comments": "",
+    "x": 1292.0039672851562,
+    "y": 2292.754026412964,
+    "z": "4f77841b.f6c90c",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "73934aff.e9fd34",
+    "type": "save",
+    "name": "save srcLTP relationship in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName \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/p-interfaces/p-interface/' + $src-ltpId`\" />\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`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1325.00390625,
+    "y": 2333.50390625,
+    "z": "4f77841b.f6c90c",
+    "wires": [
+      [
+        
+      ]
+    ]
+  },
+  {
+    "id": "44ac5fd1.a9ce3",
+    "type": "save",
+    "name": "save dstLTP relationship in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName \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/p-interfaces/p-interface/' + $dst-ltpId`\" />\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=\"`$dst-ltpId`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1326.00390625,
+    "y": 2372.25390625,
+    "z": "4f77841b.f6c90c",
+    "wires": [
+      [
+        
+      ]
+    ]
   }
 ]
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 df8edd0c..82c27741 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": "325842f8.71766e",
+    "id": "9d8f9fa5.439ad",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 107.03125,
-    "y": 44.03125,
-    "z": "5611e7fd.31c9b8",
+    "x": 134.00390625,
+    "y": 59.999999046325684,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "260e5d2a.9ebe72"
+        "999b7749.bb2828"
       ]
     ]
   },
   {
-    "id": "260e5d2a.9ebe72",
+    "id": "999b7749.bb2828",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1260 +22,1260 @@
     "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": 319.03125381469727,
-    "y": 116.0312671661377,
-    "z": "5611e7fd.31c9b8",
+    "x": 346.00391006469727,
+    "y": 132.00001621246338,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "aa492387.d875a"
+        "a889b861.30b858"
       ]
     ]
   },
   {
-    "id": "aa492387.d875a",
+    "id": "a889b861.30b858",
     "type": "method",
     "name": "sotn-attachment-topology-operation-create",
     "xml": "<method rpc='sotn-attachment-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 307.0313720703125,
-    "y": 204.03125,
-    "z": "5611e7fd.31c9b8",
+    "x": 334.0040283203125,
+    "y": 219.99999904632568,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "3ba2475a.82b468"
+        "a434e8ee.221048"
       ]
     ]
   },
   {
-    "id": "3ba2475a.82b468",
+    "id": "a434e8ee.221048",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 227.03130340576172,
-    "y": 953.0314979553223,
-    "z": "5611e7fd.31c9b8",
+    "x": 254.00395965576172,
+    "y": 969.000247001648,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "5b9fedc5.bb21a4",
-        "1c8d2bb9.f29f94",
-        "269db4cc.d4abfc",
-        "373e17e2.9acc38",
-        "5fd13a1.e2465c4",
-        "acb04fc4.b40f4",
-        "574b7ca7.0881c4",
-        "35a496d5.57302a",
-        "950a621f.7b821",
-        "5dbf4a35.fd12c4",
-        "5accbcde.210f64",
-        "de4bba44.8919f8",
-        "a1a37b4b.52c8a8",
-        "63023c8e.9fcb64",
-        "a6efd3b6.3278d",
-        "994d951b.a5b738",
-        "8ee1af3e.bbe67",
-        "ad95dda4.7a6dd",
-        "efc5e53d.5d75a8",
-        "72c54e75.d1648",
-        "850178e9.7d2408",
-        "d5054e0.23964b",
-        "acacc6b8.9b06e8"
+        "c342578d.28b708",
+        "efa6ad20.d82ee",
+        "269c43d6.56387c",
+        "3e97601e.a0c21",
+        "a1d6ff56.9c99d",
+        "1cbd957b.be039b",
+        "52744f96.8455f",
+        "361e33ee.17369c",
+        "8340ac1e.8db72",
+        "d5a721b9.32552",
+        "908d0f20.3dc3f",
+        "e6716760.631bc8",
+        "8217a995.1a4f18",
+        "272d789b.464298",
+        "de9004ee.8e65a8",
+        "61510de6.6b5a64",
+        "a9832c0c.edf5c",
+        "bdd1fffd.ca081",
+        "fc645855.78a1f8",
+        "e28f7f9f.51996",
+        "4298e590.a1603c",
+        "b58ada11.db1438",
+        "d0bb4427.716f08"
       ]
     ]
   },
   {
-    "id": "741c9c3f.224ea4",
+    "id": "aad4b525.c81b28",
     "type": "comment",
     "name": "Set allotted resource id if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 698.1079406738281,
-    "y": 128.46516609191895,
-    "z": "5611e7fd.31c9b8",
+    "x": 725.0805969238281,
+    "y": 144.43391513824463,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "5b9fedc5.bb21a4",
+    "id": "c342578d.28b708",
     "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": 657.0312805175781,
-    "y": 169.03124237060547,
-    "z": "5611e7fd.31c9b8",
+    "x": 684.0039367675781,
+    "y": 184.99999141693115,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "8be7a33f.276ac",
-        "503fc7ba.f0e4b8"
+        "3dca0ad4.c31f16",
+        "5f732a2c.880594"
       ]
     ]
   },
   {
-    "id": "8be7a33f.276ac",
+    "id": "3dca0ad4.c31f16",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 908.0313301086426,
-    "y": 131.03122925758362,
-    "z": "5611e7fd.31c9b8",
+    "x": 935.0039863586426,
+    "y": 146.9999783039093,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "32f9a898.99bcd8"
+        "d23cb383.a5008"
       ]
     ]
   },
   {
-    "id": "503fc7ba.f0e4b8",
+    "id": "5f732a2c.880594",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 909.03125,
-    "y": 191.03123784065247,
-    "z": "5611e7fd.31c9b8",
+    "x": 936.00390625,
+    "y": 206.99998688697815,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "4eae44ec.25255c"
+        "e2d02082.677af"
       ]
     ]
   },
   {
-    "id": "4eae44ec.25255c",
+    "id": "e2d02082.677af",
     "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": 1141.031234741211,
-    "y": 191.03124260902405,
-    "z": "5611e7fd.31c9b8",
+    "x": 1168.003890991211,
+    "y": 206.99999165534973,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "1c8d2bb9.f29f94",
+    "id": "efa6ad20.d82ee",
     "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": 629.0311737060547,
-    "y": 404.031307220459,
-    "z": "5611e7fd.31c9b8",
+    "x": 656.0038299560547,
+    "y": 420.00005626678467,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "269db4cc.d4abfc",
+    "id": "269c43d6.56387c",
     "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": 635.2930946350098,
-    "y": 489.69798469543457,
-    "z": "5611e7fd.31c9b8",
+    "x": 662.2657508850098,
+    "y": 505.66673374176025,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-
+        
       ]
     ]
   },
   {
-    "id": "373e17e2.9acc38",
+    "id": "3e97601e.a0c21",
     "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": 682.2930755615234,
-    "y": 573.6979522705078,
-    "z": "5611e7fd.31c9b8",
+    "x": 709.2657318115234,
+    "y": 589.6667013168335,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-
+        
       ]
     ]
   },
   {
-    "id": "32f9a898.99bcd8",
+    "id": "d23cb383.a5008",
     "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": 1123.031307220459,
-    "y": 132.03123497962952,
-    "z": "5611e7fd.31c9b8",
+    "x": 1150.003963470459,
+    "y": 147.9999840259552,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "4b3e3360.e596bc"
+        "6e27cc35.c13c74"
       ]
     ]
   },
   {
-    "id": "4b3e3360.e596bc",
+    "id": "6e27cc35.c13c74",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1341.031349182129,
-    "y": 132.0311987400055,
-    "z": "5611e7fd.31c9b8",
+    "x": 1368.004005432129,
+    "y": 147.99994778633118,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "a0c9c52c.3e6d68"
+        "e6eb33a1.9cd3b"
       ]
     ]
   },
   {
-    "id": "a0c9c52c.3e6d68",
+    "id": "e6eb33a1.9cd3b",
     "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": 1507.0313034057617,
-    "y": 132.03121304512024,
-    "z": "5611e7fd.31c9b8",
+    "x": 1534.0039596557617,
+    "y": 147.99996209144592,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "5fd13a1.e2465c4",
+    "id": "a1d6ff56.9c99d",
     "type": "get-resource",
     "name": "get-resource connection-attachment-allotted-resource",
     "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$tmp.ar.allotted-resource-id/' pfx='mdsal-ar' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 730.03125,
-    "y": 668.8090553283691,
-    "z": "5611e7fd.31c9b8",
+    "x": 757.00390625,
+    "y": 684.7778043746948,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "2117b9a.1971446"
+        "69156564.0efd4c"
       ]
     ]
   },
   {
-    "id": "2117b9a.1971446",
+    "id": "69156564.0efd4c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1050.0313301086426,
-    "y": 670.8090124130249,
-    "z": "5611e7fd.31c9b8",
+    "x": 1077.0039863586426,
+    "y": 686.7777614593506,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "7534c2b3.76410c"
+        "852fc020.79a93"
       ]
     ]
   },
   {
-    "id": "bd6696ff.0a7a78",
+    "id": "8474d88f.5c62c8",
     "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": 1783.5497093200684,
-    "y": 671.8750839233398,
-    "z": "5611e7fd.31c9b8",
+    "x": 1810.5223655700684,
+    "y": 687.8438329696655,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "8d0e7e60.f9de9",
+    "id": "57300b8d.590704",
     "type": "comment",
     "name": "Check for non existence of allotted resource",
     "info": "",
     "comments": "",
-    "x": 694.0312881469727,
-    "y": 634.8091058731079,
-    "z": "5611e7fd.31c9b8",
+    "x": 721.0039443969727,
+    "y": 650.7778549194336,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "e79f21cd.1a744",
+    "id": "d079c407.4d6f78",
     "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": 1592.6979064941406,
-    "y": 867.0312929153442,
-    "z": "5611e7fd.31c9b8",
+    "x": 1619.6705627441406,
+    "y": 883.0000419616699,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "e0cc70b5.ec5cb"
+        "a651bfa.1352c4"
       ]
     ]
   },
   {
-    "id": "574b7ca7.0881c4",
+    "id": "52744f96.8455f",
     "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": 745.6972923278809,
-    "y": 827.7452943325043,
-    "z": "5611e7fd.31c9b8",
+    "x": 772.6699485778809,
+    "y": 843.71404337883,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "d641745.a8dc988",
-        "10ab333.e534fcd"
+        "8264b400.beda08",
+        "7056a183.5603b"
       ]
     ]
   },
   {
-    "id": "d641745.a8dc988",
+    "id": "8264b400.beda08",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1067.840175628662,
-    "y": 830.6027162075043,
-    "z": "5611e7fd.31c9b8",
+    "x": 1094.812831878662,
+    "y": 846.57146525383,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "7824e75b.697748"
+        "11ae1967.44e4c7"
       ]
     ]
   },
   {
-    "id": "10ab333.e534fcd",
+    "id": "7056a183.5603b",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1055.8401794433594,
-    "y": 873.6027176380157,
-    "z": "5611e7fd.31c9b8",
+    "x": 1082.8128356933594,
+    "y": 889.5714666843414,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "c987fa4d.92cd08"
+        "138cce38.a61662"
       ]
     ]
   },
   {
-    "id": "c987fa4d.92cd08",
+    "id": "138cce38.a61662",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1215.967269897461,
-    "y": 871.7286942005157,
-    "z": "5611e7fd.31c9b8",
+    "x": 1242.939926147461,
+    "y": 887.6974432468414,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "e79f21cd.1a744",
-        "bae4bbfe.22ddd8",
-        "de19c440.aed268"
+        "d079c407.4d6f78",
+        "1d2e79f7.7a22f6",
+        "caba0b91.36a608"
       ]
     ]
   },
   {
-    "id": "7824e75b.697748",
+    "id": "11ae1967.44e4c7",
     "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": 1226.6971473693848,
-    "y": 830.3167788982391,
-    "z": "5611e7fd.31c9b8",
+    "x": 1253.6698036193848,
+    "y": 846.2855279445648,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "35a496d5.57302a",
+    "id": "361e33ee.17369c",
     "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": 671.554573059082,
-    "y": 900.31689453125,
-    "z": "5611e7fd.31c9b8",
+    "x": 698.527229309082,
+    "y": 916.2856435775757,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "bae4bbfe.22ddd8",
+    "id": "1d2e79f7.7a22f6",
     "type": "switchNode",
     "name": "switch tmp.found-cidx",
     "xml": "<switch test='`$tmp.found-cidx`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1405.082317352295,
-    "y": 903.7402169704437,
-    "z": "5611e7fd.31c9b8",
+    "x": 1432.054973602295,
+    "y": 919.7089660167694,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "c9bdea6f.ae8408"
+        "5635489a.7ffbc8"
       ]
     ]
   },
   {
-    "id": "c9bdea6f.ae8408",
+    "id": "5635489a.7ffbc8",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1595.0822715759277,
-    "y": 903.7401540279388,
-    "z": "5611e7fd.31c9b8",
+    "x": 1622.0549278259277,
+    "y": 919.7089030742645,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "f4a1002.ec0e9"
+        "66ad5d1b.da3ab4"
       ]
     ]
   },
   {
-    "id": "f4a1002.ec0e9",
+    "id": "66ad5d1b.da3ab4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1761.0822715759277,
-    "y": 903.7401540279388,
-    "z": "5611e7fd.31c9b8",
+    "x": 1788.0549278259277,
+    "y": 919.7089030742645,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "efdba6bf.3fa178"
+        "f92757e1.e50008"
       ]
     ]
   },
   {
-    "id": "e0cc70b5.ec5cb",
+    "id": "a651bfa.1352c4",
     "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": 2066.8093872070312,
-    "y": 867.0312767028809,
-    "z": "5611e7fd.31c9b8",
+    "x": 2093.7820434570312,
+    "y": 883.0000257492065,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "cf1bcffb.5a97a"
+        "54bb5ed6.70da5"
       ]
     ]
   },
   {
-    "id": "cf1bcffb.5a97a",
+    "id": "54bb5ed6.70da5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2291.619115829468,
-    "y": 869.4956977367401,
-    "z": "5611e7fd.31c9b8",
+    "x": 2318.591772079468,
+    "y": 885.4644467830658,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "9a928449.d9e6c8"
+        "d7b2b6d3.cadeb8"
       ]
     ]
   },
   {
-    "id": "efdba6bf.3fa178",
+    "id": "f92757e1.e50008",
     "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": 2006.955617904663,
-    "y": 904.2518508434296,
-    "z": "5611e7fd.31c9b8",
+    "x": 2033.928274154663,
+    "y": 920.2205998897552,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "69a27589.0e830c",
+    "id": "57bdcf73.d7aa8",
     "type": "comment",
     "name": "Add to consumed service consumed-allotted-resources in mdsal",
     "info": "Prepare data and add to service-data",
     "comments": "",
-    "x": 764.6984901428223,
-    "y": 757.0312271118164,
-    "z": "5611e7fd.31c9b8",
+    "x": 791.6711463928223,
+    "y": 772.9999761581421,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "b960d74c.b75ab8",
+    "id": "f0cc7d17.67dd7",
     "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.0313453674316,
-    "y": 864.8093509674072,
-    "z": "5611e7fd.31c9b8",
+    "x": 774.0040016174316,
+    "y": 880.7781000137329,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "d5054e0.23964b",
+    "id": "b58ada11.db1438",
     "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\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
+    "xml": "<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\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-tag-entry\" value=\"`$prop.connection-attachment.cVLAN`\" />\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": 647.7220878601074,
-    "y": 1893.5631588697433,
-    "z": "5611e7fd.31c9b8",
+    "x": 674.6947441101074,
+    "y": 1909.531907916069,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "5db3e01e.d4ead",
-        "cde1c5f3.767a98"
+        "a1860cc7.e0b1b",
+        "e37a2480.b51108"
       ]
     ]
   },
   {
-    "id": "5db3e01e.d4ead",
+    "id": "a1860cc7.e0b1b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 903.4839973449707,
-    "y": 1876.5156625509262,
-    "z": "5611e7fd.31c9b8",
+    "x": 930.4566535949707,
+    "y": 1892.484411597252,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "3608fdb3.1050e2"
+        "3f25cd5e.443c92"
       ]
     ]
   },
   {
-    "id": "3608fdb3.1050e2",
+    "id": "3f25cd5e.443c92",
     "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": 1070.0078773498535,
-    "y": 1888.134733557701,
-    "z": "5611e7fd.31c9b8",
+    "x": 1096.9805335998535,
+    "y": 1904.1034826040268,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "cde1c5f3.767a98",
+    "id": "e37a2480.b51108",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 910.5792846679688,
-    "y": 1909.2776302099228,
-    "z": "5611e7fd.31c9b8",
+    "x": 937.5519409179688,
+    "y": 1925.2463792562485,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "3608fdb3.1050e2"
+        "3f25cd5e.443c92"
       ]
     ]
   },
   {
-    "id": "c4afab5c.baa998",
+    "id": "b9aa3657.c52d58",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 622.5317115783691,
-    "y": 1858.865050792694,
-    "z": "5611e7fd.31c9b8",
+    "x": 649.5043678283691,
+    "y": 1874.8337998390198,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "88151412.9744b8",
+    "id": "af36f779.0f72d8",
     "type": "comment",
     "name": "Set allotted resource type if not sent by SO",
     "info": "",
     "comments": "",
-    "x": 701.0312194824219,
-    "y": 248.0312442779541,
-    "z": "5611e7fd.31c9b8",
+    "x": 728.0038757324219,
+    "y": 263.9999933242798,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "acb04fc4.b40f4",
+    "id": "1cbd957b.be039b",
     "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": 661.9545211791992,
-    "y": 281.59730529785156,
-    "z": "5611e7fd.31c9b8",
+    "x": 688.9271774291992,
+    "y": 297.56605434417725,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "66623b13.496cd4",
-        "4d39f4a7.b07cdc"
+        "51e4f8bb.15fd98",
+        "9bc5979.dbcfa68"
       ]
     ]
   },
   {
-    "id": "66623b13.496cd4",
+    "id": "51e4f8bb.15fd98",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 906.9546241760254,
-    "y": 252.59730625152588,
-    "z": "5611e7fd.31c9b8",
+    "x": 933.9272804260254,
+    "y": 268.56605529785156,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "98a097ca.0fb138"
+        "8d4b5605.e44fb8"
       ]
     ]
   },
   {
-    "id": "4d39f4a7.b07cdc",
+    "id": "9bc5979.dbcfa68",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 907.9545440673828,
-    "y": 312.5973148345947,
-    "z": "5611e7fd.31c9b8",
+    "x": 934.9272003173828,
+    "y": 328.5660638809204,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "487657c2.991598"
+        "8168f22d.0df79"
       ]
     ]
   },
   {
-    "id": "487657c2.991598",
+    "id": "8168f22d.0df79",
     "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": 1139.9545288085938,
-    "y": 312.5973196029663,
-    "z": "5611e7fd.31c9b8",
+    "x": 1166.9271850585938,
+    "y": 328.566068649292,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "45c27762.ed75b8",
+    "id": "965843c3.6889f",
     "type": "comment",
     "name": "For storage in AAI connection-attachment-topology",
     "info": "",
     "comments": "",
-    "x": 723.0312042236328,
-    "y": 372.03126525878906,
-    "z": "5611e7fd.31c9b8",
+    "x": 750.0038604736328,
+    "y": 388.00001430511475,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "9a37b9ec.57f5d8",
+    "id": "eb60ce1a.0aef2",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 701.0312004089355,
-    "y": 454.92014598846436,
-    "z": "5611e7fd.31c9b8",
+    "x": 728.0038566589355,
+    "y": 470.88889503479004,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "92fc6e78.11aa",
+    "id": "ef74607d.036b",
     "type": "comment",
     "name": "Used for Put AR by id to MDSAL",
     "info": "",
     "comments": "",
-    "x": 665.0312347412109,
-    "y": 538.9201374053955,
-    "z": "5611e7fd.31c9b8",
+    "x": 692.0038909912109,
+    "y": 554.8888864517212,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "920f2559.59f028",
+    "id": "dddb900f.8862d",
     "type": "comment",
     "name": "Obtain the last index in services",
     "info": "ServiceData is added by Provider code",
     "comments": "",
-    "x": 663.4757118225098,
-    "y": 792.9201095104218,
-    "z": "5611e7fd.31c9b8",
+    "x": 690.4483680725098,
+    "y": 808.8888585567474,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "78b042c2.3a757c",
+    "id": "65b342f3.64d6cc",
     "type": "comment",
     "name": "TODO: Rework after confirmation from AAI",
     "info": "",
     "comments": "",
-    "x": 922.8906211853027,
-    "y": 1836.436089515686,
-    "z": "5611e7fd.31c9b8",
+    "x": 949.8632774353027,
+    "y": 1852.4048385620117,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "850178e9.7d2408",
+    "id": "4298e590.a1603c",
     "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": 636.2993774414062,
-    "y": 1806.3904213905334,
-    "z": "5611e7fd.31c9b8",
+    "x": 663.2720336914062,
+    "y": 1822.3591704368591,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "acacc6b8.9b06e8",
+    "id": "d0bb4427.716f08",
     "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": 605.7124900817871,
-    "y": 1941.006284236908,
-    "z": "5611e7fd.31c9b8",
+    "x": 632.6851463317871,
+    "y": 1956.9750332832336,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "98a097ca.0fb138",
+    "id": "8d4b5605.e44fb8",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-type",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value=\"SOTNAttachmentInstance\" />\n",
     "comments": "",
-    "x": 1146.0313110351562,
-    "y": 253.0312328338623,
-    "z": "5611e7fd.31c9b8",
+    "x": 1173.0039672851562,
+    "y": 268.999981880188,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "ad95dda4.7a6dd",
+    "id": "bdd1fffd.ca081",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-get-request-input-param",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 761.0254058837891,
-    "y": 1637.5250849723816,
-    "z": "5611e7fd.31c9b8",
+    "x": 787.9980621337891,
+    "y": 1653.4938340187073,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-
+        
       ]
     ]
   },
   {
-    "id": "72c54e75.d1648",
+    "id": "e28f7f9f.51996",
     "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": 696.0314865112305,
-    "y": 1678.0312724113464,
-    "z": "5611e7fd.31c9b8",
+    "x": 723.0041427612305,
+    "y": 1694.0000214576721,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "cee5ccdb.56f91",
-        "343b1a53.f93b56",
-        "d836f528.1e2818"
+        "56bb7e95.f927f",
+        "74711000.f0575",
+        "579344a.ffcc7bc"
       ]
     ]
   },
   {
-    "id": "cee5ccdb.56f91",
+    "id": "56bb7e95.f927f",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 964.6728630065918,
-    "y": 1729.3626841530204,
-    "z": "5611e7fd.31c9b8",
+    "x": 991.6455192565918,
+    "y": 1745.331433199346,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "7a6b84bb.83fdac"
+        "e2257359.1b116"
       ]
     ]
   },
   {
-    "id": "343b1a53.f93b56",
+    "id": "74711000.f0575",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 955.6729125976562,
-    "y": 1697.862709902227,
-    "z": "5611e7fd.31c9b8",
+    "x": 982.6455688476562,
+    "y": 1713.8314589485526,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "7a6b84bb.83fdac"
+        "e2257359.1b116"
       ]
     ]
   },
   {
-    "id": "d836f528.1e2818",
+    "id": "579344a.ffcc7bc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 959.4229507446289,
-    "y": 1668.2198147773743,
-    "z": "5611e7fd.31c9b8",
+    "x": 986.3956069946289,
+    "y": 1684.1885638237,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "2a50bed0.d894a2"
+        "7d6eb53b.d4c13c"
       ]
     ]
   },
   {
-    "id": "7a6b84bb.83fdac",
+    "id": "e2257359.1b116",
     "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": 1125.422950744629,
-    "y": 1698.6127337440848,
-    "z": "5611e7fd.31c9b8",
+    "x": 1152.395606994629,
+    "y": 1714.5814827904105,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "2a50bed0.d894a2",
+    "id": "7d6eb53b.d4c13c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1101.0789184570312,
-    "y": 1664.4119839668274,
-    "z": "5611e7fd.31c9b8",
+    "x": 1128.0515747070312,
+    "y": 1680.380733013153,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-
+        
       ]
     ]
   },
   {
-    "id": "de4bba44.8919f8",
+    "id": "e6716760.631bc8",
     "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": 761.0312156677246,
-    "y": 1198.031394958496,
-    "z": "5611e7fd.31c9b8",
+    "x": 788.0038719177246,
+    "y": 1214.0001440048218,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "193ed140.775b6f",
-        "5734aea.1129c5",
-        "1e7e5c60.a431d4"
+        "f5b61314.7a9ea",
+        "7f95a527.cea04c",
+        "6554700.9ffd59"
       ]
     ]
   },
   {
-    "id": "193ed140.775b6f",
+    "id": "f5b61314.7a9ea",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1083.3392333984375,
-    "y": 1243.0296125411987,
-    "z": "5611e7fd.31c9b8",
+    "x": 1110.3118896484375,
+    "y": 1258.9983615875244,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "f7734abc.a1eef8"
+        "adbe2b8f.bcb438"
       ]
     ]
   },
   {
-    "id": "5734aea.1129c5",
+    "id": "7f95a527.cea04c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1074.339282989502,
-    "y": 1211.5296382904053,
-    "z": "5611e7fd.31c9b8",
+    "x": 1101.311939239502,
+    "y": 1227.498387336731,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "f7734abc.a1eef8"
+        "adbe2b8f.bcb438"
       ]
     ]
   },
   {
-    "id": "1e7e5c60.a431d4",
+    "id": "6554700.9ffd59",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1078.0893211364746,
-    "y": 1181.8867431655526,
-    "z": "5611e7fd.31c9b8",
+    "x": 1105.0619773864746,
+    "y": 1197.8554922118783,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "850e7d60.6ac59"
+        "f1effaa7.98cb08"
       ]
     ]
   },
   {
-    "id": "f7734abc.a1eef8",
+    "id": "adbe2b8f.bcb438",
     "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": 1244.0893211364746,
-    "y": 1212.2796621322632,
-    "z": "5611e7fd.31c9b8",
+    "x": 1271.0619773864746,
+    "y": 1228.2484111785889,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "850e7d60.6ac59",
+    "id": "f1effaa7.98cb08",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1219.745288848877,
-    "y": 1178.0789123550057,
-    "z": "5611e7fd.31c9b8",
+    "x": 1246.717945098877,
+    "y": 1194.0476614013314,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-
+        
       ]
     ]
   },
   {
-    "id": "34f114cf.2fe48c",
+    "id": "8ad1638f.48f57",
     "type": "comment",
     "name": "Put the parent allotted resource in mdsal",
     "info": "",
     "comments": "",
-    "x": 685.0311508178711,
-    "y": 1166.0312938690186,
-    "z": "5611e7fd.31c9b8",
+    "x": 712.0038070678711,
+    "y": 1182.0000429153442,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "63023c8e.9fcb64",
+    "id": "272d789b.464298",
     "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": 685.3883056640625,
-    "y": 1400.6029052734375,
-    "z": "5611e7fd.31c9b8",
+    "x": 712.3609619140625,
+    "y": 1416.5716543197632,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "a1a37b4b.52c8a8",
+    "id": "8217a995.1a4f18",
     "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": 596.2451171875,
-    "y": 1359.4122314453125,
-    "z": "5611e7fd.31c9b8",
+    "x": 623.2177734375,
+    "y": 1375.3809804916382,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "a6efd3b6.3278d",
+    "id": "de9004ee.8e65a8",
     "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": 662.1981048583984,
-    "y": 1442.698115348816,
-    "z": "5611e7fd.31c9b8",
+    "x": 689.1707611083984,
+    "y": 1458.6668643951416,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "994d951b.a5b738",
+    "id": "61510de6.6b5a64",
     "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": 613.5309715270996,
-    "y": 1525.0316753387451,
-    "z": "5611e7fd.31c9b8",
+    "x": 640.5036277770996,
+    "y": 1541.0004243850708,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-
+        
       ]
     ]
   },
   {
-    "id": "8ee1af3e.bbe67",
+    "id": "a9832c0c.edf5c",
     "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": 664.5180320739746,
-    "y": 1560.9828262329102,
-    "z": "5611e7fd.31c9b8",
+    "x": 691.4906883239746,
+    "y": 1576.9515752792358,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "efc5e53d.5d75a8",
+    "id": "fc645855.78a1f8",
     "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": 606.0866241455078,
-    "y": 1479.586974143982,
-    "z": "5611e7fd.31c9b8",
+    "x": 633.0592803955078,
+    "y": 1495.5557231903076,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "21b74746.c42fa8",
+    "id": "e28fb6e1.570bc8",
     "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": 723.4201202392578,
-    "y": 1319.5868339538574,
-    "z": "5611e7fd.31c9b8",
+    "x": 750.3927764892578,
+    "y": 1335.555583000183,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "5accbcde.210f64",
+    "id": "908d0f20.3dc3f",
     "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": 726.5312461853027,
-    "y": 1129.0312910079956,
-    "z": "5611e7fd.31c9b8",
+    "x": 753.5039024353027,
+    "y": 1145.0000400543213,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-
+        
       ]
     ]
   },
   {
-    "id": "5dbf4a35.fd12c4",
+    "id": "d5a721b9.32552",
     "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": 727.5311851501465,
-    "y": 1091.03134059906,
-    "z": "5611e7fd.31c9b8",
+    "x": 754.5038414001465,
+    "y": 1107.0000896453857,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-
+        
       ]
     ]
   },
   {
-    "id": "52e7ff5.9702d",
+    "id": "4df22418.3a53fc",
     "type": "comment",
     "name": "Prepare Parent AR URL",
     "info": "Preparation to set provided-allotted-resource in parent service instance",
     "comments": "",
-    "x": 634.5316009521484,
-    "y": 1019.0313377380371,
-    "z": "5611e7fd.31c9b8",
+    "x": 661.5042572021484,
+    "y": 1035.0000867843628,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "950a621f.7b821",
+    "id": "8340ac1e.8db72",
     "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": 679.5314331054688,
-    "y": 1055.53125,
-    "z": "5611e7fd.31c9b8",
+    "x": 706.5040893554688,
+    "y": 1071.4999990463257,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "60a92f9f.3244e",
+    "id": "c17a3b14.014a38",
     "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": 669.0316314697266,
-    "y": 1606.531012058258,
-    "z": "5611e7fd.31c9b8",
+    "x": 696.0042877197266,
+    "y": 1622.4997611045837,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "9a928449.d9e6c8",
+    "id": "d7b2b6d3.cadeb8",
     "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": 2479.7880859375,
-    "y": 867.6770629882812,
-    "z": "5611e7fd.31c9b8",
+    "x": 2506.7607421875,
+    "y": 883.6458120346069,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "de19c440.aed268",
+    "id": "caba0b91.36a608",
     "type": "set",
     "name": "set tmp.found-cidx",
     "xml": "<set>\n<parameter name='tmp.found-cidx' value=\"`false`\" />\n\n\n",
     "comments": "",
-    "x": 1395.6773529052734,
-    "y": 824.3438148498535,
-    "z": "5611e7fd.31c9b8",
+    "x": 1422.6500091552734,
+    "y": 840.3125638961792,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "a7c16e9b.5cd68",
+    "id": "88129b22.08bd88",
     "type": "comment",
     "name": "Add to parent services provided-allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 744.2327270507812,
-    "y": 980.0104694366455,
-    "z": "5611e7fd.31c9b8",
+    "x": 771.2053833007812,
+    "y": 995.9792184829712,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "d7647e1e.888aa",
+    "id": "209aa5b9.f006fa",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 664.9999465942383,
-    "y": 1287.0001356601715,
-    "z": "5611e7fd.31c9b8",
+    "x": 691.9726028442383,
+    "y": 1302.9688847064972,
+    "z": "27f64d8c.2cf692",
     "wires": [
-
+      
     ]
   },
   {
-    "id": "7534c2b3.76410c",
+    "id": "852fc020.79a93",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1212.031150817871,
-    "y": 670.3089017868042,
-    "z": "5611e7fd.31c9b8",
+    "x": 1239.003807067871,
+    "y": 686.2776508331299,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "c557a49c.3881b8"
+        "f33868e5.1acfb8"
       ]
     ]
   },
   {
-    "id": "c557a49c.3881b8",
+    "id": "f33868e5.1acfb8",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1399.8885307312012,
-    "y": 670.9280371665955,
-    "z": "5611e7fd.31c9b8",
+    "x": 1426.8611869812012,
+    "y": 686.8967862129211,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "3936a0.d4fa496"
+        "71e1d814.25e938"
       ]
     ]
   },
   {
-    "id": "3936a0.d4fa496",
+    "id": "71e1d814.25e938",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1599.2216529846191,
-    "y": 670.9281158447266,
-    "z": "5611e7fd.31c9b8",
+    "x": 1626.1943092346191,
+    "y": 686.8968648910522,
+    "z": "27f64d8c.2cf692",
     "wires": [
       [
-        "bd6696ff.0a7a78"
+        "8474d88f.5c62c8"
       ]
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json
index f4f4f06c..51d135e6 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "8f583882.aaba08",
+    "id": "902cbf05.82ac2",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 107.66669082641602,
-    "y": 36.000003814697266,
-    "z": "b5ee72b6.6e8c5",
+    "x": 109.00390625,
+    "y": 52.999999046325684,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "1c8f0b92.b2d0f4"
+        "51c9fb4f.5229b4"
       ]
     ]
   },
   {
-    "id": "1c8f0b92.b2d0f4",
+    "id": "51c9fb4f.5229b4",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,115 +22,115 @@
     "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": 319.6666946411133,
-    "y": 108.00002098083496,
-    "z": "b5ee72b6.6e8c5",
+    "x": 321.00391006469727,
+    "y": 125.00001621246338,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "7867cbb1.cd6464"
+        "ccbd5d22.8595f"
       ]
     ]
   },
   {
-    "id": "7867cbb1.cd6464",
+    "id": "ccbd5d22.8595f",
     "type": "method",
     "name": "sotn-attachment-topology-operation-deactivate",
     "xml": "<method rpc='sotn-attachment-topology-operation-deactivate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 307.6668128967285,
-    "y": 196.00000381469727,
-    "z": "b5ee72b6.6e8c5",
+    "x": 309.0040283203125,
+    "y": 212.99999904632568,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "788e5fc3.c5d94"
+        "1f233e48.d0a312"
       ]
     ]
   },
   {
-    "id": "788e5fc3.c5d94",
+    "id": "1f233e48.d0a312",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 323.6668128967285,
-    "y": 751.0002484321594,
-    "z": "b5ee72b6.6e8c5",
+    "x": 325.0040283203125,
+    "y": 768.0002436637878,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "ed3ad3e3.7e5ae",
-        "bfd4a9cf.aa7918",
-        "9c88cb66.2575d8",
-        "8484c7db.980518",
-        "3abce4e4.32a12c",
-        "d7eaa0c2.0d298",
-        "601263d0.9079dc",
-        "290c05a0.21ca9a",
-        "dfdf08a.1b550f8",
-        "5040dd33.924624",
-        "7ff9e776.cf4d98",
-        "5af6e72b.9d69a8",
-        "2d9aed4c.fcfbd2",
-        "1d49bda0.f37e32",
-        "285d454d.f5f90a",
-        "c5b69925.729378",
-        "bc602338.67328",
-        "f080d760.856678",
-        "8e738bcf.052208"
+        "c4ceb71c.15c748",
+        "9533eb28.c2dc18",
+        "cf024f6b.1779",
+        "379451f5.6f5f6e",
+        "b6fea8ef.c49268",
+        "509e7b0a.918fb4",
+        "afaa2fc8.ec942",
+        "9831615b.70a3c",
+        "78575bc9.95a094",
+        "6c9c6e62.89b72",
+        "761075c6.da2f4c",
+        "bc240e74.2145b",
+        "ad638e.fad5cc7",
+        "d8c85975.6bf758",
+        "a691ab09.aead58",
+        "72567cb3.f1fbd4",
+        "ce4db8c8.182408",
+        "ea67aab8.ef7588",
+        "53b9be67.07128"
       ]
     ]
   },
   {
-    "id": "ed3ad3e3.7e5ae",
+    "id": "c4ceb71c.15c748",
     "type": "set",
     "name": "set tmp.ar.allotted-resource-id,etc",
     "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
     "comments": "",
-    "x": 720.6602516174316,
-    "y": 149.99349069595337,
-    "z": "b5ee72b6.6e8c5",
+    "x": 721.9974670410156,
+    "y": 166.9934859275818,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "4411681c.96fbf8",
+    "id": "2ba99ef0.0a9972",
     "type": "comment",
     "name": "set tmp ar-id to fetch resource from MDSAL",
     "info": "",
     "comments": "",
-    "x": 749.6205635070801,
-    "y": 114.02528667449951,
-    "z": "b5ee72b6.6e8c5",
+    "x": 750.9577789306641,
+    "y": 131.02528190612793,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "bfd4a9cf.aa7918",
+    "id": "9533eb28.c2dc18",
     "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": 674.6601905822754,
-    "y": 242.9934959411621,
-    "z": "b5ee72b6.6e8c5",
+    "x": 675.9974060058594,
+    "y": 259.9934911727905,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "290c05a0.21ca9a",
+    "id": "9831615b.70a3c",
     "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": 680.9220809936523,
-    "y": 330.6602249145508,
-    "z": "b5ee72b6.6e8c5",
+    "x": 682.2592964172363,
+    "y": 347.6602201461792,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
         
@@ -138,15 +138,15 @@
     ]
   },
   {
-    "id": "9c88cb66.2575d8",
+    "id": "cf024f6b.1779",
     "type": "execute",
     "name": "generate allotted-resource url",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.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": 712.9221076965332,
-    "y": 418.6602063179016,
-    "z": "b5ee72b6.6e8c5",
+    "x": 714.2593231201172,
+    "y": 435.66020154953003,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
         
@@ -154,307 +154,307 @@
     ]
   },
   {
-    "id": "8484c7db.980518",
+    "id": "379451f5.6f5f6e",
     "type": "get-resource",
     "name": "get-resource connection-attachment-allotted-resource",
     "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 783.6602058410645,
-    "y": 508.7712650299072,
-    "z": "b5ee72b6.6e8c5",
+    "x": 784.9974212646484,
+    "y": 525.7712602615356,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "4af802cd.0768bc",
-        "9704e270.344da"
+        "15794b13.fbac75",
+        "e02b6e93.81b44"
       ]
     ]
   },
   {
-    "id": "eec65610.3652f8",
+    "id": "2fa8e20c.3e4dde",
     "type": "comment",
     "name": "GET connection-attachment-allotted-resource from mdsal",
     "info": "",
     "comments": "",
-    "x": 790.4750022888184,
-    "y": 480.53858375549316,
-    "z": "b5ee72b6.6e8c5",
+    "x": 791.8122177124023,
+    "y": 497.5385789871216,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "eed42f31.59a27",
+    "id": "e89ba5d2.ca7f98",
     "type": "comment",
     "name": "Used for setting output to API Handler",
     "info": "",
     "comments": "",
-    "x": 728.6602210998535,
-    "y": 209.99350547790527,
-    "z": "b5ee72b6.6e8c5",
+    "x": 729.9974365234375,
+    "y": 226.9935007095337,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "a03ab63b.9e0678",
+    "id": "f751e97a.0a8c78",
     "type": "comment",
     "name": "Obtain different URL, template location etc",
     "info": "For saving resource information to MDSAL & for AAI",
     "comments": "",
-    "x": 746.6601867675781,
-    "y": 295.88238620758057,
-    "z": "b5ee72b6.6e8c5",
+    "x": 747.9974021911621,
+    "y": 312.882381439209,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "94d139ba.87f2c8",
+    "id": "48dad372.ba3dcc",
     "type": "comment",
     "name": "Used to Get AR by id to MDSAL, same as self-link",
     "info": "",
     "comments": "",
-    "x": 772.6602058410645,
-    "y": 382.88234519958496,
-    "z": "b5ee72b6.6e8c5",
+    "x": 773.9974212646484,
+    "y": 399.8823404312134,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "4af802cd.0768bc",
+    "id": "15794b13.fbac75",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1083.333408355713,
-    "y": 493.99999618530273,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1084.6706237792969,
+    "y": 510.99999141693115,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "a5fa6dd6.43795"
+        "952af6d.1617708"
       ]
     ]
   },
   {
-    "id": "a5fa6dd6.43795",
+    "id": "952af6d.1617708",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1252.3334121704102,
-    "y": 492.4998970031738,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1253.6706275939941,
+    "y": 509.49989223480225,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "2f8c441e.efd2ec"
+        "f480b1f9.28302"
       ]
     ]
   },
   {
-    "id": "2f8c441e.efd2ec",
+    "id": "f480b1f9.28302",
     "type": "switchNode",
     "name": "switch cr length",
     "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1463.1906547546387,
-    "y": 492.11902618408203,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1464.5278701782227,
+    "y": 509.11902141571045,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "e3552b55.2b7868",
-        "579fccfb.5c4c54"
+        "f8514da1.cfdee",
+        "7e23dfd3.3f458"
       ]
     ]
   },
   {
-    "id": "e3552b55.2b7868",
+    "id": "f8514da1.cfdee",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1652.5239601135254,
-    "y": 492.1189842224121,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1653.8611755371094,
+    "y": 509.1189794540405,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "81b472dd.735a8"
+        "738ae2e5.a84e3c"
       ]
     ]
   },
   {
-    "id": "81b472dd.735a8",
+    "id": "738ae2e5.a84e3c",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic='true'>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1837.0478496551514,
-    "y": 489.02381801605225,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1838.3850650787354,
+    "y": 506.02381324768066,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "d81a29f1.be9278",
-        "d95be879.b1bde8",
-        "f4a4bf1b.b7da1"
+        "ee3a63b7.1587f",
+        "30f03cbb.095034",
+        "869cba11.4e5318"
       ]
     ]
   },
   {
-    "id": "31667ce1.fcbca4",
+    "id": "190c7cc8.68d4f3",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 1796.1856498718262,
-    "y": 570.0660495758057,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1797.5228652954102,
+    "y": 587.0660448074341,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "9704e270.344da",
+    "id": "e02b6e93.81b44",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1075.1852111816406,
-    "y": 529.0660810470581,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1076.5224266052246,
+    "y": 546.0660762786865,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "766c605e.af77c"
+        "be0cca0e.643168"
       ]
     ]
   },
   {
-    "id": "766c605e.af77c",
+    "id": "be0cca0e.643168",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1255.1851615905762,
-    "y": 529.7326316833496,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1256.5223770141602,
+    "y": 546.732626914978,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "31667ce1.fcbca4"
+        "190c7cc8.68d4f3"
       ]
     ]
   },
   {
-    "id": "579fccfb.5c4c54",
+    "id": "7e23dfd3.3f458",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1640.8519134521484,
-    "y": 529.3993444442749,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1642.1891288757324,
+    "y": 546.3993396759033,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "31667ce1.fcbca4"
+        "190c7cc8.68d4f3"
       ]
     ]
   },
   {
-    "id": "d81a29f1.be9278",
+    "id": "ee3a63b7.1587f",
     "type": "set",
     "name": "set connection-attachment-ar from get",
     "xml": "<set>\n<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />\n",
     "comments": "",
-    "x": 2206.1111946105957,
-    "y": 456.0000344514847,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2207.4484100341797,
+    "y": 473.0000296831131,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "f4a4bf1b.b7da1",
+    "id": "869cba11.4e5318",
     "type": "set",
     "name": "set oper-status",
     "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
     "comments": "",
-    "x": 2139.1113624572754,
-    "y": 531.428560256958,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2140.4485778808594,
+    "y": 548.4285554885864,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "d95be879.b1bde8",
+    "id": "30f03cbb.095034",
     "type": "switchNode",
     "name": "switch order-status",
     "xml": "<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2149.111141204834,
-    "y": 496.9999942779541,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2150.448356628418,
+    "y": 513.9999895095825,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "e17a8fee.41d4",
-        "d3c8707c.374dc"
+        "7bf97396.e41b0c",
+        "a79d0f34.3ad1d"
       ]
     ]
   },
   {
-    "id": "e17a8fee.41d4",
+    "id": "7bf97396.e41b0c",
     "type": "outcome",
     "name": "outcome Active",
     "xml": "<outcome value='Active'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2384.711223602295,
-    "y": 491.0000252723694,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2386.048439025879,
+    "y": 508.0000205039978,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "b89c0370.1273d"
+        "2b17c4af.c9c67c"
       ]
     ]
   },
   {
-    "id": "d3c8707c.374dc",
+    "id": "a79d0f34.3ad1d",
     "type": "outcome",
     "name": "outcome Other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2378.4256629943848,
-    "y": 530.4286332130432,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2379.7628784179688,
+    "y": 547.4286284446716,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "e88e83ff.2b0bf"
+        "2df968ff.a59058"
       ]
     ]
   },
   {
-    "id": "b89c0370.1273d",
+    "id": "2b17c4af.c9c67c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2599.181739807129,
-    "y": 492.3756594657898,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2600.518955230713,
+    "y": 509.3756546974182,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
         
@@ -462,28 +462,28 @@
     ]
   },
   {
-    "id": "e88e83ff.2b0bf",
+    "id": "2df968ff.a59058",
     "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\" \n    value=\"`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n",
     "comments": "",
-    "x": 2618.3334426879883,
-    "y": 533.0000233650208,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2619.6706581115723,
+    "y": 550.0000185966492,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "190989d8.d87b76",
+    "id": "4926a336.1549ec",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-get-request-input-param",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 970.9697303771973,
-    "y": 598.4935593605042,
-    "z": "b5ee72b6.6e8c5",
+    "x": 972.3069458007812,
+    "y": 615.4935545921326,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
         
@@ -491,263 +491,263 @@
     ]
   },
   {
-    "id": "dfdf08a.1b550f8",
+    "id": "78575bc9.95a094",
     "type": "block",
     "name": "block: atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 652.9758071899414,
-    "y": 598.4998459815979,
-    "z": "b5ee72b6.6e8c5",
+    "x": 654.3130226135254,
+    "y": 615.4998412132263,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "190989d8.d87b76"
+        "4926a336.1549ec"
       ]
     ]
   },
   {
-    "id": "3abce4e4.32a12c",
+    "id": "b6fea8ef.c49268",
     "type": "get-resource",
     "name": "get-resource parent-service-data",
     "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 717.6671180725098,
-    "y": 740.5316205024719,
-    "z": "b5ee72b6.6e8c5",
+    "x": 719.0043334960938,
+    "y": 757.5316157341003,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "d140a12c.bd2ea",
-        "58621e56.68c4e"
+        "7bd13bf5.d657f4",
+        "21599ec.9703d62"
       ]
     ]
   },
   {
-    "id": "aa132cfc.b387f",
+    "id": "bc002904.292928",
     "type": "comment",
     "name": "GET parent-service-data from mdsal to check existence of other End point",
     "info": "",
     "comments": "",
-    "x": 837.6670570373535,
-    "y": 669.5315594673157,
-    "z": "b5ee72b6.6e8c5",
+    "x": 839.0042724609375,
+    "y": 686.5315546989441,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "21ab6599.b5b88a",
+    "id": "73d4e1e5.100ea",
     "type": "for",
     "name": "for pidx..mdsal-psd.provided-allotted-resources.provided-allotted-resource[]",
     "xml": "<for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1726.8515377044678,
-    "y": 908.0041127204895,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1728.1887531280518,
+    "y": 925.0041079521179,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "c38adf24.2987b"
+        "c9283f4f.e54c7"
       ]
     ]
   },
   {
-    "id": "d7eaa0c2.0d298",
+    "id": "509e7b0a.918fb4",
     "type": "switchNode",
     "name": "switch mdsal-psd.provided-allotted-resources_length",
     "xml": "<switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 783.8508949279785,
-    "y": 884.7180829048157,
-    "z": "b5ee72b6.6e8c5",
+    "x": 785.1881103515625,
+    "y": 901.7180781364441,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "bab04a0a.986c28",
-        "ab941040.d9d58",
-        "e7f0f49a.c55b08"
+        "b115b5.efc49a48",
+        "77bec0eb.5d668",
+        "722d0ca5.9a3d54"
       ]
     ]
   },
   {
-    "id": "bab04a0a.986c28",
+    "id": "b115b5.efc49a48",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1115.9937705993652,
-    "y": 1108.5755522474647,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1117.3309860229492,
+    "y": 1125.575547479093,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "a85c2828.9226f8"
+        "9692bf9c.5ffa"
       ]
     ]
   },
   {
-    "id": "edfa14d3.f5d668",
+    "id": "94ad2e31.d7a3e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1310.1211261749268,
-    "y": 902.7015252113342,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1311.4583415985107,
+    "y": 919.7015204429626,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "21ab6599.b5b88a"
+        "73d4e1e5.100ea"
       ]
     ]
   },
   {
-    "id": "c38adf24.2987b",
+    "id": "c9283f4f.e54c7",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test=\"`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2161.962938308716,
-    "y": 908.0040097236633,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2163.3001537323,
+    "y": 925.0040049552917,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "3532dc3f.6daa04",
-        "1210338.3b3d5cd"
+        "ce361aba.4d4be8",
+        "1207b5bd.65bd4a"
       ]
     ]
   },
   {
-    "id": "3532dc3f.6daa04",
+    "id": "ce361aba.4d4be8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2370.7731647491455,
-    "y": 880.468499660492,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2372.1103801727295,
+    "y": 897.4684948921204,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "7bfabe83.461c6"
+        "9ff06a7f.769658"
       ]
     ]
   },
   {
-    "id": "515af9c1.8559f8",
+    "id": "3b258e58.c08552",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2550.5338611602783,
-    "y": 944.3256783485413,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2551.8710765838623,
+    "y": 961.3256735801697,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "39e1b1c2.1c69fe",
-        "9b2b2091.9723d"
+        "2345638f.0ed1bc",
+        "fd1f9423.d014e8"
       ]
     ]
   },
   {
-    "id": "39e1b1c2.1c69fe",
+    "id": "2345638f.0ed1bc",
     "type": "set",
     "name": "set tmp.pidx and ptx.consumed-ar",
     "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n<parameter name='tmp.provided-ar.' value='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$pidx].`' />\n<parameter name='tmp.found-in-ar' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
     "comments": "",
-    "x": 2807.391366958618,
-    "y": 918.8971924781799,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2808.728582382202,
+    "y": 935.8971877098083,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "9b2b2091.9723d",
+    "id": "fd1f9423.d014e8",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 2718.2520847320557,
-    "y": 965.6532082557678,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2719.5893001556396,
+    "y": 982.6532034873962,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "2b8d3c6c.b14764",
+    "id": "ededcdc6.ddc17",
     "type": "comment",
     "name": "Check existence of other AR in parent service data",
     "info": "Check if other allotted resource is available.",
     "comments": "",
-    "x": 773.629337310791,
-    "y": 818.8928875923157,
-    "z": "b5ee72b6.6e8c5",
+    "x": 774.966552734375,
+    "y": 835.8928828239441,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "ab941040.d9d58",
+    "id": "77bec0eb.5d668",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1127.6461639404297,
-    "y": 1032.6772694587708,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1128.9833793640137,
+    "y": 1049.6772646903992,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "46264523.92ecdc"
+        "5c010902.1e64d8"
       ]
     ]
   },
   {
-    "id": "a85c2828.9226f8",
+    "id": "9692bf9c.5ffa",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 1288.6461143493652,
-    "y": 1107.6772940382361,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1289.9833297729492,
+    "y": 1124.6772892698646,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "e7f0f49a.c55b08",
+    "id": "722d0ca5.9a3d54",
     "type": "other",
     "name": "outcome 2",
     "xml": "<outcome value='2'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1135.646146774292,
-    "y": 903.6772255897522,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1136.983362197876,
+    "y": 920.6772208213806,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "edfa14d3.f5d668"
+        "94ad2e31.d7a3e"
       ]
     ]
   },
   {
-    "id": "7bfabe83.461c6",
+    "id": "9ff06a7f.769658",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2528.7573795318604,
-    "y": 879.6772427558899,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2530.0945949554443,
+    "y": 896.6772379875183,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
         
@@ -755,281 +755,281 @@
     ]
   },
   {
-    "id": "1210338.3b3d5cd",
+    "id": "1207b5bd.65bd4a",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2369.7573795318604,
-    "y": 942.6772427558899,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2371.0945949554443,
+    "y": 959.6772379875183,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "515af9c1.8559f8"
+        "3b258e58.c08552"
       ]
     ]
   },
   {
-    "id": "e9cc6dee.5133e",
+    "id": "57dd9846.719728",
     "type": "switchNode",
     "name": "switch mdsal-psd.networks_length",
     "xml": "<switch test='`$mdsal-psd.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1563.9796333312988,
-    "y": 1032.8997707366943,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1565.3168487548828,
+    "y": 1049.8997659683228,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "30e9e8da.9a5228",
-        "80fd341d.8b4a38"
+        "42dfaf86.525d6",
+        "d874512e.3c2f3"
       ]
     ]
   },
   {
-    "id": "80fd341d.8b4a38",
+    "id": "d874512e.3c2f3",
     "type": "other",
     "name": "outcome 1",
     "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1835.9796562194824,
-    "y": 1006.7886056900024,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1837.3168716430664,
+    "y": 1023.7886009216309,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "eab56bbb.5b2d38"
+        "ccbd0c47.f16a"
       ]
     ]
   },
   {
-    "id": "30e9e8da.9a5228",
+    "id": "42dfaf86.525d6",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1829.979778289795,
-    "y": 1066.7886056900024,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1831.316993713379,
+    "y": 1083.7886009216309,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "9cd991eb.ad6e9"
+        "156eaea.2042551"
       ]
     ]
   },
   {
-    "id": "9cd991eb.ad6e9",
+    "id": "156eaea.2042551",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Incorrect state found more then 1 network\" />\n    \n",
     "comments": "",
-    "x": 1986.632122039795,
-    "y": 1067.8904123306274,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1987.969337463379,
+    "y": 1084.8904075622559,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "750841f5.89bfd",
+    "id": "e24945d6.e64ac8",
     "type": "set",
     "name": "set tmp.network.",
     "xml": "<set>\n<parameter name='tmp.network.' value='`$mdsal-psd.networks.network[0].`' />\n",
     "comments": "",
-    "x": 2271.424503326416,
-    "y": 1007.788761138916,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2272.76171875,
+    "y": 1024.7887563705444,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "46264523.92ecdc",
+    "id": "5c010902.1e64d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1300.090518951416,
-    "y": 1033.7885174751282,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1301.427734375,
+    "y": 1050.7885127067566,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "e9cc6dee.5133e"
+        "57dd9846.719728"
       ]
     ]
   },
   {
-    "id": "eab56bbb.5b2d38",
+    "id": "ccbd0c47.f16a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2027.75736618042,
-    "y": 1009.7884836196899,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2029.094581604004,
+    "y": 1026.7884788513184,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "750841f5.89bfd",
-        "56082b6e.f90444"
+        "e24945d6.e64ac8",
+        "36e6716c.6f770e"
       ]
     ]
   },
   {
-    "id": "56082b6e.f90444",
+    "id": "36e6716c.6f770e",
     "type": "for",
     "name": "for nidx..tmp.network.network-data.network-request-input.network...[]",
     "xml": "<for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 2447.7576332092285,
-    "y": 1069.7884712219238,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2449.0948486328125,
+    "y": 1086.7884664535522,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "ad111a8e.73a1d8"
+        "e46aaefd.f607b"
       ]
     ]
   },
   {
-    "id": "ad111a8e.73a1d8",
+    "id": "e46aaefd.f607b",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2813.3130168914795,
-    "y": 1069.7885303497314,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2814.6502323150635,
+    "y": 1086.7885255813599,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "92d17a75.9c6dc8",
-        "60c80c93.08db54"
+        "4ebafc38.9bc584",
+        "d3b38771.361348"
       ]
     ]
   },
   {
-    "id": "92d17a75.9c6dc8",
+    "id": "4ebafc38.9bc584",
     "type": "switchNode",
     "name": "switch access-node-id",
     "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`\">",
     "comments": "",
     "outputs": 1,
-    "x": 3017.8232707977295,
-    "y": 1072.798906326294,
-    "z": "b5ee72b6.6e8c5",
+    "x": 3019.1604862213135,
+    "y": 1089.7989015579224,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "abca5378.b72d3"
+        "3f5b228d.225fde"
       ]
     ]
   },
   {
-    "id": "abca5378.b72d3",
+    "id": "3f5b228d.225fde",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3204.8232707977295,
-    "y": 1073.798906326294,
-    "z": "b5ee72b6.6e8c5",
+    "x": 3206.1604862213135,
+    "y": 1090.7989015579224,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "db6a8374.5ea08"
+        "5885ed34.2fa454"
       ]
     ]
   },
   {
-    "id": "db6a8374.5ea08",
+    "id": "5885ed34.2fa454",
     "type": "set",
     "name": "set tmp.found-in-network tmp.ep-available",
     "xml": "<set>\n<parameter name='tmp.found-in-network' value='true' />\n<parameter name='tmp.ep-available' value='true' />",
     "comments": "",
-    "x": 3455.823278427124,
-    "y": 1073.3988485336304,
-    "z": "b5ee72b6.6e8c5",
+    "x": 3457.160493850708,
+    "y": 1090.3988437652588,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "60c80c93.08db54",
+    "id": "d3b38771.361348",
     "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": 3000.81316947937,
-    "y": 1117.7885055541992,
-    "z": "b5ee72b6.6e8c5",
+    "x": 3002.150384902954,
+    "y": 1134.7885007858276,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "601263d0.9079dc",
+    "id": "afaa2fc8.ec942",
     "type": "switchNode",
     "name": "switch tmp.ep-available",
     "xml": "<switch test='`$tmp.ep-available`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 709.9794960021973,
-    "y": 1296.232792377472,
-    "z": "b5ee72b6.6e8c5",
+    "x": 711.3167114257812,
+    "y": 1313.2327876091003,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "89a90f2c.398bf",
-        "80d65700.60d008"
+        "465effa9.6427f",
+        "c45531af.37393"
       ]
     ]
   },
   {
-    "id": "80d65700.60d008",
+    "id": "c45531af.37393",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 928.6462154388428,
-    "y": 1345.5661492347717,
-    "z": "b5ee72b6.6e8c5",
+    "x": 929.9834308624268,
+    "y": 1362.5661444664001,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "844986d4.f4d158"
+        "a447132c.ff129"
       ]
     ]
   },
   {
-    "id": "89a90f2c.398bf",
+    "id": "465effa9.6427f",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 933.5350170135498,
-    "y": 1254.566210269928,
-    "z": "b5ee72b6.6e8c5",
+    "x": 934.8722324371338,
+    "y": 1271.5662055015564,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "9208b0d4.846ab"
+        "98f645f2.256338"
       ]
     ]
   },
   {
-    "id": "9208b0d4.846ab",
+    "id": "98f645f2.256338",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1080.5350131988525,
-    "y": 1256.4550232887268,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1081.8722286224365,
+    "y": 1273.4550185203552,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
         
@@ -1037,118 +1037,116 @@
     ]
   },
   {
-    "id": "844986d4.f4d158",
+    "id": "a447132c.ff129",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1098.757303237915,
-    "y": 1343.5661072731018,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1100.094518661499,
+    "y": 1360.5661025047302,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "fc82177c.3c8168",
-        "6c1300b3.838e9",
-        "b83c0ca8.2fbee"
+        "b6034c83.e1568"
       ]
     ]
   },
   {
-    "id": "27f851f0.33167e",
+    "id": "5c394256.a4b72c",
     "type": "comment",
     "name": "GET connection-attachment-ar to store AR data from mdsal",
     "info": "",
     "comments": "",
-    "x": 2269.1394805908203,
-    "y": 420.50391721725464,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2270.4766960144043,
+    "y": 437.50391244888306,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "105428a7.c0fa47",
+    "id": "f3cf0d72.a94cd",
     "type": "comment",
     "name": "Set source end point",
     "info": "",
     "comments": "",
-    "x": 674.6393585205078,
-    "y": 566.2539267539978,
-    "z": "b5ee72b6.6e8c5",
+    "x": 675.9765739440918,
+    "y": 583.2539219856262,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "5040dd33.924624",
+    "id": "6c9c6e62.89b72",
     "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": 728.635440826416,
-    "y": 705.0000042915344,
-    "z": "b5ee72b6.6e8c5",
+    "x": 729.97265625,
+    "y": 721.9999995231628,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "d140a12c.bd2ea",
+    "id": "7bd13bf5.d657f4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 964.635440826416,
-    "y": 733.0000042915344,
-    "z": "b5ee72b6.6e8c5",
+    "x": 965.97265625,
+    "y": 749.9999995231628,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "ef017607.27ae68"
+        "9696eaab.88d618"
       ]
     ]
   },
   {
-    "id": "58621e56.68c4e",
+    "id": "21599ec.9703d62",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 956.4872436523438,
-    "y": 768.0660891532898,
-    "z": "b5ee72b6.6e8c5",
+    "x": 957.8244590759277,
+    "y": 785.0660843849182,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "50c1da8b.6785d4"
+        "26a3704.033389"
       ]
     ]
   },
   {
-    "id": "50c1da8b.6785d4",
+    "id": "26a3704.033389",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: SOTN resource not found\" />\n    \n",
     "comments": "",
-    "x": 1131.635929107666,
-    "y": 764.3334393501282,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1132.97314453125,
+    "y": 781.3334345817566,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "ef017607.27ae68",
+    "id": "9696eaab.88d618",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1115.635440826416,
-    "y": 731.0000042915344,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1116.97265625,
+    "y": 747.9999995231628,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
         
@@ -1156,298 +1154,298 @@
     ]
   },
   {
-    "id": "7ff9e776.cf4d98",
+    "id": "761075c6.da2f4c",
     "type": "set",
     "name": "set tmp.found-in-ar tmp.found-in-network tmp.ep-available to false",
     "xml": "<set>\n<parameter name='tmp.found-in-ar' value='false' />\n<parameter name='tmp.found-in-network' value='false' />\n<parameter name='tmp.ep-available' value='false' />",
     "comments": "",
-    "x": 820.635440826416,
-    "y": 850.0000042915344,
-    "z": "b5ee72b6.6e8c5",
+    "x": 821.97265625,
+    "y": 866.9999995231628,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "6020d2b5.ff31bc",
+    "id": "419a1f7.f1beae",
     "type": "comment",
     "name": "If other EP exists delete from domain controller",
     "info": "",
     "comments": "",
-    "x": 760.635440826416,
-    "y": 1221.0000042915344,
-    "z": "b5ee72b6.6e8c5",
+    "x": 761.97265625,
+    "y": 1237.9999995231628,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "1d5ec4d8.fd16cb",
+    "id": "19fee4f1.0172ab",
     "type": "set",
     "name": "set controller data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
     "comments": "",
-    "x": 1814.6355590820312,
-    "y": 1374.0000200271606,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2025.9730224609375,
+    "y": 1735.0002546310425,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "6c1300b3.838e9",
+    "id": "d425caaa.8a6858",
     "type": "get-resource",
     "name": "get-resource esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1378.135498046875,
-    "y": 1433.0000200271606,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1589.4729614257812,
+    "y": 1794.0002546310425,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "9b0a24a5.e3c928",
-        "3d4157e0.0e2b48",
-        "47d559b2.2326f8"
+        "4f05b74c.969be8",
+        "c7b3919.c8ebe7",
+        "40abfefc.3d745"
       ]
     ]
   },
   {
-    "id": "9b0a24a5.e3c928",
+    "id": "4f05b74c.969be8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1617.135498046875,
-    "y": 1386.0000200271606,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1828.4729614257812,
+    "y": 1747.0002546310425,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "1d5ec4d8.fd16cb"
+        "19fee4f1.0172ab"
       ]
     ]
   },
   {
-    "id": "3d4157e0.0e2b48",
+    "id": "c7b3919.c8ebe7",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1620.62646484375,
-    "y": 1433.574055671692,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1831.9639282226562,
+    "y": 1794.5742902755737,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "4d76fe9.b9e25"
+        "7e0e9058.e96b3"
       ]
     ]
   },
   {
-    "id": "47d559b2.2326f8",
+    "id": "40abfefc.3d745",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1615.95947265625,
-    "y": 1474.9073686599731,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1827.2969360351562,
+    "y": 1835.907603263855,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "4373fee3.5c15e"
+        "6ad29b98.83f084"
       ]
     ]
   },
   {
-    "id": "4d76fe9.b9e25",
+    "id": "7e0e9058.e96b3",
     "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1797.1978759765625,
-    "y": 1421.8597917556763,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2008.5353393554688,
+    "y": 1782.860026359558,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "4373fee3.5c15e",
+    "id": "6ad29b98.83f084",
     "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1803.7320289611816,
-    "y": 1470.3465614318848,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2015.069492340088,
+    "y": 1831.3467960357666,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "fc82177c.3c8168",
+    "id": "77debd2c.f40a64",
     "type": "get-resource",
     "name": "get-resource pnf",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $prop.connection-attachement.access-node-id AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.node-id AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1324.6355590820312,
-    "y": 1246.0000200271606,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1539.9730834960938,
+    "y": 1667.00031375885,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "71aef88f.e0bf68",
-        "2c74406b.e0e78",
-        "5d3880b0.6e762"
+        "b2f42acb.73d9c8",
+        "659e715a.79934",
+        "79d0fb49.773bc4"
       ]
     ]
   },
   {
-    "id": "71aef88f.e0bf68",
+    "id": "b2f42acb.73d9c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1671.635498046875,
-    "y": 1250.0000505447388,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1822.9729309082031,
+    "y": 1608.0002002716064,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "a198897a.59b5a8"
+        "ac4575c7.b5d618"
       ]
     ]
   },
   {
-    "id": "2c74406b.e0e78",
+    "id": "659e715a.79934",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1675.12646484375,
-    "y": 1297.57408618927,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1826.4638977050781,
+    "y": 1655.5742359161377,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "c41f8753.3bbf68"
+        "4fe04183.c5614"
       ]
     ]
   },
   {
-    "id": "5d3880b0.6e762",
+    "id": "79d0fb49.773bc4",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1670.45947265625,
-    "y": 1338.9073991775513,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1821.7969055175781,
+    "y": 1696.907548904419,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "f23816e4.5d6938"
+        "5d2c56ed.47c2c8"
       ]
     ]
   },
   {
-    "id": "c41f8753.3bbf68",
+    "id": "4fe04183.c5614",
     "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=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 1851.6978759765625,
-    "y": 1285.8598222732544,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2003.0353088378906,
+    "y": 1643.859972000122,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "f23816e4.5d6938",
+    "id": "5d2c56ed.47c2c8",
     "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=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 1858.2320289611816,
-    "y": 1334.346591949463,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2009.5694618225098,
+    "y": 1692.3467416763306,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "a198897a.59b5a8",
+    "id": "ac4575c7.b5d618",
     "type": "set",
     "name": "set tmp.thirdparty-sdnc-id",
     "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 1875.635498046875,
-    "y": 1237.0000505447388,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2026.9729309082031,
+    "y": 1595.0002002716064,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "193624d6.cf45fb",
+    "id": "a421d0fb.ce81c",
     "type": "comment",
     "name": "get domain controller information",
     "info": "",
     "comments": "",
-    "x": 1369.1394271850586,
-    "y": 1212.0039176940918,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1583.4769897460938,
+    "y": 1636.0042810440063,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "b83c0ca8.2fbee",
+    "id": "f8c8821d.d50c3",
     "type": "execute",
     "name": "execute RestApiCallNode Delete ethernet Service",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $prop.connection-attachment.sotnVpnName`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1426.6355590820312,
-    "y": 1538.0000200271606,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1637.9730224609375,
+    "y": 1899.0002546310425,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "157d151e.8db5fb",
-        "dc587393.0f491"
+        "925b677f.9fd908",
+        "cff10bd6.5c54c8"
       ]
     ]
   },
   {
-    "id": "157d151e.8db5fb",
+    "id": "925b677f.9fd908",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1713.635498046875,
-    "y": 1561.0000200271606,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1924.9729614257812,
+    "y": 1922.0002546310425,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "22b1ca9.6034f36"
+        "fe5326f7.64a0a8"
       ]
     ]
   },
   {
-    "id": "22b1ca9.6034f36",
+    "id": "fe5326f7.64a0a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1883.6354370117188,
-    "y": 1564.0000200271606,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2094.972900390625,
+    "y": 1925.0002546310425,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
         
@@ -1455,221 +1453,221 @@
     ]
   },
   {
-    "id": "949096af.7825e8",
+    "id": "3a5a8a5c.8b0aa6",
     "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 executing Create vpn rest api\" />\n",
     "comments": "",
-    "x": 1883.6355590820312,
-    "y": 1520.0000200271606,
-    "z": "b5ee72b6.6e8c5",
+    "x": 2094.9730224609375,
+    "y": 1881.0002546310425,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "dc587393.0f491",
+    "id": "cff10bd6.5c54c8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1716.6354370117188,
-    "y": 1520.0000200271606,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1927.972900390625,
+    "y": 1881.0002546310425,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "949096af.7825e8"
+        "3a5a8a5c.8b0aa6"
       ]
     ]
   },
   {
-    "id": "83d13f6d.0d8cd",
+    "id": "b7b5526f.d9371",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 984.397403717041,
-    "y": 1879.9526022672653,
-    "z": "b5ee72b6.6e8c5",
+    "x": 985.734619140625,
+    "y": 1896.9525974988937,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "3bbdd84b.d766e8"
+        "2cde2bd.f2613d4"
       ]
     ]
   },
   {
-    "id": "3bbdd84b.d766e8",
+    "id": "2cde2bd.f2613d4",
     "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": 1150.9212837219238,
-    "y": 1891.5716732740402,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1152.2584991455078,
+    "y": 1908.5716685056686,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "55a09cbe.8cef84",
+    "id": "8465056c.00dde8",
     "type": "failure",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 991.4926910400391,
-    "y": 1912.714569926262,
-    "z": "b5ee72b6.6e8c5",
+    "x": 992.829906463623,
+    "y": 1929.7145651578903,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "3bbdd84b.d766e8"
+        "2cde2bd.f2613d4"
       ]
     ]
   },
   {
-    "id": "5f6a467a.dfacc8",
+    "id": "dd28433d.d632",
     "type": "comment",
     "name": "Save Resource to AAI",
     "info": "",
     "comments": "",
-    "x": 703.4451179504395,
-    "y": 1862.3019905090332,
-    "z": "b5ee72b6.6e8c5",
+    "x": 704.7823333740234,
+    "y": 1879.3019857406616,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "79627cb0.0dbb74",
+    "id": "4d323c0f.df7854",
     "type": "comment",
     "name": "TODO: Rework after confirmation from AAI",
     "info": "",
     "comments": "",
-    "x": 1003.804027557373,
-    "y": 1839.8730292320251,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1005.141242980957,
+    "y": 1856.8730244636536,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "bc602338.67328",
+    "id": "ce4db8c8.182408",
     "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": 718.2128143310547,
-    "y": 1783.8274717330933,
-    "z": "b5ee72b6.6e8c5",
+    "x": 719.5500297546387,
+    "y": 1800.8274669647217,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "f080d760.856678",
+    "id": "ea67aab8.ef7588",
     "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": 686.6258964538574,
-    "y": 1944.443223953247,
-    "z": "b5ee72b6.6e8c5",
+    "x": 687.9631118774414,
+    "y": 1961.4432191848755,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "c5b69925.729378",
+    "id": "72567cb3.f1fbd4",
     "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": 767.9449157714844,
-    "y": 1691.4682455062866,
-    "z": "b5ee72b6.6e8c5",
+    "x": 769.2821311950684,
+    "y": 1708.468240737915,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "c8f2c95e.7a0b78",
-        "edc7bb51.8c2ee8",
-        "a8558f0e.c66f3"
+        "4724b378.ec2a2c",
+        "4dfcb271.a6386c",
+        "4e56cabb.034884"
       ]
     ]
   },
   {
-    "id": "c8f2c95e.7a0b78",
+    "id": "4724b378.ec2a2c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1036.5862922668457,
-    "y": 1742.7996572479606,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1037.9235076904297,
+    "y": 1759.799652479589,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "456ce311.27ccec"
+        "2831c4f6.7c5dbc"
       ]
     ]
   },
   {
-    "id": "edc7bb51.8c2ee8",
+    "id": "4dfcb271.a6386c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1027.5863418579102,
-    "y": 1711.299682997167,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1028.9235572814941,
+    "y": 1728.2996782287955,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "456ce311.27ccec"
+        "2831c4f6.7c5dbc"
       ]
     ]
   },
   {
-    "id": "a8558f0e.c66f3",
+    "id": "4e56cabb.034884",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1031.3363800048828,
-    "y": 1681.6567878723145,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1032.6735954284668,
+    "y": 1698.6567831039429,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "fc3cc6b.7a5fa38"
+        "a711cf9d.6d6a"
       ]
     ]
   },
   {
-    "id": "456ce311.27ccec",
+    "id": "2831c4f6.7c5dbc",
     "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": 1197.3363800048828,
-    "y": 1712.049706839025,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1198.6735954284668,
+    "y": 1729.0497020706534,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "fc3cc6b.7a5fa38",
+    "id": "a711cf9d.6d6a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1172.9923477172852,
-    "y": 1677.8489570617676,
-    "z": "b5ee72b6.6e8c5",
+    "x": 1174.3295631408691,
+    "y": 1694.848952293396,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
         
@@ -1677,28 +1675,28 @@
     ]
   },
   {
-    "id": "5af6e72b.9d69a8",
+    "id": "bc240e74.2145b",
     "type": "set",
     "name": "set ar-data",
     "xml": "<set>\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.` \" />",
     "comments": "",
-    "x": 673.1585121154785,
-    "y": 1542.8492257595062,
-    "z": "b5ee72b6.6e8c5",
+    "x": 674.4957275390625,
+    "y": 1559.8492209911346,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "1d49bda0.f37e32",
+    "id": "d8c85975.6bf758",
     "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": 690.4443550109863,
-    "y": 1615.4688234329224,
-    "z": "b5ee72b6.6e8c5",
+    "x": 691.7815704345703,
+    "y": 1632.4688186645508,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
         
@@ -1706,71 +1704,243 @@
     ]
   },
   {
-    "id": "285d454d.f5f90a",
+    "id": "a691ab09.aead58",
     "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='PendingDelete' />\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": 740.4314346313477,
-    "y": 1652.419903755188,
-    "z": "b5ee72b6.6e8c5",
+    "x": 741.7686500549316,
+    "y": 1669.4198989868164,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "2d9aed4c.fcfbd2",
+    "id": "ad638e.fad5cc7",
     "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": 687.0000534057617,
-    "y": 1582.0238761901855,
-    "z": "b5ee72b6.6e8c5",
+    "x": 688.3372688293457,
+    "y": 1599.023871421814,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "9565d730.07f7d8",
+    "id": "1b962b1.7c9dad5",
     "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": 800.3335151672363,
-    "y": 1503.0238282680511,
-    "z": "b5ee72b6.6e8c5",
+    "x": 801.6707305908203,
+    "y": 1520.0238234996796,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "b61bb52.fd12048",
+    "id": "aad41a92.c6b998",
     "type": "comment",
     "name": "Add to allotted-resources in mdsal",
     "info": "",
     "comments": "",
-    "x": 741.9133415222168,
-    "y": 1470.4371299743652,
-    "z": "b5ee72b6.6e8c5",
+    "x": 743.2505569458008,
+    "y": 1487.4371252059937,
+    "z": "d3dd528c.9edcf",
     "wires": [
       
     ]
   },
   {
-    "id": "8e738bcf.052208",
+    "id": "53b9be67.07128",
     "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\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$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=\"PendingDelete\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 729.8893966674805,
-    "y": 1899.7541332244873,
-    "z": "b5ee72b6.6e8c5",
+    "x": 731.2266120910645,
+    "y": 1916.7541284561157,
+    "z": "d3dd528c.9edcf",
     "wires": [
       [
-        "83d13f6d.0d8cd",
-        "55a09cbe.8cef84"
+        "b7b5526f.d9371",
+        "8465056c.00dde8"
+      ]
+    ]
+  },
+  {
+    "id": "b6034c83.e1568",
+    "type": "get-resource",
+    "name": "get-resource connectivity",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"connectivity\" \n\t\tkey=\"connectivity.connectivity-id = $mdsal-psd.networks.network[0].network-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.connectivity' local-only='false' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1315.0043029785156,
+    "y": 1361.5044565200806,
+    "z": "d3dd528c.9edcf",
+    "wires": [
+      [
+        "e5fcddf9.8d24f"
+      ]
+    ]
+  },
+  {
+    "id": "2227c12c.941eae",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1316.121467590332,
+    "y": 1539.344430923462,
+    "z": "d3dd528c.9edcf",
+    "wires": [
+      [
+        "77debd2c.f40a64",
+        "d425caaa.8a6858",
+        "f8c8821d.d50c3",
+        "6584aa7e.7c6da4",
+        "1fbc8c35.8ef854"
+      ]
+    ]
+  },
+  {
+    "id": "a7e5f7ca.25d0c8",
+    "type": "outcome",
+    "name": "vpn-binding",
+    "xml": "<outcome value='vpn-binding'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1923.2897968292236,
+    "y": 1367.8257465362549,
+    "z": "d3dd528c.9edcf",
+    "wires": [
+      [
+        "2227c12c.941eae"
+      ]
+    ]
+  },
+  {
+    "id": "e5fcddf9.8d24f",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='vidx' start='0' end='`$tmp.connectivity.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1537.0041198730469,
+    "y": 1368.0041971206665,
+    "z": "d3dd528c.9edcf",
+    "wires": [
+      [
+        "889a6909.fd0648"
+      ]
+    ]
+  },
+  {
+    "id": "889a6909.fd0648",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.connectivity.relationship-list.relationship[$vidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1744.0041809082031,
+    "y": 1367.004243850708,
+    "z": "d3dd528c.9edcf",
+    "wires": [
+      [
+        "a7e5f7ca.25d0c8"
+      ]
+    ]
+  },
+  {
+    "id": "6584aa7e.7c6da4",
+    "type": "set",
+    "name": "set tmp.vpn-name",
+    "xml": "<set>\n<parameter name='tmp.vpn-name' value=\"`$tmp.connectivity.relationship-list.relationship[$vidx].relationship-data[0].relationship-value` \" />\n",
+    "comments": "",
+    "x": 1540.0040893554688,
+    "y": 1419.004427909851,
+    "z": "d3dd528c.9edcf",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "1fbc8c35.8ef854",
+    "type": "execute",
+    "name": "split vpnName to find nodeId",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.vpn-name`'/>\n<parameter name=\"regex\" value=\"-\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route1\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1544.00390625,
+    "y": 1524.00390625,
+    "z": "d3dd528c.9edcf",
+    "wires": [
+      [
+        "bd900e2d.e6685",
+        "7097b625.7335c8"
+      ]
+    ]
+  },
+  {
+    "id": "7097b625.7335c8",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1761.00390625,
+    "y": 1450.00390625,
+    "z": "d3dd528c.9edcf",
+    "wires": [
+      [
+        "719277cb.1f0738"
+      ]
+    ]
+  },
+  {
+    "id": "719277cb.1f0738",
+    "type": "set",
+    "name": "set tmp.node-id",
+    "xml": "<set>\n<parameter name='tmp.node-id' value='`$route1[0]`' />\n",
+    "comments": "",
+    "x": 1968.00390625,
+    "y": 1444.00390625,
+    "z": "d3dd528c.9edcf",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "188e2bb3.ba9264",
+    "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 splitting sna1_route\" />\n",
+    "comments": "",
+    "x": 1943.00390625,
+    "y": 1514.00390625,
+    "z": "d3dd528c.9edcf",
+    "wires": [
+      
+    ]
+  },
+  {
+    "id": "bd900e2d.e6685",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1762.00390625,
+    "y": 1516.00390625,
+    "z": "d3dd528c.9edcf",
+    "wires": [
+      [
+        "188e2bb3.ba9264"
       ]
     ]
   }
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json
index 657287ef..125dbc93 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "4ff24108.9f0b9",
+    "id": "92bde18b.90f51",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 110.01040649414062,
-    "y": 84,
-    "z": "7e44475f.b60658",
+    "x": 106.00390625,
+    "y": 51.00390625,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "49314d16.951114"
+        "9686f296.2c8dd"
       ]
     ]
   },
   {
-    "id": "49314d16.951114",
+    "id": "9686f296.2c8dd",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,65 +22,65 @@
     "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": 296.0104103088379,
-    "y": 156.0000171661377,
-    "z": "7e44475f.b60658",
+    "x": 292.00391006469727,
+    "y": 123.0039234161377,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "cacaf9a3.ed2eb8"
+        "5c1e48b9.633c88"
       ]
     ]
   },
   {
-    "id": "cacaf9a3.ed2eb8",
+    "id": "5c1e48b9.633c88",
     "type": "method",
     "name": "method sotn-network-topology-operation-activate",
     "xml": "<method rpc='sotn-network-topology-operation-activate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 284.0105285644531,
-    "y": 244,
-    "z": "7e44475f.b60658",
+    "x": 280.0040283203125,
+    "y": 211.00390625,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "6fc16268.2c373c"
+        "ccaf1419.198158"
       ]
     ]
   },
   {
-    "id": "6fc16268.2c373c",
+    "id": "ccaf1419.198158",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 458.0104217529297,
-    "y": 352.0000591278076,
-    "z": "7e44475f.b60658",
+    "x": 454.00392150878906,
+    "y": 319.0039653778076,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "f31091a3.27362",
-        "15ed0f21.483631",
-        "b7e9a733.12c248",
-        "739286aa.7b5518",
-        "fc03b474.733c48",
-        "8ec0cdeb.99354",
-        "4aa12b59.10e594",
-        "cdb930eb.4db64"
+        "70aaa20a.67efcc",
+        "b5a2c023.8548a",
+        "d1073f16.8ed91",
+        "78851dc5.db0384",
+        "4ca1d850.ac9f28",
+        "d2a509fb.abaf98",
+        "e789c0c0.571e6",
+        "7c9d2cd5.85be04"
       ]
     ]
   },
   {
-    "id": "f31091a3.27362",
+    "id": "70aaa20a.67efcc",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-sotn-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 916.3993072509766,
-    "y": 101,
-    "z": "7e44475f.b60658",
+    "x": 912.3928070068359,
+    "y": 68.00390625,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -88,15 +88,15 @@
     ]
   },
   {
-    "id": "15ed0f21.483631",
+    "id": "b5a2c023.8548a",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sotn-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SOTN-Activate\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 716.5660057067871,
-    "y": 154.77785301208496,
-    "z": "7e44475f.b60658",
+    "x": 712.5595054626465,
+    "y": 121.78175926208496,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -104,54 +104,54 @@
     ]
   },
   {
-    "id": "b7e9a733.12c248",
+    "id": "d1073f16.8ed91",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $network-topology-operation-input.network-information.network-id  + '/network-data/'` \" />",
     "comments": "",
-    "x": 807.5660552978516,
-    "y": 343.31329441070557,
-    "z": "7e44475f.b60658",
+    "x": 803.5595550537109,
+    "y": 310.31720066070557,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "739286aa.7b5518",
+    "id": "78851dc5.db0384",
     "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": 729.3438568115234,
-    "y": 532.8687143325806,
-    "z": "7e44475f.b60658",
+    "x": 725.3373565673828,
+    "y": 499.87262058258057,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "fc03b474.733c48",
+    "id": "4ca1d850.ac9f28",
     "type": "set",
     "name": "set network-level-oper-status",
     "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
     "comments": "",
-    "x": 774.4549713134766,
-    "y": 404.5354690551758,
-    "z": "7e44475f.b60658",
+    "x": 770.4484710693359,
+    "y": 371.5393753051758,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "8ec0cdeb.99354",
+    "id": "d2a509fb.abaf98",
     "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": 748.8681106567383,
-    "y": 207.77788925170898,
-    "z": "7e44475f.b60658",
+    "x": 744.8616104125977,
+    "y": 174.78179550170898,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -159,15 +159,15 @@
     ]
   },
   {
-    "id": "4aa12b59.10e594",
+    "id": "e789c0c0.571e6",
     "type": "update",
     "name": "update SOTN Connectivity status to AAI",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n      key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='configuration-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='Active' />",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='connectivity-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='Active' />",
     "comments": "",
     "outputs": 1,
-    "x": 808.6735534667969,
-    "y": 464.238657951355,
-    "z": "7e44475f.b60658",
+    "x": 804.6670532226562,
+    "y": 431.242564201355,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -175,27 +175,27 @@
     ]
   },
   {
-    "id": "cdb930eb.4db64",
+    "id": "7c9d2cd5.85be04",
     "type": "set",
     "name": "set network in service-data",
     "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />",
     "comments": "",
-    "x": 771.0105285644531,
-    "y": 275.0910539627075,
-    "z": "7e44475f.b60658",
+    "x": 767.0040283203125,
+    "y": 242.09496021270752,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "c713ecf7.ea914",
+    "id": "ccc44411.171148",
     "type": "comment",
     "name": "TODO MP2MP",
     "info": "Current implementation is for P2P connectivity\nFor MP2MP connectivity in future DG needs to be modified",
     "comments": "",
-    "x": 996.0416564941406,
-    "y": 198.03128051757812,
-    "z": "7e44475f.b60658",
+    "x": 992.03515625,
+    "y": 165.03518676757812,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
index 3c9c95ff..49437c77 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "139a6e7f.35f132",
+    "id": "81cd1a9a.ed4778",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 103.01040649414062,
-    "y": 78.2888806159608,
-    "z": "13b9846a.014e4c",
+    "x": 104.00390625,
+    "y": 120.28887966228649,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "5165cd92.df7bd4"
+        "1bef31e6.92d38e"
       ]
     ]
   },
   {
-    "id": "5165cd92.df7bd4",
+    "id": "1bef31e6.92d38e",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,69 +22,68 @@
     "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": 357.5104064941406,
-    "y": 78.2888806159608,
-    "z": "13b9846a.014e4c",
+    "x": 358.50390625,
+    "y": 120.28887966228649,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "a7444b33.7d1f48"
+        "22d8cb0f.1fe844"
       ]
     ]
   },
   {
-    "id": "a7444b33.7d1f48",
+    "id": "22d8cb0f.1fe844",
     "type": "method",
     "name": "sotn-network-topology-operation-create",
     "xml": "<method rpc='sotn-network-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 356.5104064941406,
-    "y": 178.2888806159608,
-    "z": "13b9846a.014e4c",
+    "x": 357.50390625,
+    "y": 220.2888796622865,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "a19a8247.a1622"
+        "1ac6ec58.6cc8c4"
       ]
     ]
   },
   {
-    "id": "a19a8247.a1622",
+    "id": "1ac6ec58.6cc8c4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 496.5104064941406,
-    "y": 278.2888806159608,
-    "z": "13b9846a.014e4c",
+    "x": 497.50390625,
+    "y": 320.2888796622865,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "9690673f.c35c38",
-        "9090896d.431318",
-        "1b9ab03d.d8994",
-        "611901b5.6b6e9",
-        "64f0eb98.ddb424",
-        "22fd42de.86c53e",
-        "cc42b05c.ab9b4",
-        "b37c9027.58eb3",
-        "3085f08f.eacbb",
-        "27379959.fccb76",
-        "2ad70cde.edce44",
-        "3e882683.7d50ea"
+        "dccba4bb.ec45e8",
+        "8d26ff9f.61d6",
+        "9cc5feac.c16eb",
+        "611e5fda.9173",
+        "493b5551.491c0c",
+        "7896c4df.77216c",
+        "cade84ce.caa788",
+        "d2e2bb0e.8628c8",
+        "dc47979f.672478",
+        "949f871e.3694a8",
+        "2d8bf094.04a15"
       ]
     ]
   },
   {
-    "id": "9690673f.c35c38",
+    "id": "dccba4bb.ec45e8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-sotn-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 926.5104179382324,
-    "y": 96.06663253856823,
-    "z": "13b9846a.014e4c",
+    "x": 927.5039176940918,
+    "y": 138.0666315848939,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
         
@@ -92,15 +91,15 @@
     ]
   },
   {
-    "id": "9090896d.431318",
+    "id": "8d26ff9f.61d6",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sotn-network-topology-operation-create\"/>\n<parameter name=\"field3\" value=\"SOTN-Config\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 720.0660629272461,
-    "y": 273.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 721.0595626831055,
+    "y": 315.5110914707184,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
         
@@ -108,15 +107,15 @@
     ]
   },
   {
-    "id": "1b9ab03d.d8994",
+    "id": "9cc5feac.c16eb",
     "type": "execute",
     "name": "execute generate-sotn-vpn-network-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.sotn.network-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 820.5104179382324,
-    "y": 136.06663253856823,
-    "z": "13b9846a.014e4c",
+    "x": 821.5039176940918,
+    "y": 178.0666315848939,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
         
@@ -124,142 +123,142 @@
     ]
   },
   {
-    "id": "611901b5.6b6e9",
+    "id": "611e5fda.9173",
     "type": "switchNode",
     "name": "switch service-data.networks_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 811.0660629272461,
-    "y": 233.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 812.0595626831055,
+    "y": 275.5110914707184,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "6504f13e.cb942",
-        "f06b01d1.5ae64"
+        "73a5159b.c3206c",
+        "82bb8d63.17326"
       ]
     ]
   },
   {
-    "id": "6504f13e.cb942",
+    "id": "73a5159b.c3206c",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1040.066062927246,
-    "y": 213.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 1041.0595626831055,
+    "y": 255.51109147071838,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "80cc460d.6062a8"
+        "b454d6b2.ed7f78"
       ]
     ]
   },
   {
-    "id": "f06b01d1.5ae64",
+    "id": "82bb8d63.17326",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1040.066062927246,
-    "y": 253.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 1041.0595626831055,
+    "y": 295.5110914707184,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "cc9b4b29.340cf8"
+        "1c6a631d.a6467d"
       ]
     ]
   },
   {
-    "id": "80cc460d.6062a8",
+    "id": "b454d6b2.ed7f78",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='0' />\n",
     "comments": "",
-    "x": 1182.566062927246,
-    "y": 213.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 1183.5595626831055,
+    "y": 255.51109147071838,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "8ea707fc.e9fc98",
+    "id": "29335226.4cde8e",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments": "",
-    "x": 1316.12158203125,
-    "y": 215.06670212745667,
-    "z": "13b9846a.014e4c",
+    "x": 1317.1150817871094,
+    "y": 257.06670117378235,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "64f0eb98.ddb424",
+    "id": "493b5551.491c0c",
     "type": "set",
     "name": "set network in service-data",
     "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-id' value='`$prop.sotn.network-id`' />\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.' value='`$network-topology-operation-input.network-request-input.`' />\n<parameter name='service-data.networks.network_length' value='`$nidx+1`' />\n\n",
     "comments": "",
-    "x": 781.5660629272461,
-    "y": 313.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 782.5595626831055,
+    "y": 355.5110914707184,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "22fd42de.86c53e",
+    "id": "7896c4df.77216c",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$prop.sotn.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />",
     "comments": "",
-    "x": 817.0660629272461,
-    "y": 353.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 818.0595626831055,
+    "y": 395.5110914707184,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "cc42b05c.ab9b4",
+    "id": "cade84ce.caa788",
     "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": 743.7329025268555,
-    "y": 580.1777954101562,
-    "z": "13b9846a.014e4c",
+    "x": 741.7264022827148,
+    "y": 562.1778182983398,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "b37c9027.58eb3",
+    "id": "d2e2bb0e.8628c8",
     "type": "set",
     "name": "set network-level-oper-status",
     "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
     "comments": "",
-    "x": 788.5660629272461,
-    "y": 393.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 789.5595626831055,
+    "y": 435.5110914707184,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "3085f08f.eacbb",
+    "id": "dc47979f.672478",
     "type": "save",
     "name": "save SOTN connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n      key='configuration.configuration-id = $prop.sotn.network-id' >\n<parameter name='configuration-id' value='`$prop.sotn.network-id`' />\n<parameter name='configuration-name' value='`$prop.sotn.client-svc-name`' />\n<parameter name='configuration-type' value='`$prop.sotn.client-svc-descr`' />\n<parameter name='configuration-sub-type' value='`$prop.sotn.tenantId`' />\n<parameter name='orchestration-status' value='`$prop.sotn.vpnType`' />\n<parameter name='management-option' value='`$prop.sotn.cir`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='configuration-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.sotn.network-id' >\n<parameter name='connectivity-id' value='`$prop.sotn.network-id`' />\n<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<parameter name='color-aware' value='`$prop.sotn.colorAware`' />\n<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />\n<parameter name='access-provider-id' value='`$prop.sotn.access-provider-id`' />\n<parameter name='access-client-id' value='`$prop.sotn.access-client-id`' />\n<parameter name='access-topology-id' value='`$prop.sotn.access-topology-id`' />\n<parameter name='access-node-id' value='`$prop.sotn.access-node-id`' />\n<parameter name='access-ltp-id' value='`$prop.sotn.access-ltp-id`' />\n<parameter name='cvlan-tag-entry' value='`$prop.sotn.cVLAN`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />",
     "comments": "",
     "outputs": 1,
-    "x": 821.0660629272461,
-    "y": 440.1777813434601,
-    "z": "13b9846a.014e4c",
+    "x": 822.0595626831055,
+    "y": 482.17778038978577,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
         
@@ -267,15 +266,15 @@
     ]
   },
   {
-    "id": "27379959.fccb76",
+    "id": "949f871e.3694a8",
     "type": "save",
     "name": "save service relationship in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"configuration\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/configurations/configuration/' + $prop.sotn.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"configuration.configuration-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 796.0660743713379,
-    "y": 477.9555332660675,
-    "z": "13b9846a.014e4c",
+    "x": 797.0595741271973,
+    "y": 519.9555323123932,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
         
@@ -283,887 +282,874 @@
     ]
   },
   {
-    "id": "56dd0abe.1511b4",
+    "id": "bcdf0e05.a3fa2",
     "type": "for",
     "name": "for each existing network",
     "xml": "<for index='idx' start='0' end='`$nidx`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1185.5501251220703,
-    "y": 358.28884431766346,
-    "z": "13b9846a.014e4c",
+    "x": 1186.5436248779297,
+    "y": 400.28884336398914,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "a637d096.3728c"
+        "c6c47ed0.cb847"
       ]
     ]
   },
   {
-    "id": "cc9b4b29.340cf8",
+    "id": "1c6a631d.a6467d",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1184.4231071472168,
-    "y": 253.4476044178009,
-    "z": "13b9846a.014e4c",
+    "x": 1185.4166069030762,
+    "y": 295.4476034641266,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "56dd0abe.1511b4",
-        "8ea707fc.e9fc98"
+        "bcdf0e05.a3fa2",
+        "29335226.4cde8e"
       ]
     ]
   },
   {
-    "id": "a637d096.3728c",
+    "id": "c6c47ed0.cb847",
     "type": "switchNode",
     "name": "switch networkid found",
     "xml": "<switch test=\"`$service-data.networks.network[$idx].network-id == $network-topology-operation-input.network-information.network-id`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1460.8358459472656,
-    "y": 357.86034700321034,
-    "z": "13b9846a.014e4c",
+    "x": 1461.829345703125,
+    "y": 399.860346049536,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "29edb34.33bc74c"
+        "af281df5.a00a9"
       ]
     ]
   },
   {
-    "id": "29edb34.33bc74c",
+    "id": "af281df5.a00a9",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1361.5660438537598,
-    "y": 416.4317781631835,
-    "z": "13b9846a.014e4c",
+    "x": 1362.5595436096191,
+    "y": 458.43177720950916,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "fb222058.5489a"
+        "6774871.c3ba278"
       ]
     ]
   },
   {
-    "id": "e2502908.30a4f8",
+    "id": "ec60dbfe.f45f08",
     "type": "comment",
     "name": "make sure this network doesn't exist already",
     "info": "",
     "comments": "",
-    "x": 1409.200855255127,
-    "y": 316.5429017250426,
-    "z": "13b9846a.014e4c",
+    "x": 1410.1943550109863,
+    "y": 358.5429007713683,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "fb222058.5489a",
+    "id": "6774871.c3ba278",
     "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=\"network-topology-operation-input.network-request-input.network-id already found in service-data\" />\n",
     "comments": "",
-    "x": 1509.316146850586,
-    "y": 416.2889702320099,
-    "z": "13b9846a.014e4c",
+    "x": 1510.3096466064453,
+    "y": 458.28896927833557,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "5c98a39b.1a248c",
+    "id": "fa710c0b.f8f7f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1475.9676399230957,
-    "y": 186.06668972969055,
-    "z": "13b9846a.014e4c",
+    "x": 1476.961139678955,
+    "y": 228.06668877601624,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "eb10737a.973ea",
-        "20241118.87993e",
-        "8f9a601f.f6c31",
-        "2f4693cf.5c48bc",
-        "a92d3efb.9a862",
-        "8921689e.0cc458",
-        "23d4de8a.cdb1a2",
-        "c9294e5e.af421",
-        "f05d31ef.6d9f2",
-        "3ac5e719.7cdd08",
-        "36127ed4.d4df92",
-        "f5195bd8.3c84a8",
-        "ef3f5059.2d4ea",
-        "cd1b68b3.245ce8",
-        "43611249.362dac",
-        "c4de2cef.1053e"
+        "3da7e963.953786",
+        "ea8c87f0.c92e88",
+        "f149851b.9a9dd8",
+        "74ce1a73.a6b444",
+        "a5724e6b.3f9f1",
+        "53daad6a.5244e4",
+        "8867a34e.4671a",
+        "3149ec04.0b57f4",
+        "1e784180.8a488f",
+        "ca14452f.51d7b8",
+        "600f2d8b.ac1e64",
+        "f8776a5f.dd77d8",
+        "6867734f.34178c",
+        "e09fe051.1cbb8",
+        "1d14a0da.1e8adf",
+        "8cf376b5.6cba28"
       ]
     ]
   },
   {
-    "id": "eb10737a.973ea",
+    "id": "3da7e963.953786",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1734.1893844604492,
-    "y": 43.39999318122864,
-    "z": "13b9846a.014e4c",
+    "x": 1735.1828842163086,
+    "y": 85.39999222755432,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "d0562182.0b394"
+        "42c647fe.f59548"
       ]
     ]
   },
   {
-    "id": "d0562182.0b394",
+    "id": "42c647fe.f59548",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1921.1893844604492,
-    "y": 39.39999318122864,
-    "z": "13b9846a.014e4c",
+    "x": 1922.1828842163086,
+    "y": 81.39999222755432,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "85ea5b3a.80fc78"
+        "22eef4c4.58190c"
       ]
     ]
   },
   {
-    "id": "85ea5b3a.80fc78",
+    "id": "22eef4c4.58190c",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.sotn.etht-svc-name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2071.1895141601562,
-    "y": 37.99999976158142,
-    "z": "13b9846a.014e4c",
+    "x": 2072.1830139160156,
+    "y": 79.9999988079071,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "20241118.87993e",
+    "id": "ea8c87f0.c92e88",
     "type": "switchNode",
     "name": "switch description",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'description'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1745.0290451049805,
-    "y": 83.39999127388,
-    "z": "13b9846a.014e4c",
+    "x": 1746.0225448608398,
+    "y": 125.39999032020569,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "aec8775b.d30d08"
+        "3266ff0a.32d5c"
       ]
     ]
   },
   {
-    "id": "aec8775b.d30d08",
+    "id": "3266ff0a.32d5c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1915.0290451049805,
-    "y": 79.39999127388,
-    "z": "13b9846a.014e4c",
+    "x": 1916.0225448608398,
+    "y": 121.39999032020569,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "6a968958.282fd8"
+        "e4bed62.ba99828"
       ]
     ]
   },
   {
-    "id": "6a968958.282fd8",
+    "id": "e4bed62.ba99828",
     "type": "set",
     "name": "set etht-svc-descr",
     "xml": "<set>\n<parameter name='prop.sotn.etht-svc-descr' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2102.36248588562,
-    "y": 77.86114811897278,
-    "z": "13b9846a.014e4c",
+    "x": 2103.3559856414795,
+    "y": 119.86114716529846,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "2ad70cde.edce44",
+    "id": "2d8bf094.04a15",
     "type": "for",
     "name": "for loop i - Network input parameters",
     "xml": "<for index=\"idx\" start=\"0\" end=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 813.7448043823242,
-    "y": 183.844420671463,
-    "z": "13b9846a.014e4c",
+    "x": 814.7383041381836,
+    "y": 225.8444197177887,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "5c98a39b.1a248c"
+        "fa710c0b.f8f7f"
       ]
     ]
   },
   {
-    "id": "8f9a601f.f6c31",
+    "id": "f149851b.9a9dd8",
     "type": "switchNode",
     "name": "switch tenantId",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1735.4114265441895,
-    "y": 126.733318567276,
-    "z": "13b9846a.014e4c",
+    "x": 1736.4049263000488,
+    "y": 168.73331761360168,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "bc2214ce.6d70f8"
+        "776be651.50d848"
       ]
     ]
   },
   {
-    "id": "bc2214ce.6d70f8",
+    "id": "776be651.50d848",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1922.4114265441895,
-    "y": 122.733318567276,
-    "z": "13b9846a.014e4c",
+    "x": 1923.4049263000488,
+    "y": 164.73331761360168,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "46fa1cce.7d92e4"
+        "a00211ac.55fa"
       ]
     ]
   },
   {
-    "id": "46fa1cce.7d92e4",
+    "id": "a00211ac.55fa",
     "type": "set",
     "name": "set tenantId",
     "xml": "<set>\n<parameter name='prop.sotn.tenantId' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2090.4114265441895,
-    "y": 123.33332467079163,
-    "z": "13b9846a.014e4c",
+    "x": 2091.404926300049,
+    "y": 165.3333237171173,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "2f4693cf.5c48bc",
+    "id": "74ce1a73.a6b444",
     "type": "switchNode",
     "name": "switch CIR",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CIR'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1717.2510833740234,
-    "y": 216.7333767414093,
-    "z": "13b9846a.014e4c",
+    "x": 1718.2445831298828,
+    "y": 258.733375787735,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "6dc3af21.b1bfa"
+        "701ee64a.e717f8"
       ]
     ]
   },
   {
-    "id": "6dc3af21.b1bfa",
+    "id": "701ee64a.e717f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1925.2511520385742,
-    "y": 212.73339009284973,
-    "z": "13b9846a.014e4c",
+    "x": 1926.2446517944336,
+    "y": 254.73338913917542,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "8bfeab9d.acab98"
+        "c0353e87.7a345"
       ]
     ]
   },
   {
-    "id": "8bfeab9d.acab98",
+    "id": "c0353e87.7a345",
     "type": "set",
     "name": "set cir",
     "xml": "<set>\n<parameter name='prop.sotn.cir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2074.58447265625,
-    "y": 211.19453740119934,
-    "z": "13b9846a.014e4c",
+    "x": 2075.5779724121094,
+    "y": 253.19453644752502,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "a92d3efb.9a862",
+    "id": "a5724e6b.3f9f1",
     "type": "switchNode",
     "name": "switch vpnType",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1736.559555053711,
-    "y": 170.5110957622528,
-    "z": "13b9846a.014e4c",
+    "x": 1737.5530548095703,
+    "y": 212.5110948085785,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "4f2e612c.866ed"
+        "89501c3c.39e65"
       ]
     ]
   },
   {
-    "id": "4f2e612c.866ed",
+    "id": "89501c3c.39e65",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1923.559555053711,
-    "y": 166.5110957622528,
-    "z": "13b9846a.014e4c",
+    "x": 1924.5530548095703,
+    "y": 208.5110948085785,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "a5f469fe.1f7fb8"
+        "2f537b9c.402a54"
       ]
     ]
   },
   {
-    "id": "a5f469fe.1f7fb8",
+    "id": "2f537b9c.402a54",
     "type": "set",
     "name": "set vpnType",
     "xml": "<set>\n<parameter name='prop.sotn.vpnType' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2092.8931884765625,
-    "y": 163.97226071357727,
-    "z": "13b9846a.014e4c",
+    "x": 2093.886688232422,
+    "y": 205.97225975990295,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "8921689e.0cc458",
+    "id": "53daad6a.5244e4",
     "type": "switchNode",
     "name": "switch access-provider-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-provider-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1758.0411911010742,
-    "y": 492.9556143283844,
-    "z": "13b9846a.014e4c",
+    "x": 1759.0346908569336,
+    "y": 534.9556133747101,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "db262e87.3b64a"
+        "c9908bde.d3d748"
       ]
     ]
   },
   {
-    "id": "23d4de8a.cdb1a2",
+    "id": "8867a34e.4671a",
     "type": "switchNode",
     "name": "switch access-client-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-client-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1750.5966720581055,
-    "y": 538.288943529129,
-    "z": "13b9846a.014e4c",
+    "x": 1751.5901718139648,
+    "y": 580.2889425754547,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "fd7a8c1c.3cc36"
+        "8bdcf612.c4ddd8"
       ]
     ]
   },
   {
-    "id": "c9294e5e.af421",
+    "id": "3149ec04.0b57f4",
     "type": "switchNode",
     "name": "switch access-topology-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-topology-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1755.041130065918,
-    "y": 577.1778290271759,
-    "z": "13b9846a.014e4c",
+    "x": 1756.0346298217773,
+    "y": 619.1778280735016,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "131fe813.7d7c68"
+        "3417d7e.4ccb528"
       ]
     ]
   },
   {
-    "id": "db262e87.3b64a",
+    "id": "c9908bde.d3d748",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1942.0411911010742,
-    "y": 491.95562958717346,
-    "z": "13b9846a.014e4c",
+    "x": 1943.0346908569336,
+    "y": 533.9556286334991,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "34d62c4c.27c844"
+        "39defa6f.d38fd6"
       ]
     ]
   },
   {
-    "id": "fd7a8c1c.3cc36",
+    "id": "8bdcf612.c4ddd8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1937.5966720581055,
-    "y": 534.288943529129,
-    "z": "13b9846a.014e4c",
+    "x": 1938.5901718139648,
+    "y": 576.2889425754547,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "98f0aeff.0649d"
+        "f50e4f7e.4a67d"
       ]
     ]
   },
   {
-    "id": "131fe813.7d7c68",
+    "id": "3417d7e.4ccb528",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1942.041130065918,
-    "y": 573.1778290271759,
-    "z": "13b9846a.014e4c",
+    "x": 1943.0346298217773,
+    "y": 615.1778280735016,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "7da4534a.aa3dbc"
+        "53d7cb35.9e4a94"
       ]
     ]
   },
   {
-    "id": "34d62c4c.27c844",
+    "id": "39defa6f.d38fd6",
     "type": "set",
     "name": "set access-provider-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-provider-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2125.2635498046875,
-    "y": 491.0668137073517,
-    "z": "13b9846a.014e4c",
+    "x": 2126.257049560547,
+    "y": 533.0668127536774,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "98f0aeff.0649d",
+    "id": "f50e4f7e.4a67d",
     "type": "set",
     "name": "set access-client-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-client-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2114.152587890625,
-    "y": 532.2994201183319,
-    "z": "13b9846a.014e4c",
+    "x": 2115.1460876464844,
+    "y": 574.2994191646576,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "7da4534a.aa3dbc",
+    "id": "53d7cb35.9e4a94",
     "type": "set",
     "name": "set access-topology-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-topology-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2124.04150390625,
-    "y": 571.1882765293121,
-    "z": "13b9846a.014e4c",
+    "x": 2125.0350036621094,
+    "y": 613.1882755756378,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "f05d31ef.6d9f2",
+    "id": "1e784180.8a488f",
     "type": "switchNode",
     "name": "switch access-node-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-node-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1755.8558883666992,
-    "y": 623.8444726467133,
-    "z": "13b9846a.014e4c",
+    "x": 1756.8493881225586,
+    "y": 665.8444716930389,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "b31c7b7f.9ced68"
+        "76b87020.8228"
       ]
     ]
   },
   {
-    "id": "b31c7b7f.9ced68",
+    "id": "76b87020.8228",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1942.8558883666992,
-    "y": 619.8444726467133,
-    "z": "13b9846a.014e4c",
+    "x": 1943.8493881225586,
+    "y": 661.8444716930389,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "76abc59c.8e0adc"
+        "c5389f2b.e694e"
       ]
     ]
   },
   {
-    "id": "3ac5e719.7cdd08",
+    "id": "ca14452f.51d7b8",
     "type": "switchNode",
     "name": "switch access-ltp-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-ltp-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1752.633659362793,
-    "y": 666.2889492511749,
-    "z": "13b9846a.014e4c",
+    "x": 1753.6271591186523,
+    "y": 708.2889482975006,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "848bd038.a1fd2"
+        "f814a8ba.16d968"
       ]
     ]
   },
   {
-    "id": "848bd038.a1fd2",
+    "id": "f814a8ba.16d968",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1939.633659362793,
-    "y": 662.2889492511749,
-    "z": "13b9846a.014e4c",
+    "x": 1940.6271591186523,
+    "y": 704.2889482975006,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "33b13d79.1d69b2"
+        "ae0c0f38.c407d"
       ]
     ]
   },
   {
-    "id": "76abc59c.8e0adc",
+    "id": "c5389f2b.e694e",
     "type": "set",
     "name": "set access-node-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-node-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2114.856201171875,
-    "y": 618.5216066837311,
-    "z": "13b9846a.014e4c",
+    "x": 2115.8497009277344,
+    "y": 660.5216057300568,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "33b13d79.1d69b2",
+    "id": "ae0c0f38.c407d",
     "type": "set",
     "name": "set access-ltp-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-ltp-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2105.3003540039062,
-    "y": 661.2993786334991,
-    "z": "13b9846a.014e4c",
+    "x": 2106.2938537597656,
+    "y": 703.2993776798248,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "3e882683.7d50ea",
-    "type": "set",
-    "name": "set unique-src-ltpId",
-    "xml": "<set>\n<parameter name='unique-src-ltpId' value=\"`'nodeId-' + $prop.sotn.src-access-node-id + '-ltpId-' + $prop.sotn.src-access-ltp-id`\" />",
-    "comments": "",
-    "x": 758.670768737793,
-    "y": 525.39999127388,
-    "z": "13b9846a.014e4c",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "36127ed4.d4df92",
+    "id": "600f2d8b.ac1e64",
     "type": "switchNode",
     "name": "switch EIR",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'EIR'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1718.5415344238281,
-    "y": 259.43124318122864,
-    "z": "13b9846a.014e4c",
+    "x": 1719.5350341796875,
+    "y": 301.4312422275543,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "f8180ca.c5aedf"
+        "39a162af.cbdf4e"
       ]
     ]
   },
   {
-    "id": "f8180ca.c5aedf",
+    "id": "39a162af.cbdf4e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1920.5414962768555,
-    "y": 254.43126320838928,
-    "z": "13b9846a.014e4c",
+    "x": 1921.5349960327148,
+    "y": 296.43126225471497,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "5b0895e4.66408c"
+        "5150b53b.34980c"
       ]
     ]
   },
   {
-    "id": "5b0895e4.66408c",
+    "id": "5150b53b.34980c",
     "type": "set",
     "name": "set eir",
     "xml": "<set>\n<parameter name='prop.sotn.eir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2076.875,
-    "y": 253.8923990726471,
-    "z": "13b9846a.014e4c",
+    "x": 2077.8684997558594,
+    "y": 295.8923981189728,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "f5195bd8.3c84a8",
+    "id": "f8776a5f.dd77d8",
     "type": "switchNode",
     "name": "switch CBS",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CBS'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1718.5415344238281,
-    "y": 308.43124318122864,
-    "z": "13b9846a.014e4c",
+    "x": 1719.5350341796875,
+    "y": 350.4312422275543,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "c725a9a8.031f88"
+        "52870b8e.6e27b4"
       ]
     ]
   },
   {
-    "id": "c725a9a8.031f88",
+    "id": "52870b8e.6e27b4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1917.5414962768555,
-    "y": 304.43124985694885,
-    "z": "13b9846a.014e4c",
+    "x": 1918.5349960327148,
+    "y": 346.43124890327454,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "9ce1ba29.f6ec68"
+        "1fed4c26.5b7f64"
       ]
     ]
   },
   {
-    "id": "9ce1ba29.f6ec68",
+    "id": "1fed4c26.5b7f64",
     "type": "set",
     "name": "set cbs",
     "xml": "<set>\n<parameter name='prop.sotn.cbs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2075.8750610351562,
-    "y": 302.8924095630646,
-    "z": "13b9846a.014e4c",
+    "x": 2076.8685607910156,
+    "y": 344.89240860939026,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "ef3f5059.2d4ea",
+    "id": "6867734f.34178c",
     "type": "switchNode",
     "name": "switch PBS",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'PBS'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1718.5415344238281,
-    "y": 353.43124318122864,
-    "z": "13b9846a.014e4c",
+    "x": 1719.5350341796875,
+    "y": 395.4312422275543,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "205ee4a2.b994ec"
+        "dc43d92a.b102c8"
       ]
     ]
   },
   {
-    "id": "205ee4a2.b994ec",
+    "id": "dc43d92a.b102c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1917.5414962768555,
-    "y": 346.43125081062317,
-    "z": "13b9846a.014e4c",
+    "x": 1918.5349960327148,
+    "y": 388.43124985694885,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "547b372e.cb4fb8"
+        "a31e90a2.55db7"
       ]
     ]
   },
   {
-    "id": "547b372e.cb4fb8",
+    "id": "a31e90a2.55db7",
     "type": "set",
     "name": "set pbs",
     "xml": "<set>\n<parameter name='prop.sotn.pbs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2078.8750610351562,
-    "y": 347.8924095630646,
-    "z": "13b9846a.014e4c",
+    "x": 2079.8685607910156,
+    "y": 389.89240860939026,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "cd1b68b3.245ce8",
+    "id": "e09fe051.1cbb8",
     "type": "switchNode",
     "name": "switch color-aware",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'color-aware'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1740.541618347168,
-    "y": 400.43126034736633,
-    "z": "13b9846a.014e4c",
+    "x": 1741.5351181030273,
+    "y": 442.431259393692,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "5d9f9f32.e6f9f"
+        "6b010031.f7dc"
       ]
     ]
   },
   {
-    "id": "5d9f9f32.e6f9f",
+    "id": "6b010031.f7dc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1918.5416221618652,
-    "y": 394.4312527179718,
-    "z": "13b9846a.014e4c",
+    "x": 1919.5351219177246,
+    "y": 436.4312517642975,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "38ebf92a.f170a6"
+        "f64a6ad7.75c698"
       ]
     ]
   },
   {
-    "id": "38ebf92a.f170a6",
+    "id": "f64a6ad7.75c698",
     "type": "set",
     "name": "set colorAware",
     "xml": "<set>\n<parameter name='prop.sotn.colorAware' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2099.875,
-    "y": 393.8924114704132,
-    "z": "13b9846a.014e4c",
+    "x": 2100.8684997558594,
+    "y": 435.8924105167389,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "43611249.362dac",
+    "id": "1d14a0da.1e8adf",
     "type": "switchNode",
     "name": "switch coupling-flag",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'coupling-flag'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1740.5416259765625,
-    "y": 446.43128514289856,
-    "z": "13b9846a.014e4c",
+    "x": 1741.5351257324219,
+    "y": 488.43128418922424,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "bd25ef93.0d4f4"
+        "465a723d.71bccc"
       ]
     ]
   },
   {
-    "id": "bd25ef93.0d4f4",
+    "id": "465a723d.71bccc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1918.541618347168,
-    "y": 438.4312536716461,
-    "z": "13b9846a.014e4c",
+    "x": 1919.5351181030273,
+    "y": 480.4312527179718,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "fd007702.45b298"
+        "abc827cf.8d31c8"
       ]
     ]
   },
   {
-    "id": "fd007702.45b298",
+    "id": "abc827cf.8d31c8",
     "type": "set",
     "name": "set couplingFlag",
     "xml": "<set>\n<parameter name='prop.sotn.couplingFlag' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2103.875,
-    "y": 438.89243626594543,
-    "z": "13b9846a.014e4c",
+    "x": 2104.8684997558594,
+    "y": 480.8924353122711,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "c4de2cef.1053e",
+    "id": "8cf376b5.6cba28",
     "type": "switchNode",
     "name": "switch cVLAN",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'cVLAN'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1731.5415649414062,
-    "y": 711.4312927722931,
-    "z": "13b9846a.014e4c",
+    "x": 1732.5350646972656,
+    "y": 753.4312918186188,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "2a41f958.80fe56"
+        "cbfe2ddc.e03c2"
       ]
     ]
   },
   {
-    "id": "2a41f958.80fe56",
+    "id": "cbfe2ddc.e03c2",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1936.5415344238281,
-    "y": 712.4312431812286,
-    "z": "13b9846a.014e4c",
+    "x": 1937.5350341796875,
+    "y": 754.4312422275543,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "3e76d5dc.97935a"
+        "57793550.48202c"
       ]
     ]
   },
   {
-    "id": "3e76d5dc.97935a",
+    "id": "57793550.48202c",
     "type": "set",
     "name": "set cVLAN",
     "xml": "<set>\n<parameter name='prop.sotn.cVLAN' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2090.2083740234375,
-    "y": 711.4417145252228,
-    "z": "13b9846a.014e4c",
+    "x": 2091.201873779297,
+    "y": 753.4417135715485,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "97828cf6.96e35",
+    "id": "5bd71de4.186664",
     "type": "comment",
     "name": "TODO: Recheck AAI schemas",
     "info": "",
     "comments": "",
-    "x": 785.0416870117188,
-    "y": 42.43131947517395,
-    "z": "13b9846a.014e4c",
+    "x": 786.0351867675781,
+    "y": 84.43131852149963,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json
index 7c4dec42..5caf6849 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "dbfbe99b.e9cbe8",
+    "id": "1cff3dd.1bd75c2",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 116.01040649414062,
-    "y": 44.666656255722046,
-    "z": "25c39c60.9e5894",
+    "x": 132.00390625,
+    "y": 51.00390625,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "23197697.79faaa"
+        "93d49eff.25811"
       ]
     ]
   },
   {
-    "id": "23197697.79faaa",
+    "id": "93d49eff.25811",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,65 +22,65 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 272.0104103088379,
-    "y": 135.66667819023132,
-    "z": "25c39c60.9e5894",
+    "x": 288.00391006469727,
+    "y": 142.00392818450928,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "f4094d1c.b6791"
+        "92b42a02.8d5ca8"
       ]
     ]
   },
   {
-    "id": "f4094d1c.b6791",
+    "id": "92b42a02.8d5ca8",
     "type": "method",
     "name": "method sotn-network-topology-operation-deactivate",
     "xml": "<method rpc='sotn-network-topology-operation-deactivate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 260.0105285644531,
-    "y": 223.66666102409363,
-    "z": "25c39c60.9e5894",
+    "x": 276.0040283203125,
+    "y": 230.00391101837158,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "8b588587.07d838"
+        "366ea887.121e48"
       ]
     ]
   },
   {
-    "id": "8b588587.07d838",
+    "id": "366ea887.121e48",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 483.01048278808594,
-    "y": 295.666734457016,
-    "z": "25c39c60.9e5894",
+    "x": 499.0039825439453,
+    "y": 302.00398445129395,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "37ee3ec1.d168c2",
-        "84f57d66.de4e4",
-        "54ed7f5.2ee008",
-        "642b70ce.9a12c",
-        "26a09247.15d9ee",
-        "d068035a.95625",
-        "453b73b2.972dac",
-        "c7d360a9.620ce"
+        "cd5f7c65.252fa",
+        "62b5f38f.a23b1c",
+        "321a98d2.d65578",
+        "acc7b853.93de78",
+        "66a195e2.15165c",
+        "e88b4c8f.26b3d",
+        "f5303ddb.a29a7",
+        "85416f02.f4216"
       ]
     ]
   },
   {
-    "id": "37ee3ec1.d168c2",
+    "id": "cd5f7c65.252fa",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-sotn-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 914.6215515136719,
-    "y": 43.99999976158142,
-    "z": "25c39c60.9e5894",
+    "x": 930.6150512695312,
+    "y": 50.337249755859375,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -88,15 +88,15 @@
     ]
   },
   {
-    "id": "84f57d66.de4e4",
+    "id": "62b5f38f.a23b1c",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sotn-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SOTN-Deactivate\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 719.0416564941406,
-    "y": 87.03125262260437,
-    "z": "25c39c60.9e5894",
+    "x": 735.03515625,
+    "y": 93.36850261688232,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -104,54 +104,54 @@
     ]
   },
   {
-    "id": "26a09247.15d9ee",
+    "id": "66a195e2.15165c",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $network-topology-operation-input.network-information.network-id  + '/network-data/'` \" />",
     "comments": "",
-    "x": 810.0417060852051,
-    "y": 275.566694021225,
-    "z": "25c39c60.9e5894",
+    "x": 826.0352058410645,
+    "y": 281.90394401550293,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "c7d360a9.620ce",
+    "id": "85416f02.f4216",
     "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": 731.819507598877,
-    "y": 465.1221139431,
-    "z": "25c39c60.9e5894",
+    "x": 747.8130073547363,
+    "y": 471.45936393737793,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "d068035a.95625",
+    "id": "e88b4c8f.26b3d",
     "type": "set",
     "name": "set network-level-oper-status",
     "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='PendingDelete' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
     "comments": "",
-    "x": 776.9306221008301,
-    "y": 336.7888686656952,
-    "z": "25c39c60.9e5894",
+    "x": 792.9241218566895,
+    "y": 343.12611865997314,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "54ed7f5.2ee008",
+    "id": "321a98d2.d65578",
     "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": 751.3437614440918,
-    "y": 140.0312888622284,
-    "z": "25c39c60.9e5894",
+    "x": 767.3372611999512,
+    "y": 146.36853885650635,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -159,15 +159,15 @@
     ]
   },
   {
-    "id": "453b73b2.972dac",
+    "id": "f5303ddb.a29a7",
     "type": "update",
     "name": "update SOTN Connectivity status to AAI",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n      key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='configuration-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='PendingDelete' />",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='connectivity-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='PendingDelete' />",
     "comments": "",
     "outputs": 1,
-    "x": 811.1492042541504,
-    "y": 396.4920575618744,
-    "z": "25c39c60.9e5894",
+    "x": 827.1427040100098,
+    "y": 402.82930755615234,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -175,27 +175,27 @@
     ]
   },
   {
-    "id": "642b70ce.9a12c",
+    "id": "acc7b853.93de78",
     "type": "set",
     "name": "set network in service-data",
     "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />",
     "comments": "",
-    "x": 773.4861793518066,
-    "y": 207.34445357322693,
-    "z": "25c39c60.9e5894",
+    "x": 789.479679107666,
+    "y": 213.68170356750488,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "e7e26097.3b8df",
+    "id": "b10f480b.ef7f98",
     "type": "comment",
     "name": "TODO MP2MP",
     "info": "Current implementation is for P2P connectivity\nFor MP2MP connectivity in future DG needs to be modified",
     "comments": "",
-    "x": 998.5173072814941,
-    "y": 130.28468012809753,
-    "z": "25c39c60.9e5894",
+    "x": 1014.5108070373535,
+    "y": 136.6219301223755,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json
index 923f1e85..2f29f7da 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "dade7d5.3be378",
+    "id": "e2842db5.a9071",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 116.01040649414062,
-    "y": 55.999999734573066,
-    "z": "1ff7724b.6a5b2e",
+    "x": 107.00390625,
+    "y": 70.00390625,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "88d1057.ae444f8"
+        "d0423637.689c18"
       ]
     ]
   },
   {
-    "id": "88d1057.ae444f8",
+    "id": "d0423637.689c18",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,64 +22,64 @@
     "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": 328.0104103088379,
-    "y": 128.00001690071076,
-    "z": "1ff7724b.6a5b2e",
+    "x": 319.00391006469727,
+    "y": 142.0039234161377,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "1b879646.8c5f2a"
+        "8964c247.35272"
       ]
     ]
   },
   {
-    "id": "1b879646.8c5f2a",
+    "id": "8964c247.35272",
     "type": "method",
     "name": "method sotn-network-topology-operation-delete",
     "xml": "<method rpc='sotn-network-topology-operation-delete' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 316.0105285644531,
-    "y": 215.99999973457307,
-    "z": "1ff7724b.6a5b2e",
+    "x": 307.0040283203125,
+    "y": 230.00390625,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "84422522.f0dfe8"
+        "7ece957c.81e36c"
       ]
     ]
   },
   {
-    "id": "84422522.f0dfe8",
+    "id": "7ece957c.81e36c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 486.45486068725586,
-    "y": 278.44445583503693,
-    "z": "1ff7724b.6a5b2e",
+    "x": 477.44836044311523,
+    "y": 292.44836235046387,
+    "z": "54170a80.42c614",
     "wires": [
       [
-        "8bc679c2.d2e228",
-        "3dd9c771.f2d768",
-        "81f00f63.ec84b",
-        "a13b30bd.b7628",
-        "a4092a94.cd0c48",
-        "2768fcc.58a2004",
-        "8b28cfea.bd23e"
+        "1ccc938f.2f224c",
+        "a9d1874f.281198",
+        "bebcb7e3.f95d48",
+        "f957f73b.5f1c98",
+        "77e06509.a268cc",
+        "ed0dab58.6e6938",
+        "53d6d08a.6aeb8"
       ]
     ]
   },
   {
-    "id": "8bc679c2.d2e228",
+    "id": "1ccc938f.2f224c",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-sotn-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 948.3993072509766,
-    "y": 72.99999973457307,
-    "z": "1ff7724b.6a5b2e",
+    "x": 939.3928070068359,
+    "y": 87.00390625,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -87,15 +87,15 @@
     ]
   },
   {
-    "id": "3dd9c771.f2d768",
+    "id": "a9d1874f.281198",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sotn-network-topology-operation-delete\"/>\n<parameter name=\"field3\" value=\"SOTN-Delete\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 761.7881317138672,
-    "y": 139.33337185066193,
-    "z": "1ff7724b.6a5b2e",
+    "x": 752.7816314697266,
+    "y": 153.33727836608887,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
@@ -103,67 +103,67 @@
     ]
   },
   {
-    "id": "81f00f63.ec84b",
+    "id": "bebcb7e3.f95d48",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'` \" />",
     "comments": "",
-    "x": 846.4548149108887,
-    "y": 387.42429134529084,
-    "z": "1ff7724b.6a5b2e",
+    "x": 837.448314666748,
+    "y": 401.4281978607178,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "a13b30bd.b7628",
+    "id": "f957f73b.5f1c98",
     "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": 775.5660629272461,
-    "y": 450.97967931907624,
-    "z": "1ff7724b.6a5b2e",
+    "x": 766.5595626831055,
+    "y": 464.9835858345032,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "2768fcc.58a2004",
+    "id": "ed0dab58.6e6938",
     "type": "set",
     "name": "set new network length",
     "xml": "<set>\n\t<parameter name=\"service-data.networks.network_length\" value=\"`$service-data.networks.network_length - 1`\"/>\n\n\t\n",
     "comments": "",
-    "x": 805.0874862670898,
-    "y": 264.8952014176175,
-    "z": "1ff7724b.6a5b2e",
+    "x": 796.0809860229492,
+    "y": 278.89910793304443,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "a4092a94.cd0c48",
+    "id": "77e06509.a268cc",
     "type": "set",
     "name": "Remove networks from ServiceData",
     "xml": "<set>\n\t<parameter name=\"service-data.networks.network[$tmp.nidx].\" value=\"\"/>\n\n",
     "comments": "",
-    "x": 845.7116432189941,
-    "y": 312.86314317863435,
-    "z": "1ff7724b.6a5b2e",
+    "x": 836.7051429748535,
+    "y": 326.8670496940613,
+    "z": "54170a80.42c614",
     "wires": [
       
     ]
   },
   {
-    "id": "8b28cfea.bd23e",
+    "id": "53d6d08a.6aeb8",
     "type": "delete",
-    "name": "delete SOTN VPNInstance configuration in AAI",
-    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='configuration' \n        key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id'>\n",
+    "name": "delete SOTN VPNInstance connectivity in AAI",
+    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='connectivity' \n        key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 883.6429862976074,
-    "y": 206.0062854019925,
-    "z": "1ff7724b.6a5b2e",
+    "x": 874.6364860534668,
+    "y": 220.01019191741943,
+    "z": "54170a80.42c614",
     "wires": [
       [
         
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
index a8935d83..8d9c12e4 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
@@ -1,521 +1,570 @@
 <service-logic
-	xmlns='http://www.onap.org/sdnc/svclogic'
-	xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-	<method rpc='sotn-attachment-topology-operation-activate' mode='sync'>
-		<block atomic="true">
-			<set>
-				<parameter name='tmp.ar.allotted-resource-id' value='`connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-				<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
-			</set>
-			<set>
-				<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='sotn-attachment-topology-operation-activate' mode='sync'>
+        <block atomic="true">
+            <set>
+                <parameter name='tmp.ar.allotted-resource-id' value='`connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+                <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
+            </set>
+            <set>
+                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
  + $tmp.ar.allotted-resource-id
  + '/allotted-resource-data/connection-attachment-topology/'` " />
-			</set>
-			<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-				<parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-				<parameter name='contextPrefix' value='prop' />
-			</execute>
-			<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-				<parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
-				<parameter name="outputPath" value="tmp.ar-url"/>
-				<parameter name="target" value="{allotted-resource-id}"/>
-				<parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-			</execute>
-			<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >
-				<outcome value='success'>
-					<block atomic="true">
-						<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
-							<outcome value='1'>
-								<block atomic='true'>
-									<set>
-										<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />
-									</set>
-									<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
-										<outcome value='Created'>
-											<block></block>
-										</outcome>
-										<outcome value='Other'>
-											<return status='failure'>
-												<parameter name='ack-final' value='Y'/>
-												<parameter name="error-code" value="500" />
-												<parameter name="error-message"
-													value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
-											</return>
-										</outcome>
-									</switch>
-									<set>
-										<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
-										<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />
-										<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
-									</set>
-								</block>
-							</outcome>
-							<outcome value='Other'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="404" />
-									<parameter name="error-message" value="Error: SOTN resource not found" />
-								</return>
-							</outcome>
-						</switch>
-					</block>
-				</outcome>
-				<outcome value='Other'>
-					<block atomic="true">
-						<return status='failure'>
-							<parameter name='ack-final' value='Y'/>
-							<parameter name="error-code" value="404" />
-							<parameter name="error-message" value="Error: SOTN resource not found" />
-						</return>
-					</block>
-				</outcome>
-			</get-resource>
-			<block atomic="true">
-				<call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' ></call>
-			</block>
-			<set>
-				<parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-			</set>
-			<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >
-				<outcome value='success'>
-					<block></block>
-				</outcome>
-				<outcome value='Other'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="404" />
-						<parameter name="error-message" value="Error: SOTN resource not found" />
-					</return>
-				</outcome>
-			</get-resource>
-			<set>
-				<parameter name='tmp.found-in-ar' value='false' />
-				<parameter name='tmp.found-in-network' value='false' />
-				<parameter name='tmp.ep-available' value='false' />
-			</set>
-			<switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>
-				<outcome value='2'>
-					<block atomic="true">
-						<for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >
-							<switch test="`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-								<outcome value='true'>
-									<block></block>
-								</outcome>
-								<outcome value='false'>
-									<block atomic="true">
-										<set>
-											<parameter name='tmp.pidx' value='`$pidx`' />
-											<parameter name='tmp.provided-ar.' value='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$pidx].`' />
-											<parameter name='tmp.found-in-ar' value='true' />
-											<parameter name='tmp.ep-available' value='true' />
-										</set>
-										<break></break>
-									</block>
-								</outcome>
-							</switch>
-						</for>
-						<switch test='`$tmp.found-in-ar`'>
-							<outcome value='true'>
-								<block atomic="true">
-									<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$tmp.provided-ar.allotted-resource-id/' pfx='mdsal-other-ar' >
-										<outcome value='success'>
-											<block></block>
-										</outcome>
-										<outcome value='Other'>
-											<return status='failure'>
-												<parameter name='ack-final' value='Y'/>
-												<parameter name="error-code" value="404" />
-												<parameter name="error-message" value="Error: SOTN provided attachment resource not found" />
-											</return>
-										</outcome>
-									</get-resource>
-								</block>
-							</outcome>
-						</switch>
-					</block>
-				</outcome>
-				<outcome value='1'>
-					<block atomic="true">
-						<switch test='`$mdsal-psd.networks.network_length`'>
-							<outcome value='1'>
-								<block atomic="true">
-									<set>
-										<parameter name='tmp.network.' value='`$mdsal-psd.networks.network[0].`' />
-									</set>
-									<for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
-										<block>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='tmp.found-in-network' value='true' />
-														<parameter name='tmp.ep-available' value='true' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-														<parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'description'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.global.sotn.etht-svc-descr' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.global.sotn.tenantId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.global.sotn.vpnType' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'CIR'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'EIR'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'color-aware'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'coupling-flag'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
-													</set>
-												</outcome>
-											</switch>
-											<return status='success'>
-												<parameter name="ack-final-indicator" value="Y" />
-												<parameter name="error-code" value="200" />
-												<parameter name="error-message" value="`$error-message`" />
-											</return>
-										</block>
-									</for>
-								</block>
-							</outcome>
-							<outcome value='Other'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="404" />
-									<parameter name="error-message" value="Error: Incorrect state found more then 1 network" />
-								</return>
-							</outcome>
-						</switch>
-					</block>
-				</outcome>
-				<outcome value='Other'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="404" />
-						<parameter name="error-message" value="Error: SOTN resource not found" />
-					</return>
-				</outcome>
-			</switch>
-			<switch test='`$tmp.ep-available`'>
-				<outcome value='false'>
-					<block></block>
-				</outcome>
-				<outcome value='true'>
-					<block atomic="true">
-						<switch test='`$tmp.found-in-ar`'>
-							<outcome value='true'>
-								<block atomic="true">
-									<set>
-										<parameter name='tmp.ep.parameters' value='`$mdsal-other-ar.allotted-resource-data.connection-attachment-topology.connection-attachment-parameters`' />
-									</set>
-								</block>
-							</outcome>
-							<outcome value='false'>
-								<block atomic="true">
-									<set>
-										<parameter name='tmp.ep.parameters' value='`$tmp.network.network-data.network-request-input.network-input-parameters`' />
-									</set>
-								</block>
-							</outcome>
-						</switch>
-						<for index='idx' start='0' end='`$tmp.ep.parameters.param_length`' >
-							<block>
-								<switch test="`$tmp.ep.parameters.param[$idx].name == 'access-node-id'`">
-									<outcome value='true'>
-										<set>
-											<parameter name='prop.remote.connection-attachment.access-node-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-										</set>
-									</outcome>
-								</switch>
-								<switch test="`$tmp.ep.parameters.param[$idx].name == 'access-ltp-id'`">
-									<outcome value='true'>
-										<set>
-											<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-										</set>
-									</outcome>
-								</switch>
-								<switch test="`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`">
-									<outcome value='true'>
-										<set>
-											<parameter name='prop.remote.connection-attachment.clientSignal' value='`$tmp.ep.parameters.param[$idx].value`' />
-										</set>
-									</outcome>
-								</switch>
-								<switch test="`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`">
-									<outcome value='true'>
-										<set>
-											<parameter name='prop.remote.connection-attachment.cVLAN' value='`$tmp.ep.parameters.param[$idx].value`' />
-										</set>
-									</outcome>
-								</switch>
-								<switch test="`$tmp.ep.parameters.param[$idx].name == 'access-provider-id'`">
-									<outcome value='true'>
-										<set>
-											<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-										</set>
-									</outcome>
-								</switch>
-								<switch test="`$tmp.ep.parameters.param[$idx].name == 'access-client-id'`">
-									<outcome value='true'>
-										<set>
-											<parameter name='prop.remote.connection-attachment.access-client-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-										</set>
-									</outcome>
-								</switch>
-								<switch test="`$tmp.ep.parameters.param[$idx].name == 'access-topology-id'`">
-									<outcome value='true'>
-										<set>
-											<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$tmp.ep.parameters.param[$idx].value`' />
-										</set>
-									</outcome>
-								</switch>
-								<return status='success'>
-									<parameter name="ack-final-indicator" value="Y" />
-									<parameter name="error-code" value="200" />
-									<parameter name="error-message" value="`$error-message`" />
-								</return>
-							</block>
-						</for>
-						<block atomic="true">
-							<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-								<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />
-								<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url'`" />
-								<parameter name="restapiUser" value="`$prop.oof.user`" />
-								<parameter name="restapiPassword" value="`$prop.oof.password`" />
-								<parameter name="format" value="json"/>
-								<parameter name="httpMethod" value="post"/>
-								<parameter name="responsePrefix" value="oof"/>
-								<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
-								<parameter name="trustStorePassword" value="adminadmin"/>
-								<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-								<parameter name="keyStorePassword" value="adminadmin"/>
-								<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-								<outcome value='failure'>
-									<return status='failure'>
-										<parameter name='ack-final' value='Y'/>
-										<parameter name="error-code" value="500" />
-										<parameter name="error-message" value="Error executing Create vpn rest api" />
-									</return>
-								</outcome>
-								<outcome value='success'>
-									<block atomic="true"></block>
-								</outcome>
-							</execute>
-							<for index='vidx' start='0' end='`$oof.vpns_length`' >
-								<block atomic="true">
-									<set>
-										<parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />
-									</set>
-									<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-										resource="pnf"
-										key="pnf.pnf-name = $oof.vpn.access-node-id AND
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+                <parameter name="outputPath" value="tmp.ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >
+                <outcome value='success'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
+                            <outcome value='1'>
+                                <block atomic='true'>
+                                    <set>
+                                        <parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />
+                                    </set>
+                                    <switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
+                                        <outcome value='Created'>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" 
+    value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="404" />
+                                    <parameter name="error-message" value="Error: SOTN resource not found" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="404" />
+                            <parameter name="error-message" value="Error: SOTN resource not found" />
+                        </return>
+                    </block>
+                </outcome>
+            </get-resource>
+            <block atomic="true">
+                <call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' ></call>
+            </block>
+            <set>
+                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+            </set>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="404" />
+                        <parameter name="error-message" value="Error: SOTN resource not found" />
+                    </return>
+                </outcome>
+            </get-resource>
+            <set>
+                <parameter name='tmp.found-in-ar' value='false' />
+                <parameter name='tmp.found-in-network' value='false' />
+                <parameter name='tmp.ep-available' value='false' />
+            </set>
+            <switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>
+                <outcome value='2'>
+                    <block atomic="true">
+                        <for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >
+                            <switch test="`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+                                <outcome value='true'>
+                                    <block></block>
+                                </outcome>
+                                <outcome value='false'>
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name='tmp.pidx' value='`$pidx`' />
+                                            <parameter name='tmp.provided-ar.' value='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$pidx].`' />
+                                            <parameter name='tmp.found-in-ar' value='true' />
+                                            <parameter name='tmp.ep-available' value='true' />
+                                        </set>
+                                        <break></break>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test='`$tmp.found-in-ar`'>
+                            <outcome value='true'>
+                                <block atomic="true">
+                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$tmp.provided-ar.allotted-resource-id/' pfx='mdsal-other-ar' >
+                                        <outcome value='success'>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="404" />
+                                                <parameter name="error-message" value="Error: SOTN provided attachment resource not found" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='1'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-psd.networks.network_length`'>
+                            <outcome value='1'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.network.' value='`$mdsal-psd.networks.network[0].`' />
+                                    </set>
+                                    <for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
+                                        <block>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='tmp.found-in-network' value='true' />
+                                                        <parameter name='tmp.ep-available' value='true' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                        <parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'description'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.etht-svc-descr' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.tenantId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.vpnType' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'CIR'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'EIR'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'color-aware'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].name == 'coupling-flag'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$idx].value`' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <return status='success'>
+                                                <parameter name="ack-final-indicator" value="Y" />
+                                                <parameter name="error-code" value="200" />
+                                                <parameter name="error-message" value="`$error-message`" />
+                                            </return>
+                                        </block>
+                                    </for>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="404" />
+                                    <parameter name="error-message" value="Error: Incorrect state found more then 1 network" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="404" />
+                        <parameter name="error-message" value="Error: SOTN resource not found" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$tmp.ep-available`'>
+                <outcome value='false'>
+                    <block></block>
+                </outcome>
+                <outcome value='true'>
+                    <block atomic="true">
+                        <switch test='`$tmp.found-in-ar`'>
+                            <outcome value='true'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.ep.parameters' value='`$mdsal-other-ar.allotted-resource-data.connection-attachment-topology.connection-attachment-parameters`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                            <outcome value='false'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.ep.parameters' value='`$tmp.network.network-data.network-request-input.network-input-parameters`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                        </switch>
+                        <for index='idx' start='0' end='`$tmp.ep.parameters.param_length`' >
+                            <block>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-node-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-node-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-ltp-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.clientSignal' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.cVLAN' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-provider-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-provider-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-client-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-client-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <switch test="`$tmp.ep.parameters.param[$idx].name == 'access-topology-id'`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='prop.remote.connection-attachment.access-topology-id' value='`$tmp.ep.parameters.param[$idx].value`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <return status='success'>
+                                    <parameter name="ack-final-indicator" value="Y" />
+                                    <parameter name="error-code" value="200" />
+                                    <parameter name="error-message" value="`$error-message`" />
+                                </return>
+                            </block>
+                        </for>
+                        <block atomic="true">
+                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />
+                                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url'`" />
+                                <parameter name="restapiUser" value="`$prop.oof.user`" />
+                                <parameter name="restapiPassword" value="`$prop.oof.password`" />
+                                <parameter name="format" value="json"/>
+                                <parameter name="httpMethod" value="post"/>
+                                <parameter name="responsePrefix" value="oof"/>
+                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                    </return>
+                                </outcome>
+                                <outcome value='success'>
+                                    <block atomic="true"></block>
+                                </outcome>
+                            </execute>
+                            <for index='vidx' start='0' end='`$oof.vpns_length`' >
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />
+                                    </set>
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="pnf" 
+		key="pnf.pnf-name = $oof.vpn.access-node-id AND 
 		     depth = '0'"
-										pfx='tmp.aai.pnf' local-only='false' >
-										<outcome value='success'>
-											<set>
-												<parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
-											</set>
-										</outcome>
-										<outcome value='not-found'>
-											<return status='failure'>
-												<parameter name='ack-final' value='Y'/>
-												<parameter name="error-code" value="500" />
-												<parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-											</return>
-										</outcome>
-										<outcome value='Other'>
-											<return status='failure'>
-												<parameter name='ack-final' value='Y'/>
-												<parameter name="error-code" value="500" />
-												<parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-											</return>
-										</outcome>
-									</get-resource>
-									<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-										resource="esr-thirdparty-sdnc"
-										key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND
+        pfx='tmp.aai.pnf' local-only='false' >
+                                        <outcome value='success'>
+                                            <set>
+                                                <parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
+                                            </set>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="esr-thirdparty-sdnc" 
+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND 
 		     depth = '1'"
-										pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
-										<outcome value='success'>
-											<set>
-												<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-												<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-												<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-											</set>
-										</outcome>
-										<outcome value='not-found'>
-											<return status='failure'>
-												<parameter name='ack-final' value='Y'/>
-												<parameter name="error-code" value="500" />
-												<parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-											</return>
-										</outcome>
-										<outcome value='Other'>
-											<return status='failure'>
-												<parameter name='ack-final' value='Y'/>
-												<parameter name="error-code" value="500" />
-												<parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-											</return>
-										</outcome>
-									</get-resource>
-									<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-										<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
-										<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc'`" />
-										<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-										<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-										<parameter name="format" value="json"/>
-										<parameter name="httpMethod" value="patch"/>
-										<parameter name="responsePrefix" value="vpn-result"/>
-										<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
-										<parameter name="trustStorePassword" value="adminadmin"/>
-										<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-										<parameter name="keyStorePassword" value="adminadmin"/>
-										<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-										<outcome value='failure'>
-											<return status='failure'>
-												<parameter name='ack-final' value='Y'/>
-												<parameter name="error-code" value="500" />
-												<parameter name="error-message" value="Error executing Create vpn rest api" />
-											</return>
-										</outcome>
-										<outcome value='success'>
-											<block atomic="true"></block>
-										</outcome>
-									</execute>
-								</block>
-							</for>
-						</block>
-					</block>
-				</outcome>
-			</switch>
-			<set>
-				<parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
-				<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
-				<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
-			</set>
-			<set>
-				<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.` " />
-			</set>
-			<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
-				<parameter name="outputPath" value="tmp.current-time" />
-			</execute>
-			<set>
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
-				<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`' />
-				<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`' />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-			</set>
-			<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-				<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
-				<parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-				<parameter name='restapiUser' value='`$prop.controller.user`' />
-				<parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-				<parameter name='format' value='json' />
-				<parameter name='httpMethod' value='PUT' />
-				<parameter name="responsePrefix" value="mdsal-ar" />
-				<outcome value='success'>
-					<block></block>
-				</outcome>
-				<outcome value='failure'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="500" />
-						<parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-					</return>
-				</outcome>
-				<outcome value='not-found'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="500" />
-						<parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-					</return>
-				</outcome>
-			</execute>
-			<set>
-				<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-				<parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
-				<parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+                                        <outcome value='success'>
+                                            <set>
+                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                            </set>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />
+                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                        <parameter name="format" value="json"/>
+                                        <parameter name="httpMethod" value="patch"/>
+                                        <parameter name="responsePrefix" value="vpn-result"/>
+                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'>
+                                            <block atomic="true"></block>
+                                        </outcome>
+                                    </execute>
+                                    <set>
+                                        <parameter name='tmp.vpnName' value='`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`' />
+                                    </set>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' 
+      key='vpn-binding.vpn-id = $tmp.vpnName' >
+                                        <parameter name='vpn-id' value='`$tmp.vpnName`' />
+                                        <parameter name='vpn-name' value='`$tmp.vpnName`' />
+                                        <parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />
+                                        <parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />
+                                        <parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />
+                                        <parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />
+                                        <parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />
+                                        <parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />
+                                        <parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />
+                                        <parameter name='cvlan-tag-entry' value='`$prop.connection-attachment.cVLAN`' />
+                                        <parameter name='operational-status' value='Created' />
+                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                        <parameter name='configuration-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+                                    </save>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
+      key='vpn-binding.vpn-id = $tmp.vpnName 
+      force="true" pfx="tmp.AnAI-data">
+                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $mdsal-psd.networks.network[0].network-id`" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$mdsal-psd.networks.network[0].network-id`" />
+                                    </save>
+                                    <set>
+                                        <parameter name='src-ltpId' value="`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`" />
+                                        <parameter name='dst-ltpId' value="`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`" />
+                                    </set>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
+      key='vpn-binding.vpn-id = $tmp.vpnName 
+      force="true" pfx="tmp.AnAI-data">
+                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/p-interfaces/p-interface/' + $src-ltpId`" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
+                                    </save>
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' 
+      key='vpn-binding.vpn-id = $tmp.vpnName 
+      force="true" pfx="tmp.AnAI-data">
+                                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/p-interfaces/p-interface/' + $dst-ltpId`" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$dst-ltpId`" />
+                                    </save>
+                                </block>
+                            </for>
+                        </block>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
+            </set>
+            <set>
+                <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.` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+                <parameter name="outputPath" value="tmp.current-time" />
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
+                <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`' />
+                <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`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
  + $connection-attachment-topology-operation-input.service-information.service-instance-id
  + '/service-data/service-topology/'`"/>
-			</set>
-			<update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-				resource="allotted-resource"
-				key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+            </set>
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource" 
+		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
 			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
 			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
 			allotted-resource.id = $tmp.ar.allotted-resource-id"
-				pfx='pfx' local-only='false' force='false'>
-				<parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
-				<parameter name="selflink" value="`$tmp.ar.self-link`" />
-				<parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
-				<parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
-				<parameter name="operational-status" value="Active" />
-				<outcome value='failure'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="500" />
-						<parameter name="error-message" value="AAI failed" />
-					</return>
-				</outcome>
-				<outcome value='not-found'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="500" />
-						<parameter name="error-message" value="AAI failed" />
-					</return>
-				</outcome>
-			</update>
-			<return status='success'>
-				<parameter name="ack-final-indicator" value="Y" />
-				<parameter name="error-code" value="200" />
-				<parameter name="error-message" value="`$error-message`" />
-			</return>
-		</block>
-	</method>
-</service-logic>
\ No newline at end of file
+        pfx='pfx' local-only='false' force='false'>
+                <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
+                <parameter name="selflink" value="`$tmp.ar.self-link`" />
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+                <parameter name="operational-status" value="Active" />
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+            </update>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
index 50ab2493..727246a3 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
@@ -1,250 +1,256 @@
 <service-logic
     xmlns='http://www.onap.org/sdnc/svclogic'
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-   <method rpc='sotn-attachment-topology-operation-create' mode='sync'>
-      <block atomic="true">
-         <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
-            <outcome value=''>
-               <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                  <parameter name="ctx-destination" value="tmp.ar.allotted-resource-id"/>
-                  <outcome value='failure'>
-                     <return status='failure'>
-                        <parameter name='error-code' value='' />
-                        <parameter name='error-message' value="An error occured while generation allotted resource ID" />
-                     </return>
-                  </outcome>
-               </execute>
-            </outcome>
-            <outcome value='Other'>
-               <set>
-                  <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-               </set>
-            </outcome>
-         </switch>
-         <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>
-            <outcome value=''>
-               <set>
-                  <parameter name='tmp.ar.allotted-resource-type' value="SOTNAttachmentInstance" />
-               </set>
-            </outcome>
-            <outcome value='Other'>
-               <set>
-                  <parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />
-               </set>
-            </outcome>
-         </switch>
-         <set>
-            <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+    <method rpc='sotn-attachment-topology-operation-create' mode='sync'>
+        <block atomic="true">
+            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+                <outcome value=''>
+                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                        <parameter name="ctx-destination" value="tmp.ar.allotted-resource-id"/>
+                        <outcome value='failure'>
+                            <return status='failure'>
+                                <parameter name='error-code' value='' />
+                                <parameter name='error-message' value="An error occured while generation allotted resource ID" />
+                            </return>
+                        </outcome>
+                    </execute>
+                </outcome>
+                <outcome value='Other'>
+                    <set>
+                        <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+                    </set>
+                </outcome>
+            </switch>
+            <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='tmp.ar.allotted-resource-type' value="SOTNAttachmentInstance" />
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <set>
+                        <parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />
+                    </set>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
  + $tmp.ar.allotted-resource-id
  + '/allotted-resource-data/connection-attachment-topology/'` " />
-         </set>
-         <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-            <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-            <parameter name='contextPrefix' value='prop' />
-         </execute>
-         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-            <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
-            <parameter name="outputPath" value="tmp.ar-url"/>
-            <parameter name="target" value="{allotted-resource-id}"/>
-            <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-         </execute>
-         <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$tmp.ar.allotted-resource-id/' pfx='mdsal-ar' >
-            <outcome value='success'>
-               <block atomic="true">
-                  <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
-                     <outcome value='1'>
-                        <return status='failure'>
-                           <parameter name='ack-final' value='Y'/>
-                           <parameter name="error-code" value="500" />
-                           <parameter name="error-message" value="Error: Existing connection attachment allotted resource" />
-                        </return>
-                     </outcome>
-                  </switch>
-               </block>
-            </outcome>
-         </get-resource>
-         <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
-            <outcome value=''>
-               <set>
-                  <parameter name='tmp.cidx' value="`0`" />
-                  <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" />
-               </set>
-            </outcome>
-            <outcome value='Other'>
-               <block atomic="true">
-                  <set>
-                     <parameter name='tmp.found-cidx' value="`false`" />
-                  </set>
-                  <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
-                     <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-                        <outcome value='true'>
-                           <return status='failure'>
-                              <parameter name='ack-final' value='Y'/>
-                              <parameter name="error-code" value="500" />
-                              <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists." />
-                           </return>
-                        </outcome>
-                     </switch>
-                  </for>
-                  <switch test='`$tmp.found-cidx`'>
-                     <outcome value='false'>
-                        <block atomic="true">
-                           <set>
-                              <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
-                           </set>
-                        </block>
-                     </outcome>
-                  </switch>
-               </block>
-            </outcome>
-         </switch>
-         <set>
-            <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-            <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
-            <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " />
-            <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />
-         </set>
-         <set>
-            <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-         </set>
-         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-            <parameter name="source" value="`$prop.restapi.parent-provided-resource`"/>
-            <parameter name="outputPath" value="tmp.parent-ar-url"/>
-            <parameter name="target" value="{service-instance-id}"/>
-            <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
-         </execute>
-         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-            <parameter name="source" value="`$tmp.parent-ar-url`"/>
-            <parameter name="outputPath" value="tmp.parent-ar-url"/>
-            <parameter name="target" value="{allotted-resource-id}"/>
-            <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-         </execute>
-         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
-            <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />
-            <parameter name='restapiUser' value='`$prop.controller.user`' />
-            <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-            <parameter name='format' value='json' />
-            <parameter name='httpMethod' value='PUT' />
-            <parameter name="responsePrefix" value="parent" />
-            <outcome value='success'>
-               <block></block>
-            </outcome>
-            <outcome value='failure'>
-               <return status='failure'>
-                  <parameter name='ack-final' value='Y'/>
-                  <parameter name="error-code" value="500" />
-                  <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-               </return>
-            </outcome>
-            <outcome value='not-found'>
-               <return status='failure'>
-                  <parameter name='ack-final' value='Y'/>
-                  <parameter name="error-code" value="500" />
-                  <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-               </return>
-            </outcome>
-         </execute>
-         <set>
-            <parameter name='connection-attachment-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-            <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
-            <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
-            <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
-            <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.` " />
-         </set>
-         <set>
-            <parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value="`$connection-attachment-topology-operation-input.service-information.service-instance-id` " />
-            <parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-            <parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
-            <parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-         </set>
-         <set>
-            <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.'
-                value="`$connection-attachment-ar-identifiers.`" />
-         </set>
-         <set>
-            <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.` " />
-         </set>
-         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
-            <parameter name="outputPath" value="tmp.current-time" />
-         </execute>
-         <set>
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
-            <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`' />
-            <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`' />
-            <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-         </set>
-         <call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' ></call>
-         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-            <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
-            <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-            <parameter name='restapiUser' value='`$prop.controller.user`' />
-            <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-            <parameter name='format' value='json' />
-            <parameter name='httpMethod' value='PUT' />
-            <parameter name="responsePrefix" value="mdsal-ar" />
-            <outcome value='success'>
-               <block></block>
-            </outcome>
-            <outcome value='failure'>
-               <return status='failure'>
-                  <parameter name='ack-final' value='Y'/>
-                  <parameter name="error-code" value="500" />
-                  <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-               </return>
-            </outcome>
-            <outcome value='not-found'>
-               <return status='failure'>
-                  <parameter name='ack-final' value='Y'/>
-                  <parameter name="error-code" value="500" />
-                  <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-               </return>
-            </outcome>
-         </execute>
-         <set>
-            <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-            <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
-            <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+                <parameter name="outputPath" value="tmp.ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$tmp.ar.allotted-resource-id/' pfx='mdsal-ar' >
+                <outcome value='success'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
+                            <outcome value='1'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error: Existing connection attachment allotted resource" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </get-resource>
+            <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='tmp.cidx' value="`0`" />
+                        <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" />
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <set>
+                            <parameter name='tmp.found-cidx' value="`false`" />
+                        </set>
+                        <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
+                            <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+                                <outcome value='true'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists." />
+                                    </return>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test='`$tmp.found-cidx`'>
+                            <outcome value='false'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " />
+                <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />
+            </set>
+            <set>
+                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.parent-provided-resource`"/>
+                <parameter name="outputPath" value="tmp.parent-ar-url"/>
+                <parameter name="target" value="{service-instance-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$tmp.parent-ar-url`"/>
+                <parameter name="outputPath" value="tmp.parent-ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="parent" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
+                <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.` " />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value="`$connection-attachment-topology-operation-input.service-information.service-instance-id` " />
+                <parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+                <parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+                <parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+            </set>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' 
+value="`$connection-attachment-ar-identifiers.`" />
+            </set>
+            <set>
+                <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.` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+                <parameter name="outputPath" value="tmp.current-time" />
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
+                <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`' />
+                <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`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+            </set>
+            <call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' ></call>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
  + $connection-attachment-topology-operation-input.service-information.service-instance-id
  + '/service-data/service-topology/'`"/>
-         </set>
-         <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-             resource="allotted-resource"
-             key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+            </set>
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource" 
+		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
 			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
 			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
 			allotted-resource.id = $tmp.ar.allotted-resource-id"
-             pfx='pfx' local-only='false' force='false'>
-            <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
-            <parameter name="selflink" value="`$tmp.ar.self-link`" />
-            <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
-            <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
-            <parameter name="operational-status" value="Created" />
-            <outcome value='failure'>
-               <return status='failure'>
-                  <parameter name='ack-final' value='Y'/>
-                  <parameter name="error-code" value="500" />
-                  <parameter name="error-message" value="AAI failed" />
-               </return>
-            </outcome>
-            <outcome value='not-found'>
-               <return status='failure'>
-                  <parameter name='ack-final' value='Y'/>
-                  <parameter name="error-code" value="500" />
-                  <parameter name="error-message" value="AAI failed" />
-               </return>
-            </outcome>
-         </update>
-         <return status='success'>
-            <parameter name="ack-final-indicator" value="Y" />
-            <parameter name="error-code" value="200" />
-            <parameter name="error-message" value="`$error-message`" />
-         </return>
-      </block>
-   </method>
-</service-logic>
\ No newline at end of file
+        pfx='pfx' local-only='false' force='false'>
+                <parameter name="name" value="`$prop.connection-attachment.sotnVpnName`" />
+                <parameter name="access-provider-id" value="`$prop.connection-attachment.access-provider-id`" />
+                <parameter name="access-client-id" value="`$prop.connection-attachment.access-client-id`" />
+                <parameter name="access-topology-id" value="`$prop.connection-attachment.access-topology-id`" />
+                <parameter name="access-node-id" value="`$prop.connection-attachment.access-node-id`" />
+                <parameter name="access-ltp-id" value="`$prop.connection-attachment.access-ltp-id`" />
+                <parameter name="cvlan-tag-entry" value="`$prop.connection-attachment.cVLAN`" />
+                <parameter name="selflink" value="`$tmp.ar.self-link`" />
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+                <parameter name="operational-status" value="Created" />
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+            </update>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
index 5df10857..e11ef2fb 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
@@ -1,338 +1,371 @@
 <service-logic
-	xmlns='http://www.onap.org/sdnc/svclogic'
-	xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
-	<method rpc='sotn-attachment-topology-operation-deactivate' mode='sync'>
-		<block atomic="true">
-			<set>
-				<parameter name='tmp.ar.allotted-resource-id' value='`connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-				<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
-			</set>
-			<set>
-				<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='sotn-attachment-topology-operation-deactivate' mode='sync'>
+        <block atomic="true">
+            <set>
+                <parameter name='tmp.ar.allotted-resource-id' value='`connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+                <parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
+            </set>
+            <set>
+                <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
  + $tmp.ar.allotted-resource-id
  + '/allotted-resource-data/connection-attachment-topology/'` " />
-			</set>
-			<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-				<parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-				<parameter name='contextPrefix' value='prop' />
-			</execute>
-			<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-				<parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
-				<parameter name="outputPath" value="tmp.ar-url"/>
-				<parameter name="target" value="{allotted-resource-id}"/>
-				<parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-			</execute>
-			<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >
-				<outcome value='success'>
-					<block atomic="true">
-						<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
-							<outcome value='1'>
-								<block atomic='true'>
-									<set>
-										<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />
-									</set>
-									<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
-										<outcome value='Active'>
-											<block></block>
-										</outcome>
-										<outcome value='Other'>
-											<return status='failure'>
-												<parameter name='ack-final' value='Y'/>
-												<parameter name="error-code" value="500" />
-												<parameter name="error-message"
-													value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
-											</return>
-										</outcome>
-									</switch>
-									<set>
-										<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
-										<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />
-										<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
-									</set>
-								</block>
-							</outcome>
-							<outcome value='Other'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="404" />
-									<parameter name="error-message" value="Error: SOTN resource not found" />
-								</return>
-							</outcome>
-						</switch>
-					</block>
-				</outcome>
-				<outcome value='Other'>
-					<block atomic="true">
-						<return status='failure'>
-							<parameter name='ack-final' value='Y'/>
-							<parameter name="error-code" value="404" />
-							<parameter name="error-message" value="Error: SOTN resource not found" />
-						</return>
-					</block>
-				</outcome>
-			</get-resource>
-			<block atomic="true">
-				<call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' ></call>
-			</block>
-			<set>
-				<parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-			</set>
-			<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >
-				<outcome value='success'>
-					<block></block>
-				</outcome>
-				<outcome value='Other'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="404" />
-						<parameter name="error-message" value="Error: SOTN resource not found" />
-					</return>
-				</outcome>
-			</get-resource>
-			<set>
-				<parameter name='tmp.found-in-ar' value='false' />
-				<parameter name='tmp.found-in-network' value='false' />
-				<parameter name='tmp.ep-available' value='false' />
-			</set>
-			<switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>
-				<outcome value='2'>
-					<block atomic="true">
-						<for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >
-							<switch test="`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-								<outcome value='true'>
-									<block></block>
-								</outcome>
-								<outcome value='false'>
-									<block atomic="true">
-										<set>
-											<parameter name='tmp.pidx' value='`$pidx`' />
-											<parameter name='tmp.provided-ar.' value='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$pidx].`' />
-											<parameter name='tmp.found-in-ar' value='true' />
-											<parameter name='tmp.ep-available' value='true' />
-										</set>
-										<break></break>
-									</block>
-								</outcome>
-							</switch>
-						</for>
-					</block>
-				</outcome>
-				<outcome value='1'>
-					<block atomic="true">
-						<switch test='`$mdsal-psd.networks.network_length`'>
-							<outcome value='1'>
-								<block atomic="true">
-									<set>
-										<parameter name='tmp.network.' value='`$mdsal-psd.networks.network[0].`' />
-									</set>
-									<for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
-										<block>
-											<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`">
-												<outcome value='true'>
-													<set>
-														<parameter name='tmp.found-in-network' value='true' />
-														<parameter name='tmp.ep-available' value='true' />
-													</set>
-												</outcome>
-											</switch>
-											<return status='success'>
-												<parameter name="ack-final-indicator" value="Y" />
-												<parameter name="error-code" value="200" />
-												<parameter name="error-message" value="`$error-message`" />
-											</return>
-										</block>
-									</for>
-								</block>
-							</outcome>
-							<outcome value='Other'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="404" />
-									<parameter name="error-message" value="Error: Incorrect state found more then 1 network" />
-								</return>
-							</outcome>
-						</switch>
-					</block>
-				</outcome>
-				<outcome value='Other'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="404" />
-						<parameter name="error-message" value="Error: SOTN resource not found" />
-					</return>
-				</outcome>
-			</switch>
-			<switch test='`$tmp.ep-available`'>
-				<outcome value='false'>
-					<block></block>
-				</outcome>
-				<outcome value='true'>
-					<block atomic="true">
-						<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-							resource="pnf"
-							key="pnf.pnf-name = $prop.connection-attachement.access-node-id AND
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$prop.restapi.connection-attachment-allottedresource`"/>
+                <parameter name="outputPath" value="tmp.ar-url"/>
+                <parameter name="target" value="{allotted-resource-id}"/>
+                <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+            </execute>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='connection-attachment-allotted-resources/connection-attachment-allotted-resource/$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >
+                <outcome value='success'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
+                            <outcome value='1'>
+                                <block atomic='true'>
+                                    <set>
+                                        <parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />
+                                    </set>
+                                    <switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
+                                        <outcome value='Active'>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" 
+    value="`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />
+                                        <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
+                                    </set>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="404" />
+                                    <parameter name="error-message" value="Error: SOTN resource not found" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="404" />
+                            <parameter name="error-message" value="Error: SOTN resource not found" />
+                        </return>
+                    </block>
+                </outcome>
+            </get-resource>
+            <block atomic="true">
+                <call module='GENERIC-RESOURCE-API' rpc='connection-attachment-get-request-input-param' mode='sync' ></call>
+            </block>
+            <set>
+                <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+            </set>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id/service-data' pfx='mdsal-psd' >
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="404" />
+                        <parameter name="error-message" value="Error: SOTN resource not found" />
+                    </return>
+                </outcome>
+            </get-resource>
+            <set>
+                <parameter name='tmp.found-in-ar' value='false' />
+                <parameter name='tmp.found-in-network' value='false' />
+                <parameter name='tmp.ep-available' value='false' />
+            </set>
+            <switch test='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`'>
+                <outcome value='2'>
+                    <block atomic="true">
+                        <for index='pidx' start='0' end='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource_length`' >
+                            <switch test="`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+                                <outcome value='true'>
+                                    <block></block>
+                                </outcome>
+                                <outcome value='false'>
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name='tmp.pidx' value='`$pidx`' />
+                                            <parameter name='tmp.provided-ar.' value='`$mdsal-psd.provided-allotted-resources.provided-allotted-resource[$pidx].`' />
+                                            <parameter name='tmp.found-in-ar' value='true' />
+                                            <parameter name='tmp.ep-available' value='true' />
+                                        </set>
+                                        <break></break>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='1'>
+                    <block atomic="true">
+                        <switch test='`$mdsal-psd.networks.network_length`'>
+                            <outcome value='1'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='tmp.network.' value='`$mdsal-psd.networks.network[0].`' />
+                                    </set>
+                                    <for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
+                                        <block>
+                                            <switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`">
+                                                <outcome value='true'>
+                                                    <set>
+                                                        <parameter name='tmp.found-in-network' value='true' />
+                                                        <parameter name='tmp.ep-available' value='true' />
+                                                    </set>
+                                                </outcome>
+                                            </switch>
+                                            <return status='success'>
+                                                <parameter name="ack-final-indicator" value="Y" />
+                                                <parameter name="error-code" value="200" />
+                                                <parameter name="error-message" value="`$error-message`" />
+                                            </return>
+                                        </block>
+                                    </for>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="404" />
+                                    <parameter name="error-message" value="Error: Incorrect state found more then 1 network" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="404" />
+                        <parameter name="error-message" value="Error: SOTN resource not found" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$tmp.ep-available`'>
+                <outcome value='false'>
+                    <block></block>
+                </outcome>
+                <outcome value='true'>
+                    <block atomic="true">
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="connectivity" 
+		key="connectivity.connectivity-id = $mdsal-psd.networks.network[0].network-id AND 
+		     depth = '1'"
+        pfx='tmp.connectivity' local-only='false' >
+                            <for silentFailure='true' index='vidx' start='0' end='`$tmp.connectivity.relationship-list.relationship_length`' >
+                                <switch test='`$tmp.connectivity.relationship-list.relationship[$vidx].related-to`'>
+                                    <outcome value='vpn-binding'>
+                                        <block atomic="true">
+                                            <set>
+                                                <parameter name='tmp.vpn-name' value="`$tmp.connectivity.relationship-list.relationship[$vidx].relationship-data[0].relationship-value` " />
+                                            </set>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                <parameter name="original_string" value='`$tmp.vpn-name`'/>
+                                                <parameter name="regex" value="-"/>
+                                                <parameter name="ctx_memory_result_key" value="route1"/>
+                                                <outcome value='success'>
+                                                    <set>
+                                                        <parameter name='tmp.node-id' value='`$route1[0]`' />
+                                                    </set>
+                                                </outcome>
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='error-code' value='' />
+                                                        <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                    </return>
+                                                </outcome>
+                                            </execute>
+                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="pnf" 
+		key="pnf.pnf-name = $tmp.node-id AND 
 		     depth = '0'"
-							pfx='tmp.aai.pnf' local-only='false' >
-							<outcome value='success'>
-								<set>
-									<parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
-								</set>
-							</outcome>
-							<outcome value='not-found'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="500" />
-									<parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-								</return>
-							</outcome>
-							<outcome value='Other'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="500" />
-									<parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-								</return>
-							</outcome>
-						</get-resource>
-						<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-							resource="esr-thirdparty-sdnc"
-							key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND
+        pfx='tmp.aai.pnf' local-only='false' >
+                                                <outcome value='success'>
+                                                    <set>
+                                                        <parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
+                                                    </set>
+                                                </outcome>
+                                                <outcome value='not-found'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                    </return>
+                                                </outcome>
+                                            </get-resource>
+                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="esr-thirdparty-sdnc" 
+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND 
 		     depth = '1'"
-							pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
-							<outcome value='success'>
-								<set>
-									<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-									<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-									<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-								</set>
-							</outcome>
-							<outcome value='not-found'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="500" />
-									<parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-								</return>
-							</outcome>
-							<outcome value='Other'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="500" />
-									<parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
-								</return>
-							</outcome>
-						</get-resource>
-						<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-							<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $prop.connection-attachment.sotnVpnName`" />
-							<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-							<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-							<parameter name="format" value="json"/>
-							<parameter name="httpMethod" value="delete"/>
-							<parameter name="responsePrefix" value="vpn-result"/>
-							<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
-							<parameter name="trustStorePassword" value="adminadmin"/>
-							<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-							<parameter name="keyStorePassword" value="adminadmin"/>
-							<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-							<outcome value='failure'>
-								<return status='failure'>
-									<parameter name='ack-final' value='Y'/>
-									<parameter name="error-code" value="500" />
-									<parameter name="error-message" value="Error executing Create vpn rest api" />
-								</return>
-							</outcome>
-							<outcome value='success'>
-								<block atomic="true"></block>
-							</outcome>
-						</execute>
-					</block>
-				</outcome>
-			</switch>
-			<set>
-				<parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
-				<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
-				<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
-			</set>
-			<set>
-				<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.` " />
-			</set>
-			<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
-				<parameter name="outputPath" value="tmp.current-time" />
-			</execute>
-			<set>
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
-				<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`' />
-				<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`' />
-				<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-			</set>
-			<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-				<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
-				<parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
-				<parameter name='restapiUser' value='`$prop.controller.user`' />
-				<parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-				<parameter name='format' value='json' />
-				<parameter name='httpMethod' value='PUT' />
-				<parameter name="responsePrefix" value="mdsal-ar" />
-				<outcome value='success'>
-					<block></block>
-				</outcome>
-				<outcome value='failure'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="500" />
-						<parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-					</return>
-				</outcome>
-				<outcome value='not-found'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="500" />
-						<parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
-					</return>
-				</outcome>
-			</execute>
-			<set>
-				<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-				<parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
-				<parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+                                                <outcome value='success'>
+                                                    <set>
+                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                    </set>
+                                                </outcome>
+                                                <outcome value='not-found'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+                                                    </return>
+                                                </outcome>
+                                            </get-resource>
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.vpn-name`" />
+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                                <parameter name="format" value="json"/>
+                                                <parameter name="httpMethod" value="delete"/>
+                                                <parameter name="responsePrefix" value="vpn-result"/>
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='success'>
+                                                    <block atomic="true"></block>
+                                                </outcome>
+                                            </execute>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </for>
+                        </get-resource>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
+                <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
+            </set>
+            <set>
+                <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.` " />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+                <parameter name="outputPath" value="tmp.current-time" />
+            </execute>
+            <set>
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
+                <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`' />
+                <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`' />
+                <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`" />
+                <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+                <parameter name='restapiUser' value='`$prop.controller.user`' />
+                <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+                <parameter name='format' value='json' />
+                <parameter name='httpMethod' value='PUT' />
+                <parameter name="responsePrefix" value="mdsal-ar" />
+                <outcome value='success'>
+                    <block></block>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for connection-attachment-allotted-resource" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+                <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+                <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
  + $connection-attachment-topology-operation-input.service-information.service-instance-id
  + '/service-data/service-topology/'`"/>
-			</set>
-			<update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-				resource="allotted-resource"
-				key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+            </set>
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="allotted-resource" 
+		key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
 			service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
 			service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
 			allotted-resource.id = $tmp.ar.allotted-resource-id"
-				pfx='pfx' local-only='false' force='false'>
-				<parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
-				<parameter name="selflink" value="`$tmp.ar.self-link`" />
-				<parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
-				<parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
-				<parameter name="operational-status" value="PendingDelete" />
-				<outcome value='failure'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="500" />
-						<parameter name="error-message" value="AAI failed" />
-					</return>
-				</outcome>
-				<outcome value='not-found'>
-					<return status='failure'>
-						<parameter name='ack-final' value='Y'/>
-						<parameter name="error-code" value="500" />
-						<parameter name="error-message" value="AAI failed" />
-					</return>
-				</outcome>
-			</update>
-			<return status='success'>
-				<parameter name="ack-final-indicator" value="Y" />
-				<parameter name="error-code" value="200" />
-				<parameter name="error-message" value="`$error-message`" />
-			</return>
-		</block>
-	</method>
-</service-logic>
\ No newline at end of file
+        pfx='pfx' local-only='false' force='false'>
+                <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
+                <parameter name="selflink" value="`$tmp.ar.self-link`" />
+                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+                <parameter name="operational-status" value="PendingDelete" />
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="AAI failed" />
+                    </return>
+                </outcome>
+            </update>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml
index 93de3abb..7e3fca53 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml
@@ -29,9 +29,9 @@
                 <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />
                 <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />
             </set>
-            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' 
-      key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id' >
-                <parameter name='configuration-id' value='`$network-topology-operation-input.network-information.network-id`' />
+            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
+      key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id' >
+                <parameter name='connectivity-id' value='`$network-topology-operation-input.network-information.network-id`' />
                 <parameter name='operational-status' value='Active' />
             </update>
             <return status='success'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
index fa2547d3..446d8a19 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
@@ -172,33 +172,38 @@
                 <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />
                 <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />
             </set>
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' 
-      key='configuration.configuration-id = $prop.sotn.network-id' >
-                <parameter name='configuration-id' value='`$prop.sotn.network-id`' />
-                <parameter name='configuration-name' value='`$prop.sotn.client-svc-name`' />
-                <parameter name='configuration-type' value='`$prop.sotn.client-svc-descr`' />
-                <parameter name='configuration-sub-type' value='`$prop.sotn.tenantId`' />
-                <parameter name='orchestration-status' value='`$prop.sotn.vpnType`' />
-                <parameter name='management-option' value='`$prop.sotn.cir`' />
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
+      key='connectivity.connectivity-id = $prop.sotn.network-id' >
+                <parameter name='connectivity-id' value='`$prop.sotn.network-id`' />
+                <parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />
+                <parameter name='CIR' value='`$prop.sotn.cir`' />
+                <parameter name='EIR' value='`$prop.sotn.eir`' />
+                <parameter name='CBS' value='`$prop.sotn.cbs`' />
+                <parameter name='EBS' value='`$prop.sotn.ebs`' />
+                <parameter name='color-aware' value='`$prop.sotn.colorAware`' />
+                <parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />
+                <parameter name='access-provider-id' value='`$prop.sotn.access-provider-id`' />
+                <parameter name='access-client-id' value='`$prop.sotn.access-client-id`' />
+                <parameter name='access-topology-id' value='`$prop.sotn.access-topology-id`' />
+                <parameter name='access-node-id' value='`$prop.sotn.access-node-id`' />
+                <parameter name='access-ltp-id' value='`$prop.sotn.access-ltp-id`' />
+                <parameter name='cvlan-tag-entry' value='`$prop.sotn.cVLAN`' />
                 <parameter name='operational-status' value='Created' />
                 <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
                 <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
                 <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                <parameter name='configuration-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+                <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
             </save>
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' 
       key='service-instance.service-instance-id = $service-data.service-information.service-instance-id 
          AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id 
          AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' 
       force="true" pfx="tmp.AnAI-data">
-                <parameter name="relationship-list.relationship[0].related-to" value="configuration" />
-                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/configurations/configuration/' + $prop.sotn.network-id`" />
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="configuration.configuration-id" />
+                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />
             </save>
-            <set>
-                <parameter name='unique-src-ltpId' value="`'nodeId-' + $prop.sotn.src-access-node-id + '-ltpId-' + $prop.sotn.src-access-ltp-id`" />
-            </set>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml
index 27d27388..ac891e34 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml
@@ -29,9 +29,9 @@
                 <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />
                 <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />
             </set>
-            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' 
-      key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id' >
-                <parameter name='configuration-id' value='`$network-topology-operation-input.network-information.network-id`' />
+            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
+      key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id' >
+                <parameter name='connectivity-id' value='`$network-topology-operation-input.network-information.network-id`' />
                 <parameter name='operational-status' value='PendingDelete' />
             </update>
             <return status='success'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml
index c2d0c9ab..2eb6e767 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml
@@ -10,8 +10,8 @@
                 <parameter name="field2" value="sotn-network-topology-operation-delete"/>
                 <parameter name="field3" value="SOTN-Delete"/>
             </record>
-            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='configuration' 
-        key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id'></delete>
+            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='connectivity' 
+        key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id'></delete>
             <set>
                 <parameter name="service-data.networks.network_length" value="`$service-data.networks.network_length - 1`"/>
             </set>