From 12c87ed2075ab6c13b85a3e0264cf45626aa04e5 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Fri, 16 Dec 2022 17:41:33 -0500
Subject: [PATCH] Performing closed-loop operation when callback dg is called
 by CCSDK. Also fixing a bug in delete operation.

Issue-ID: SDNC-1732

Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I68a7e5d9b57957f464ced5da6321e059bc293ed6

Former-commit-id: ce68057fba73610b3cbc97d41777de59650d025c
---
 .../properties/generic-resource-api-dg.properties  |   3 +-
 ...logy-operation-p2p-callbackdg-notification.json | 917 +++++++++++++++++++--
 ...-API_p2p-vnf-topology-operation-p2p-delete.json | 780 ++++++++++--------
 ...ology-operation-p2p-callbackdg-notification.xml | 254 ++++--
 ...E-API_p2p-vnf-topology-operation-p2p-delete.xml |  52 +-
 5 files changed, 1521 insertions(+), 485 deletions(-)

diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties
index 584f4c6c..054ced81 100644
--- a/installation/src/main/properties/generic-resource-api-dg.properties
+++ b/installation/src/main/properties/generic-resource-api-dg.properties
@@ -50,6 +50,7 @@ restapi.p2p-otn-domainG-creation.templatefile=p2p-otn-tunnel-domainG.json
 restapi.p2p-ethernet-service.templatefile=p2p-ethernet-service.json
 restapi.p2p-ethernet-service-vlan.templatefile=p2p-ethernet-service-vlan.json
 restapi.p2p-ethernet-service-same-domain.templatefile=p2p-ethernet-service-same-domain.json
+restapi.p2p-ethernet-service-modify.templatefile=p2p-ethernet-service-modify.json
 restapi.p2p-subscribe-notification.templatefile=p2p-subscribe-notification.json
 restapi.p2p-terminate-notification.templatefile=p2p-terminate-notification.json
 restapi.p2p-create-pm-data.templatefile=p2p-create-pm-data.json
@@ -102,4 +103,4 @@ restapi.ss-mS-mac-address-unassign=/api/macaddress/v1/service/unassign
 restapi.preload-network=/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{network-name}/network/preload-data/preload-network-topology-information/
 restapi.preloadinformation=/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/
 restapi.vf-module=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/
-restapi.vnf-assign=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}
+restapi.vnf-assign=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-callbackdg-notification.json b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-callbackdg-notification.json
index 258b58a9..8676b85c 100644
--- a/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-callbackdg-notification.json
+++ b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-callbackdg-notification.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "3a09fc70.fad8d4",
+        "id": "d59cf7f5.6f23b8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 149.56666564941406,
-        "y": 131.56666564941406,
-        "z": "b88832a3.96c4c8",
+        "x": 262.566650390625,
+        "y": 164.56666564941406,
+        "z": "1297170d.795181",
         "wires": [
             [
-                "168caa1c.41dcf6"
+                "c8eb50f3.190d78"
             ]
         ]
     },
     {
-        "id": "168caa1c.41dcf6",
+        "id": "c8eb50f3.190d78",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API 888",
         "module": "GENERIC-RESOURCE-API",
@@ -22,233 +22,980 @@
         "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='888'>",
         "outputs": 1,
-        "x": 433.85235595703125,
-        "y": 192.8047742843628,
-        "z": "b88832a3.96c4c8",
+        "x": 546.8523406982422,
+        "y": 225.8047742843628,
+        "z": "1297170d.795181",
         "wires": [
             [
-                "952f2b0e.26e698"
+                "fd155992.75a8"
             ]
         ]
     },
     {
-        "id": "952f2b0e.26e698",
+        "id": "fd155992.75a8",
         "type": "method",
         "name": "method p2p-vnf-topology-operation-p2p-callbackdg-notification",
         "xml": "<method rpc='p2p-vnf-topology-operation-p2p-callbackdg-notification' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 420.99525451660156,
-        "y": 268.5666961669922,
-        "z": "b88832a3.96c4c8",
+        "x": 533.9952392578125,
+        "y": 301.5666961669922,
+        "z": "1297170d.795181",
         "wires": [
             [
-                "3e8ccd3.e3636b2"
+                "b8c276c9.6b5808"
             ]
         ]
     },
     {
-        "id": "aaf25071.bda21",
+        "id": "b78fba66.45bc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1008.8047027587891,
-        "y": 493.23333740234375,
-        "z": "b88832a3.96c4c8",
+        "x": 1121.8046875,
+        "y": 526.2333374023438,
+        "z": "1297170d.795181",
         "wires": [
             [
-                "aa57cf0f.26b688",
-                "db7f4638.552cb8",
-                "45fe05e4.ea10c4",
-                "a0587b08.08777",
-                "fff7b9b7.2af748",
-                "23a47076.84785",
-                "991df3c2.230cc8"
+                "97dc74a2.90a7f",
+                "b5e2af16.7c67f",
+                "d85bcbac.610a28",
+                "7b3e0b51.e71b54",
+                "f6a1818b.69f698",
+                "5c598e9b.b62af",
+                "37760266.d3d3ae",
+                "2fac2d00.57aa3c",
+                "42d1ed51.356a24",
+                "885bab91.42dd48",
+                "754e20ae.34eb5"
             ]
         ]
     },
     {
-        "id": "9d09c472.dc19b",
+        "id": "7caf8b3a.4b81c4",
         "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' />",
         "comments": "",
         "outputs": 1,
-        "x": 1000.5666656494141,
-        "y": 269.56666564941406,
-        "z": "b88832a3.96c4c8",
+        "x": 1113.566650390625,
+        "y": 302.56666564941406,
+        "z": "1297170d.795181",
         "wires": [
             []
         ]
     },
     {
-        "id": "aa57cf0f.26b688",
+        "id": "97dc74a2.90a7f",
         "type": "set",
         "name": "set received notification parameters",
-        "xml": "<set>\n<!--<parameter name='rcvdNotif' value='`$notifvalue`' />-->\n<parameter name='rcvd-etht-svc-end-point' value='`$push-change-update.datastore-changes.payload.parameter-value[0].etht-svc-end-point`' />\n<parameter name='rcvd-subscription-id' value='`$push-change-update.subscription-id`' />\n<parameter name='rcvd-bandwidth-value' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value`' />\n<parameter name='rcvd-service-instance-id' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value-description`' />",
+        "xml": "<set>\n<parameter name='rcvd-etht-svc-end-point' value='`$performance-monitoring.service-pm[0].service-pm-state.performance-data[3].parameter-value[0].index`' />\n<!--<parameter name='rcvd-subscription-id' value='`$push-change-update.subscription-id`' />-->\n<parameter name='rcvd-bandwidth-value' value='`$performance-monitoring.service-pm[0].service-pm-state.performance-data[3].parameter-value[0].value`' />\n<parameter name='rcvd-etht-service-name' value='`$performance-monitoring.service-pm[0].service-name`' />\n\n",
         "comments": "",
-        "x": 1329.566665649414,
-        "y": 451.566650390625,
-        "z": "b88832a3.96c4c8",
+        "x": 1442.566650390625,
+        "y": 484.566650390625,
+        "z": "1297170d.795181",
         "wires": []
     },
     {
-        "id": "4699eb86.540554",
+        "id": "d0a8aff8.6a4e",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"CallBack DG For SSE CONNECTION is called\"/>\n<!--<parameter name=\"field2\" value=\"`$rcvdNotif`\"/>-->",
         "comments": "",
         "outputs": 1,
-        "x": 964.5667266845703,
-        "y": 213.56666564941406,
-        "z": "b88832a3.96c4c8",
+        "x": 1077.5667114257812,
+        "y": 246.56666564941406,
+        "z": "1297170d.795181",
         "wires": [
             []
         ]
     },
     {
-        "id": "23a47076.84785",
+        "id": "4691407b.b01b88",
         "type": "save",
         "name": "save:metadata to AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id =  $rcvd-service-instance-id\n AND customer.global-customer-id = 'IBNCustomer' \n AND service-subscription.service-type = 'IBN'\"  force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />\n    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$rcvd-bandwidth-value`\" />\n\n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 1267.566650390625,
-        "y": 661.566650390625,
-        "z": "b88832a3.96c4c8",
+        "x": 1367.566650390625,
+        "y": 1615.5667114257812,
+        "z": "1297170d.795181",
         "wires": [
             []
         ]
     },
     {
-        "id": "a0587b08.08777",
+        "id": "7b3e0b51.e71b54",
         "type": "set",
         "name": "set parameters",
-        "xml": "<set>\n<parameter name='eventIdUuid' value=\"`'BandwidthChanged_' + $eventId-uuid`\" />\n<parameter name='eventNameUuid' value='`$eventName-uuid`' />\n<parameter name='cclId' value='`$rcvd-service-instance-id`' />\n<parameter name='uniId' value='`$rcvd-etht-svc-end-point`' />\n<parameter name='bandwidthValue' value='`$rcvd-bandwidth-value`' />\n",
+        "xml": "<set>\n<parameter name='eventIdUuid' value=\"`'BandwidthChanged_' + $eventId-uuid`\" />\n<parameter name='eventNameUuid' value='`$eventName-uuid`' />\n<parameter name='cclId' value='`$rcvd-service-instance-id`' />\n<parameter name='uniId' value='`$rcvd-etht-svc-end-point`' />\n<!--<parameter name='bandwidthValue' value='`$rcvd-bandwidth-value`' />-->\n<parameter name='bandwidthValue' value='`$tmp.metavalue`' />\n",
         "comments": "",
-        "x": 1258.566650390625,
-        "y": 989.5666198730469,
-        "z": "b88832a3.96c4c8",
+        "x": 1358.566650390625,
+        "y": 1943.5666809082031,
+        "z": "1297170d.795181",
         "wires": []
     },
     {
-        "id": "fff7b9b7.2af748",
+        "id": "f6a1818b.69f698",
         "type": "execute",
         "name": "execute RestApiCallNode call VES",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-call-ves.templatefile`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.dcaeAddrAndPort + '/eventListener/v7'`\" />-->\n<parameter name=\"restapiUrl\" value=\"https://dcae-ves-collector:8443/eventListener/v7\" />\n<parameter name=\"restapiUser\" value=\"sample1\" />\n<parameter name=\"restapiPassword\" value=\"sample1\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"ves-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.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=\"disableHostVerification\" value=\"true\"/>\n<parameter name=\"ssl\" value=\"false\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1316.566650390625,
-        "y": 1032.5666198730469,
-        "z": "b88832a3.96c4c8",
+        "x": 1416.566650390625,
+        "y": 1986.5666809082031,
+        "z": "1297170d.795181",
         "wires": [
             []
         ]
     },
     {
-        "id": "db7f4638.552cb8",
+        "id": "b5e2af16.7c67f",
         "type": "execute",
         "name": "execute UUID generator for eventId",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventId-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1320.566650390625,
-        "y": 897.5666198730469,
-        "z": "b88832a3.96c4c8",
+        "x": 1420.566650390625,
+        "y": 1851.5666809082031,
+        "z": "1297170d.795181",
         "wires": [
             []
         ]
     },
     {
-        "id": "45fe05e4.ea10c4",
+        "id": "d85bcbac.610a28",
         "type": "execute",
         "name": "execute UUID generator for eventName",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventName-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1333.566650390625,
-        "y": 939.5666198730469,
-        "z": "b88832a3.96c4c8",
+        "x": 1433.566650390625,
+        "y": 1893.5666809082031,
+        "z": "1297170d.795181",
         "wires": [
             []
         ]
     },
     {
-        "id": "3f0e3083.b3f668",
+        "id": "b63d26e2.cce958",
         "type": "comment",
         "name": "Calling VES and passing notification parameters",
         "info": "",
         "comments": "",
-        "x": 1347.566650390625,
-        "y": 842.5666198730469,
-        "z": "b88832a3.96c4c8",
+        "x": 1447.566650390625,
+        "y": 1796.5666809082031,
+        "z": "1297170d.795181",
         "wires": []
     },
     {
-        "id": "99a9316.f88035",
+        "id": "f7b6d9ec.2d9a4",
         "type": "switchNode",
         "name": "switch change type == upadte",
         "xml": "<switch test=\"`$push-change-update.datastore-changes.type == 'update' `\">\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1025.566665649414,
-        "y": 344.566650390625,
-        "z": "b88832a3.96c4c8",
+        "x": 1138.566650390625,
+        "y": 377.566650390625,
+        "z": "1297170d.795181",
         "wires": [
             [
-                "86fcedb4.196448"
+                "abef7566.b569a8"
             ]
         ]
     },
     {
-        "id": "86fcedb4.196448",
+        "id": "abef7566.b569a8",
         "type": "outcome",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1240.566665649414,
-        "y": 342.566650390625,
-        "z": "b88832a3.96c4c8",
+        "x": 1353.566650390625,
+        "y": 375.566650390625,
+        "z": "1297170d.795181",
         "wires": [
             [
-                "aaf25071.bda21"
+                "b78fba66.45bc"
             ]
         ]
     },
     {
-        "id": "3e8ccd3.e3636b2",
+        "id": "b8c276c9.6b5808",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 755.5666656494141,
-        "y": 269.566650390625,
-        "z": "b88832a3.96c4c8",
+        "x": 868.566650390625,
+        "y": 302.566650390625,
+        "z": "1297170d.795181",
         "wires": [
             [
-                "4699eb86.540554",
-                "9d09c472.dc19b",
-                "99a9316.f88035"
+                "d0a8aff8.6a4e",
+                "7caf8b3a.4b81c4",
+                "b78fba66.45bc"
             ]
         ]
     },
     {
-        "id": "991df3c2.230cc8",
+        "id": "d0d01c1c.340638",
         "type": "save",
         "name": "update:metadata to AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource=\"service-instance\"\n key=\"service-instance.service-instance-id =  $rcvd-service-instance-id\n AND customer.global-customer-id = 'IBNCustomer' \n AND service-subscription.service-type = 'IBN'\n AND metadatum.metaname = $rcvd-etht-svc-end-point\"  force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"metaname\" value=\"`$rcvd-etht-svc-end-point`\" />\n    <parameter name=\"metaval\" value=\"`$rcvd-bandwidth-value`\" />\n\n    \n<!--AND metadatum.metaname = $rcvd-etht-svc-end-point-->\n\n<!--<parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />-->\n<!--    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$rcvd-bandwidth-value`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 1276.566650390625,
-        "y": 716.566650390625,
-        "z": "b88832a3.96c4c8",
+        "x": 1376.566650390625,
+        "y": 1670.5667114257812,
+        "z": "1297170d.795181",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "5c598e9b.b62af",
+        "type": "set",
+        "name": "unset found-connectivity",
+        "xml": "<set>\n<parameter name='found-connectivity' value=\"false\" />\n",
+        "comments": "",
+        "x": 1435.32861328125,
+        "y": 629.7000427246094,
+        "z": "1297170d.795181",
+        "wires": []
+    },
+    {
+        "id": "37760266.d3d3ae",
+        "type": "set",
+        "name": "unset tmp.the-connectivity.",
+        "xml": "<set>\n<parameter name='tmp.the-connectivity.' value=\"\" />\n<parameter name='rcvd-service-instance-id' value=\"\" />\n\n",
+        "comments": "",
+        "x": 1439.32861328125,
+        "y": 673.7000427246094,
+        "z": "1297170d.795181",
+        "wires": []
+    },
+    {
+        "id": "2fac2d00.57aa3c",
+        "type": "set",
+        "name": "unset tmp.aai.helper-all-connectivities",
+        "xml": "<set>\n<parameter name='tmp.aai.helper-all-connectivities.' value=\"\" />\n",
+        "comments": "",
+        "x": 1465.4452819824219,
+        "y": 725.8167114257812,
+        "z": "1297170d.795181",
+        "wires": []
+    },
+    {
+        "id": "42d1ed51.356a24",
+        "type": "save",
+        "name": "get all-connectivities from aai",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivities\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/connectivities/'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.helper-all-connectivities\" >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1444.32861328125,
+        "y": 795.7000122070312,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "91d95ba7.5b6a5",
+                "66587b64.a556dc",
+                "f0329270.34fa9"
+            ]
+        ]
+    },
+    {
+        "id": "91d95ba7.5b6a5",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1688.32861328125,
+        "y": 755.7000122070312,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "b46551be.df8e48"
+            ]
+        ]
+    },
+    {
+        "id": "66587b64.a556dc",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1685.819580078125,
+        "y": 805.2740478515625,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "ec8cd128.829bb"
+            ]
+        ]
+    },
+    {
+        "id": "f0329270.34fa9",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1683.32861328125,
+        "y": 847.7000122070312,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "544f09f5.696cc"
+            ]
+        ]
+    },
+    {
+        "id": "b46551be.df8e48",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1836.32861328125,
+        "y": 756.7000122070312,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "fc401d85.92bf5"
+            ]
+        ]
+    },
+    {
+        "id": "ec8cd128.829bb",
+        "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.l3vpn.pe1_id`\" />\n\n",
+        "comments": "",
+        "x": 1835.3909912109375,
+        "y": 805.5597839355469,
+        "z": "1297170d.795181",
+        "wires": []
+    },
+    {
+        "id": "544f09f5.696cc",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 1834.32861328125,
+        "y": 844.7000122070312,
+        "z": "1297170d.795181",
+        "wires": []
+    },
+    {
+        "id": "fc401d85.92bf5",
+        "type": "for",
+        "name": "for helpconnidx in all-connectivities",
+        "xml": "<for index='helpconnidx' start='0' end='`$tmp.aai.helper-all-connectivities.connectivity_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2083.32861328125,
+        "y": 751.7000122070312,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "a3100fb9.0a3768"
+            ]
+        ]
+    },
+    {
+        "id": "a3100fb9.0a3768",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1954.3285827636719,
+        "y": 928.7000122070312,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "6c4f8450.a757d4",
+                "a5b08b75.86894"
+            ]
+        ]
+    },
+    {
+        "id": "6c4f8450.a757d4",
+        "type": "record",
+        "name": "record etht-svc-name",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].etht-svc-name`\"/>\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2191.445281982422,
+        "y": 868.8166809082031,
+        "z": "1297170d.795181",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a5b08b75.86894",
+        "type": "switchNode",
+        "name": "etht-svc-name == rcvd-etht-service-name",
+        "xml": "<switch test='`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].etht-svc-name == $rcvd-etht-service-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2240.4453125,
+        "y": 938.816650390625,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "4e31600b.c4823",
+                "edffa6bf.c5435"
+            ]
+        ]
+    },
+    {
+        "id": "4e31600b.c4823",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2508.4453125,
+        "y": 938.816650390625,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "7cc358d8.409bd8"
+            ]
+        ]
+    },
+    {
+        "id": "edffa6bf.c5435",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2509.4453125,
+        "y": 870.816650390625,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "2cc21558.382a3a"
+            ]
+        ]
+    },
+    {
+        "id": "7cc358d8.409bd8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2647.4453125,
+        "y": 939.816650390625,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "4c07e718.df3c38"
+            ]
+        ]
+    },
+    {
+        "id": "2cc21558.382a3a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2641.4453125,
+        "y": 871.816650390625,
+        "z": "1297170d.795181",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4c07e718.df3c38",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].relationship-list.relationship_length`' >\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2107.433349609375,
+        "y": 1079.36669921875,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "30fe2155.4a5bfe"
+            ]
+        ]
+    },
+    {
+        "id": "30fe2155.4a5bfe",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].relationship-list.relationship[$cridx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2312.433349609375,
+        "y": 1079.36669921875,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "792670ef.d99f98"
+            ]
+        ]
+    },
+    {
+        "id": "792670ef.d99f98",
+        "type": "outcome",
+        "name": "service-instance",
+        "xml": "<outcome value='service-instance'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2098.433349609375,
+        "y": 1159.3666381835938,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "ec346262.1c551"
+            ]
+        ]
+    },
+    {
+        "id": "ec346262.1c551",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2292.433349609375,
+        "y": 1159.3666381835938,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "ff9fc9aa.5404c",
+                "5e27e0e2.a6b098"
+            ]
+        ]
+    },
+    {
+        "id": "ff9fc9aa.5404c",
+        "type": "set",
+        "name": "set rcvd-service-instance-id",
+        "xml": "<set>\n<parameter name='rcvd-service-instance-id' value=\"`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].relationship-list.relationship[$cridx].relationship-data[2].relationship-value`\" />\n",
+        "comments": "",
+        "x": 2536.433349609375,
+        "y": 1159.7664794921875,
+        "z": "1297170d.795181",
+        "wires": []
+    },
+    {
+        "id": "5e27e0e2.a6b098",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 2478.566650390625,
+        "y": 1217.566650390625,
+        "z": "1297170d.795181",
+        "wires": []
+    },
+    {
+        "id": "885bab91.42dd48",
+        "type": "save",
+        "name": "get metadatum from aai",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"metadatum\"\n\tkey=\"service-instance.service-instance-id =  $rcvd-service-instance-id\n        AND customer.global-customer-id = 'IBNCustomer' \n        AND service-subscription.service-type = 'IBN'\n        AND metadatum.metaname = $rcvd-etht-svc-end-point\"\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance.metadatum\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1396.566650390625,
+        "y": 1345.7666015625,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "f3457bba.eedaa",
+                "a05f96d7.2fad8",
+                "9091c907.baaed8"
+            ]
+        ]
+    },
+    {
+        "id": "f3457bba.eedaa",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1441.566650390625,
+        "y": 1265.7666015625,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "cdad1618.9a3e28"
+            ]
+        ]
+    },
+    {
+        "id": "a05f96d7.2fad8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1600.0576171875,
+        "y": 1330.340576171875,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "5dcd64be.8c4a84"
+            ]
+        ]
+    },
+    {
+        "id": "9091c907.baaed8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1597.566650390625,
+        "y": 1372.7666015625,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "6bbde9c8.acec98"
+            ]
+        ]
+    },
+    {
+        "id": "55675509.568934",
+        "type": "switchNode",
+        "name": "switch metadatum.metaval == null",
+        "xml": "<switch test=\"`length($tmp.aai.service-instance.metadatum.metaval) == 0`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1804.566650390625,
+        "y": 1282.36669921875,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "953fe683.244f4",
+                "2d96a9.89c58158"
+            ]
+        ]
+    },
+    {
+        "id": "953fe683.244f4",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2015.566650390625,
+        "y": 1282.36669921875,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "c9532733.72bdb"
+            ]
+        ]
+    },
+    {
+        "id": "c9532733.72bdb",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2154.566650390625,
+        "y": 1283.36669921875,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "d89dc0f.27948c",
+                "56d21a80.90cca4",
+                "82529f4f.027098"
+            ]
+        ]
+    },
+    {
+        "id": "754e20ae.34eb5",
+        "type": "set",
+        "name": "unset tmp.metavalue parameters",
+        "xml": "<set>\n<parameter name='tmp.metavalue' value='' />\n",
+        "comments": "",
+        "x": 1421.566650390625,
+        "y": 1183.36669921875,
+        "z": "1297170d.795181",
+        "wires": []
+    },
+    {
+        "id": "d89dc0f.27948c",
+        "type": "set",
+        "name": "set tmp.metavalue initial value",
+        "xml": "<set>\n<parameter name='tmp.metavalue' value='2000000' />\n",
+        "comments": "",
+        "x": 2371.566650390625,
+        "y": 1283.36669921875,
+        "z": "1297170d.795181",
+        "wires": []
+    },
+    {
+        "id": "2d96a9.89c58158",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1995.5667724609375,
+        "y": 1551.3667602539062,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "e72bfb1a.57d1f8"
+            ]
+        ]
+    },
+    {
+        "id": "e72bfb1a.57d1f8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2128.5670166015625,
+        "y": 1551.3667602539062,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "41de4c18.37870c",
+                "194bf97a.eaa36f",
+                "adfbd81e.574f1"
+            ]
+        ]
+    },
+    {
+        "id": "41de4c18.37870c",
+        "type": "set",
+        "name": "set tmp.metavalue",
+        "xml": "<set>\n<parameter name='tmp.metavalue' value='`$tmp.aai.service-instance.metadatum.metaval + 500000`' />\n",
+        "comments": "",
+        "x": 2323.5670166015625,
+        "y": 1496.36669921875,
+        "z": "1297170d.795181",
+        "wires": []
+    },
+    {
+        "id": "56d21a80.90cca4",
+        "type": "record",
+        "name": "record tmp.metavalue",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$tmp.metavalue`\"/>\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2343.566650390625,
+        "y": 1330.9666748046875,
+        "z": "1297170d.795181",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "194bf97a.eaa36f",
+        "type": "record",
+        "name": "record tmp.metavalue",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$tmp.metavalue`\"/>\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2333.600341796875,
+        "y": 1548.1668701171875,
+        "z": "1297170d.795181",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "82529f4f.027098",
+        "type": "save",
+        "name": "save:metadata to AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id =  $rcvd-service-instance-id\n AND customer.global-customer-id = 'IBNCustomer' \n AND service-subscription.service-type = 'IBN'\"  force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />\n    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$tmp.metavalue`\" />\n\n    \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2351.60009765625,
+        "y": 1381.166748046875,
+        "z": "1297170d.795181",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "adfbd81e.574f1",
+        "type": "save",
+        "name": "update:metadata to AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource=\"service-instance\"\n key=\"service-instance.service-instance-id =  $rcvd-service-instance-id\n AND customer.global-customer-id = 'IBNCustomer' \n AND service-subscription.service-type = 'IBN'\n AND metadatum.metaname = $rcvd-etht-svc-end-point\"  force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"metaname\" value=\"`$rcvd-etht-svc-end-point`\" />\n    <parameter name=\"metaval\" value=\"`$tmp.metavalue`\" />\n\n    \n<!--AND metadatum.metaname = $rcvd-etht-svc-end-point-->\n\n<!--<parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />-->\n<!--    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$rcvd-bandwidth-value`\" />-->",
+        "comments": "",
+        "outputs": 1,
+        "x": 2335.6002197265625,
+        "y": 1617.166748046875,
+        "z": "1297170d.795181",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5dcd64be.8c4a84",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2162,
+        "y": 1815.7667236328125,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "cb2e10fc.e4ef48",
+                "8e3d62dc.9e0f88",
+                "46872528.f533dc"
+            ]
+        ]
+    },
+    {
+        "id": "cb2e10fc.e4ef48",
+        "type": "set",
+        "name": "set tmp.metavalue initial value",
+        "xml": "<set>\n<parameter name='tmp.metavalue' value='2000000' />\n",
+        "comments": "",
+        "x": 2379,
+        "y": 1815.7667236328125,
+        "z": "1297170d.795181",
+        "wires": []
+    },
+    {
+        "id": "8e3d62dc.9e0f88",
+        "type": "record",
+        "name": "record tmp.metavalue",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$tmp.metavalue`\"/>\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2351,
+        "y": 1863.36669921875,
+        "z": "1297170d.795181",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "46872528.f533dc",
+        "type": "save",
+        "name": "save:metadata to AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id =  $rcvd-service-instance-id\n AND customer.global-customer-id = 'IBNCustomer' \n AND service-subscription.service-type = 'IBN'\"  force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />\n    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$tmp.metavalue`\" />\n\n    \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2359.033447265625,
+        "y": 1913.5667724609375,
+        "z": "1297170d.795181",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6bbde9c8.acec98",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2179,
+        "y": 2018.7667236328125,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "b9300e96.1857d8",
+                "5870b980.decd2",
+                "93cd30c0.6be678"
+            ]
+        ]
+    },
+    {
+        "id": "b9300e96.1857d8",
+        "type": "set",
+        "name": "set tmp.metavalue initial value",
+        "xml": "<set>\n<parameter name='tmp.metavalue' value='2000000' />\n",
+        "comments": "",
+        "x": 2396,
+        "y": 2018.7667236328125,
+        "z": "1297170d.795181",
+        "wires": []
+    },
+    {
+        "id": "5870b980.decd2",
+        "type": "record",
+        "name": "record tmp.metavalue",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$tmp.metavalue`\"/>\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2368,
+        "y": 2066.36669921875,
+        "z": "1297170d.795181",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "93cd30c0.6be678",
+        "type": "save",
+        "name": "save:metadata to AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id =  $rcvd-service-instance-id\n AND customer.global-customer-id = 'IBNCustomer' \n AND service-subscription.service-type = 'IBN'\"  force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />\n    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$tmp.metavalue`\" />\n\n    \n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2376.033447265625,
+        "y": 2116.5667724609375,
+        "z": "1297170d.795181",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1c76f23b.e9a096",
+        "type": "record",
+        "name": "record tmp.metavalue",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$tmp.aai.service-instance.metadatum.metaval`\"/>\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1783.0999755859375,
+        "y": 1229.566650390625,
+        "z": "1297170d.795181",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cdad1618.9a3e28",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1585.0999755859375,
+        "y": 1262.566650390625,
+        "z": "1297170d.795181",
+        "wires": [
+            [
+                "1c76f23b.e9a096",
+                "55675509.568934"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.json b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.json
index 4c24b917..71f53273 100644
--- a/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.json
@@ -1,38 +1,38 @@
 [
     {
-        "id": "1f49a1e2.d37fce",
+        "id": "6e96a925.2c4178",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1823.566650390625,
-        "y": 439.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 1846.5,
+        "y": 345.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "1fcd10a0.78eacf",
-                "af997914.ad5bb",
-                "df414e18.a198"
+                "26063c6f.5592ac",
+                "b31bac0a.907788",
+                "d9da94be.48bb38"
             ]
         ]
     },
     {
-        "id": "bf5bb76d.137da8",
+        "id": "d703ae31.26417",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 113.566650390625,
-        "y": 191.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 136.5,
+        "y": 97.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "b3126319.e564d"
+                "f1e4dc82.5274e"
             ]
         ]
     },
     {
-        "id": "b3126319.e564d",
+        "id": "f1e4dc82.5274e",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -40,933 +40,1065 @@
         "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": 244.8523406982422,
-        "y": 241.23809337615967,
-        "z": "d636c085.d73a1",
+        "x": 267.7856903076172,
+        "y": 146.80475902557373,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "21b7d070.b838c"
+                "f3ec2c51.edecf"
             ]
         ]
     },
     {
-        "id": "21b7d070.b838c",
+        "id": "f3ec2c51.edecf",
         "type": "method",
         "name": "method p2p-vnf-topology-operation-p2p-delete",
         "xml": "<method rpc='p2p-vnf-topology-operation-p2p-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 247.99526977539062,
-        "y": 326.0000171661377,
-        "z": "d636c085.d73a1",
+        "x": 270.9286193847656,
+        "y": 231.56668281555176,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "25a34ff7.c51178"
+                "bef36a25.7f3368"
             ]
         ]
     },
     {
-        "id": "25a34ff7.c51178",
+        "id": "bef36a25.7f3368",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 397.8046875,
-        "y": 455.66664123535156,
-        "z": "d636c085.d73a1",
+        "x": 420.738037109375,
+        "y": 361.2333068847656,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "bc193176.895b3",
-                "9155a503.b6cfd",
-                "73cdc1fc.bb1028"
+                "a1f25c26.099408",
+                "d3e0b100.653268",
+                "445ed765.aced3"
             ]
         ]
     },
     {
-        "id": "bc193176.895b3",
+        "id": "a1f25c26.099408",
         "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": 694.1383056640625,
-        "y": 732.5971527099609,
-        "z": "d636c085.d73a1",
+        "x": 717.0716552734375,
+        "y": 638.163818359375,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "9155a503.b6cfd",
+        "id": "d3e0b100.653268",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n    \n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 745.566650390625,
-        "y": 502.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 768.5,
+        "y": 408.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "943d66a1.464c58",
-                "67ba5020.7d7dc8",
-                "6580f4fc.25d5b4"
+                "41386d04.6db6b4",
+                "ee2334d5.f5dd08",
+                "3055412e.0ce5fe"
             ]
         ]
     },
     {
-        "id": "943d66a1.464c58",
+        "id": "41386d04.6db6b4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 964.566650390625,
-        "y": 440.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 987.5,
+        "y": 346.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "7c9fba64.f3390c"
+                "6b5adfd0.03c4c8"
             ]
         ]
     },
     {
-        "id": "67ba5020.7d7dc8",
+        "id": "ee2334d5.f5dd08",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 974.0576171875,
-        "y": 483.5740203857422,
-        "z": "d636c085.d73a1",
+        "x": 996.990966796875,
+        "y": 389.14068603515625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "cebe0efe.964978"
+                "36a79df8.93324a"
             ]
         ]
     },
     {
-        "id": "6580f4fc.25d5b4",
+        "id": "3055412e.0ce5fe",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 962.566650390625,
-        "y": 529.9999847412109,
-        "z": "d636c085.d73a1",
+        "x": 985.5,
+        "y": 435.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "cd9120ae.e9db68"
+                "9ff1dfad.77f908"
             ]
         ]
     },
     {
-        "id": "cebe0efe.964978",
+        "id": "36a79df8.93324a",
         "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.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1127.6290283203125,
-        "y": 486.85975646972656,
-        "z": "d636c085.d73a1",
+        "x": 1150.5623779296875,
+        "y": 392.4264221191406,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "cd9120ae.e9db68",
+        "id": "9ff1dfad.77f908",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1131.566650390625,
-        "y": 530.9999847412109,
-        "z": "d636c085.d73a1",
+        "x": 1154.5,
+        "y": 436.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "7c9fba64.f3390c",
+        "id": "6b5adfd0.03c4c8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1161.566650390625,
-        "y": 436.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 1184.5,
+        "y": 342.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "57fd8c7c.534adc"
+                "1d33401f.89cbf8"
             ]
         ]
     },
     {
-        "id": "57fd8c7c.534adc",
+        "id": "1d33401f.89cbf8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1384.900146484375,
-        "y": 436.9999237060547,
-        "z": "d636c085.d73a1",
+        "x": 1407.83349609375,
+        "y": 342.56658935546875,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "a44a2c9.e47245"
+                "8ed22124.960f7"
             ]
         ]
     },
     {
-        "id": "a44a2c9.e47245",
+        "id": "8ed22124.960f7",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1585.5667839050293,
-        "y": 438.0000057220459,
-        "z": "d636c085.d73a1",
+        "x": 1608.5001335144043,
+        "y": 343.56667137145996,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "1f49a1e2.d37fce"
+                "6e96a925.2c4178"
             ]
         ]
     },
     {
-        "id": "73cdc1fc.bb1028",
+        "id": "445ed765.aced3",
         "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' />",
         "comments": "",
         "outputs": 1,
-        "x": 711.566650390625,
-        "y": 450.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 734.5,
+        "y": 356.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             []
         ]
     },
     {
-        "id": "1fcd10a0.78eacf",
+        "id": "26063c6f.5592ac",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2031.566650390625,
-        "y": 403.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 2054.5,
+        "y": 309.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "f10666fd.9fb61"
+                "b99b3267.40e088"
             ]
         ]
     },
     {
-        "id": "af997914.ad5bb",
+        "id": "b31bac0a.907788",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2032.0576171875,
-        "y": 449.5740203857422,
-        "z": "d636c085.d73a1",
+        "x": 2054.990966796875,
+        "y": 355.14068603515625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "621b676d.f2f748"
+                "32e27028.9b3a58"
             ]
         ]
     },
     {
-        "id": "df414e18.a198",
+        "id": "d9da94be.48bb38",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2029.566650390625,
-        "y": 492.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 2052.5,
+        "y": 398.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "2ffd86d2.d8ed3a"
+                "bb102594.f98758"
             ]
         ]
     },
     {
-        "id": "621b676d.f2f748",
+        "id": "32e27028.9b3a58",
         "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.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2194.6290283203125,
-        "y": 449.85975646972656,
-        "z": "d636c085.d73a1",
+        "x": 2217.5623779296875,
+        "y": 355.4264221191406,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "2ffd86d2.d8ed3a",
+        "id": "bb102594.f98758",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2198.566650390625,
-        "y": 493.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 2221.5,
+        "y": 399.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "943d4b65.0e3ed8",
+        "id": "fe08adbd.838448",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2504.566650390625,
-        "y": 492.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 2527.5,
+        "y": 398.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "e86769c3.1f7ba8",
-                "52744dfb.375364",
-                "9acb7ba.125dc08"
+                "518191ba.22ecf8",
+                "909a6e78.caa538",
+                "83b08b2b.a7cd68"
             ]
         ]
     },
     {
-        "id": "daba1f0.a622ce",
+        "id": "6abfd2f0.9bae54",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2888.566650390625,
-        "y": 492.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 2911.5,
+        "y": 398.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "5e452d03.7532ac",
-                "d53b6e96.aa8aa",
-                "518fe175.a505a8",
-                "df0df658.a887a",
-                "1a0c1f4d.51b981",
-                "67de0813.c55918"
+                "858ea86f.8f8b2",
+                "f45d1399.26724",
+                "9edac35c.3fbdf8",
+                "ae43e09b.de34e",
+                "bf21c848.7fc668",
+                "bdaf4361.9ffa5"
             ]
         ]
     },
     {
-        "id": "e86769c3.1f7ba8",
+        "id": "518191ba.22ecf8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2715.566650390625,
-        "y": 494.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 2738.5,
+        "y": 400.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "daba1f0.a622ce"
+                "6abfd2f0.9bae54"
             ]
         ]
     },
     {
-        "id": "52744dfb.375364",
+        "id": "909a6e78.caa538",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2716.0576171875,
-        "y": 540.5740203857422,
-        "z": "d636c085.d73a1",
+        "x": 2738.990966796875,
+        "y": 446.14068603515625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "cdeba8e7.bdb358"
+                "f47cc910.74818"
             ]
         ]
     },
     {
-        "id": "9acb7ba.125dc08",
+        "id": "83b08b2b.a7cd68",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2713.566650390625,
-        "y": 583.9999847412109,
-        "z": "d636c085.d73a1",
+        "x": 2736.5,
+        "y": 489.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "ba8b118c.cfdf4"
+                "efa4a882.4faaa"
             ]
         ]
     },
     {
-        "id": "ba8b118c.cfdf4",
+        "id": "efa4a882.4faaa",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2880.566650390625,
-        "y": 582.9999847412109,
-        "z": "d636c085.d73a1",
+        "x": 2903.5,
+        "y": 488.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "cdeba8e7.bdb358",
+        "id": "f47cc910.74818",
         "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.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2878.6290283203125,
-        "y": 540.8597564697266,
-        "z": "d636c085.d73a1",
+        "x": 2901.5623779296875,
+        "y": 446.4264221191406,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "f10666fd.9fb61",
+        "id": "b99b3267.40e088",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2232.566650390625,
-        "y": 398.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 2255.5,
+        "y": 304.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "ad67608d.23d4e"
+                "39ac0477.da72d4"
             ]
         ]
     },
     {
-        "id": "ad67608d.23d4e",
+        "id": "39ac0477.da72d4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2437.566650390625,
-        "y": 398.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 2460.5,
+        "y": 304.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "3a1dfd90.21e892"
+                "bc9718fc.ebe1a8"
             ]
         ]
     },
     {
-        "id": "3a1dfd90.21e892",
+        "id": "bc9718fc.ebe1a8",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2603.566650390625,
-        "y": 398.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 2626.5,
+        "y": 304.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "d3885a9d.410b8"
+                "c242c1a1.bac65"
             ]
         ]
     },
     {
-        "id": "d3885a9d.410b8",
+        "id": "c242c1a1.bac65",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2766.566650390625,
-        "y": 398.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 2789.5,
+        "y": 304.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "943d4b65.0e3ed8"
+                "fe08adbd.838448"
             ]
         ]
     },
     {
-        "id": "5e452d03.7532ac",
+        "id": "858ea86f.8f8b2",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 3103.566650390625,
-        "y": 202.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 3126.5,
+        "y": 108.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "d53b6e96.aa8aa",
+        "id": "f45d1399.26724",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3129.566650390625,
-        "y": 319.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 3152.5,
+        "y": 225.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "f7dcf778.7bdca8",
-                "b91a9a3e.7f6078",
-                "2aa7aeb.8d97cd2"
+                "66fa653a.3a03b4",
+                "b78eabee.b89e08",
+                "ae7f2d3f.30154"
             ]
         ]
     },
     {
-        "id": "f7dcf778.7bdca8",
+        "id": "66fa653a.3a03b4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3325.0667724609375,
-        "y": 271.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 3348.0001220703125,
+        "y": 177.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "859282ad.13c2f8"
+                "e47a4bfe.0e35c8"
             ]
         ]
     },
     {
-        "id": "b91a9a3e.7f6078",
+        "id": "b78eabee.b89e08",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3317.0667724609375,
-        "y": 326.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 3340.0001220703125,
+        "y": 232.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "6f10df6c.e42f08"
+                "2c2b9fe9.1cbcc"
             ]
         ]
     },
     {
-        "id": "859282ad.13c2f8",
+        "id": "e47a4bfe.0e35c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3469.4490966796875,
-        "y": 271.65565490722656,
-        "z": "d636c085.d73a1",
+        "x": 3492.3824462890625,
+        "y": 177.22232055664062,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "a786a7ab.e92098"
+                "44537b55.b18bec"
             ]
         ]
     },
     {
-        "id": "a786a7ab.e92098",
+        "id": "44537b55.b18bec",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3653.566650390625,
-        "y": 269.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 3676.5,
+        "y": 175.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "7f3accce.b227c4"
+                "61148fe4.7322b8"
             ]
         ]
     },
     {
-        "id": "7f3accce.b227c4",
+        "id": "61148fe4.7322b8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3848.566650390625,
-        "y": 269.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 3871.5,
+        "y": 175.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "19e0629f.42ef95"
+                "893d9d4c.c96c6"
             ]
         ]
     },
     {
-        "id": "2aa7aeb.8d97cd2",
+        "id": "ae7f2d3f.30154",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3322.0667724609375,
-        "y": 383.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 3345.0001220703125,
+        "y": 289.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "1ba67878.91583"
+                "78cfd6a8.473698"
             ]
         ]
     },
     {
-        "id": "1ba67878.91583",
+        "id": "78cfd6a8.473698",
         "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": 3474.0667724609375,
-        "y": 384.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 3497.0001220703125,
+        "y": 290.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "6f10df6c.e42f08",
+        "id": "2c2b9fe9.1cbcc",
         "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": 3485.0667724609375,
-        "y": 327.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 3508.0001220703125,
+        "y": 233.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "15438b5f.4f2f6d",
+        "id": "15db0dbc.7e7b22",
         "type": "execute",
         "name": "get 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.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4436.566650390625,
-        "y": 286.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 4459.5,
+        "y": 192.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "297b9c32.2d4884",
-                "7eedc05d.0fcd8",
-                "3b0dcd14.e168c2"
+                "69c85308.191e6c",
+                "42ec7d92.8ab2bc",
+                "4dec231f.a3f764"
             ]
         ]
     },
     {
-        "id": "e30d1b98.1b734",
+        "id": "de29e4c2.53e5f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4230.566650390625,
-        "y": 273.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 4253.5,
+        "y": 179.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "58f742d9.00369c",
-                "15438b5f.4f2f6d",
-                "fad5fc58.bb076"
+                "27169001.6118d8",
+                "15db0dbc.7e7b22",
+                "24546bfc.7b89e4"
             ]
         ]
     },
     {
-        "id": "58f742d9.00369c",
+        "id": "27169001.6118d8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4466.566650390625,
-        "y": 234.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 4489.5,
+        "y": 140.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "297b9c32.2d4884",
+        "id": "69c85308.191e6c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4646.566650390625,
-        "y": 277.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 4669.5,
+        "y": 183.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "c10ae523.198538"
+                "35125c7c.21ee0c"
             ]
         ]
     },
     {
-        "id": "7eedc05d.0fcd8",
+        "id": "42ec7d92.8ab2bc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4638.566650390625,
-        "y": 332.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 4661.5,
+        "y": 238.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "dce2b694.d3656"
+                "669042e.d3e06bc"
             ]
         ]
     },
     {
-        "id": "3b0dcd14.e168c2",
+        "id": "4dec231f.a3f764",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4643.566650390625,
-        "y": 389.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 4666.5,
+        "y": 295.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "8ca6611c.54635"
+                "c46cafe4.51d85"
             ]
         ]
     },
     {
-        "id": "8ca6611c.54635",
+        "id": "c46cafe4.51d85",
         "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": 4795.566650390625,
-        "y": 390.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 4818.5,
+        "y": 296.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "dce2b694.d3656",
+        "id": "669042e.d3e06bc",
         "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": 4806.566650390625,
-        "y": 335.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 4829.5,
+        "y": 241.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "c10ae523.198538",
+        "id": "35125c7c.21ee0c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4790.948974609375,
-        "y": 275.65565490722656,
-        "z": "d636c085.d73a1",
+        "x": 4813.88232421875,
+        "y": 181.22232055664062,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "e4f0bb63.5bbd98"
+                "1743c2a1.936e0d"
             ]
         ]
     },
     {
-        "id": "19e0629f.42ef95",
+        "id": "893d9d4c.c96c6",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4051.566650390625,
-        "y": 273.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 4074.5,
+        "y": 179.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "e30d1b98.1b734"
+                "de29e4c2.53e5f8"
             ]
         ]
     },
     {
-        "id": "e4f0bb63.5bbd98",
+        "id": "1743c2a1.936e0d",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.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",
         "comments": "",
-        "x": 5005.566650390625,
-        "y": 271.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 5028.5,
+        "y": 177.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "fad5fc58.bb076",
+        "id": "24546bfc.7b89e4",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4386.566650390625,
-        "y": 350.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 4409.5,
+        "y": 256.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "67de0813.c55918",
+        "id": "bdaf4361.9ffa5",
         "type": "set",
         "name": "set attachment_param for TN NSSSI deleteion in PNC",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
-        "x": 3229.566650390625,
-        "y": 492.99998474121094,
-        "z": "d636c085.d73a1",
+        "x": 3252.5,
+        "y": 398.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": []
     },
     {
-        "id": "518fe175.a505a8",
+        "id": "9edac35c.3fbdf8",
         "type": "save",
         "name": "delete connectivity resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3169.5667724609375,
-        "y": 1148.9999237060547,
-        "z": "d636c085.d73a1",
+        "x": 3190.5,
+        "y": 1330.5665893554688,
+        "z": "fc139fb9.dc168",
         "wires": [
             []
         ]
     },
     {
-        "id": "df0df658.a887a",
+        "id": "ae43e09b.de34e",
         "type": "save",
         "name": "delete vpn-binding resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3165.5667724609375,
-        "y": 1192.9999237060547,
-        "z": "d636c085.d73a1",
+        "x": 3186.5,
+        "y": 1374.5665893554688,
+        "z": "fc139fb9.dc168",
         "wires": [
             []
         ]
     },
     {
-        "id": "1a0c1f4d.51b981",
+        "id": "bf21c848.7fc668",
         "type": "switchNode",
         "name": "switch connectivity has ethernet service",
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3188.566650390625,
-        "y": 808.9999847412109,
-        "z": "d636c085.d73a1",
+        "x": 3211.5,
+        "y": 714.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "e3688e85.c3b",
-                "622706a9.cb2ed8"
+                "59c18f55.2a2ad",
+                "401bd02c.538578"
             ]
         ]
     },
     {
-        "id": "622706a9.cb2ed8",
+        "id": "401bd02c.538578",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3426.566650390625,
-        "y": 791.9999847412109,
-        "z": "d636c085.d73a1",
+        "x": 3449.5,
+        "y": 697.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "ab255dec.d38548"
+                "d514777.51de608"
             ]
         ]
     },
     {
-        "id": "e3688e85.c3b",
+        "id": "59c18f55.2a2ad",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3438.566650390625,
-        "y": 858.9999847412109,
-        "z": "d636c085.d73a1",
+        "x": 3461.5,
+        "y": 764.566650390625,
+        "z": "fc139fb9.dc168",
         "wires": [
             []
         ]
     },
     {
-        "id": "ab255dec.d38548",
+        "id": "d514777.51de608",
         "type": "execute",
         "name": "execute RestApiCallNode Delete ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.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",
         "comments": "",
         "outputs": 1,
-        "x": 3801.900146484375,
-        "y": 781.6000213623047,
-        "z": "d636c085.d73a1",
+        "x": 3824.83349609375,
+        "y": 687.1666870117188,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "63e51e3.aa5156",
-                "5038fd41.e83c2c"
+                "6aebfb3b.efd44c",
+                "933385e0.d5a7b8"
             ]
         ]
     },
     {
-        "id": "63e51e3.aa5156",
+        "id": "6aebfb3b.efd44c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4145.666748046875,
-        "y": 756.6000213623047,
-        "z": "d636c085.d73a1",
+        "x": 4168.60009765625,
+        "y": 662.1666870117188,
+        "z": "fc139fb9.dc168",
         "wires": [
             []
         ]
     },
     {
-        "id": "5038fd41.e83c2c",
+        "id": "933385e0.d5a7b8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4146.666961669922,
-        "y": 807.5999307632446,
-        "z": "d636c085.d73a1",
+        "x": 4169.600311279297,
+        "y": 713.1665964126587,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "3bc9737b.ab47c4"
+                "91477113.19bf5"
             ]
         ]
     },
     {
-        "id": "3bc9737b.ab47c4",
+        "id": "91477113.19bf5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4291.694007873535,
-        "y": 805.3454160690308,
-        "z": "d636c085.d73a1",
+        "x": 4314.62735748291,
+        "y": 710.9120817184448,
+        "z": "fc139fb9.dc168",
         "wires": [
             [
-                "cda2227f.a4536"
+                "1a438ee3.1dcae1"
             ]
         ]
     },
     {
-        "id": "cda2227f.a4536",
+        "id": "2d036a80.ec4f6e",
         "type": "execute",
         "name": "execute Terminate Periodic Pull Connection",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.PeriodicDiscoveryNode' method='deleteSubscription' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />-->\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"p2p-vnf-topology-operation-p2p-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4563.933837890625,
-        "y": 812.566650390625,
-        "z": "d636c085.d73a1",
+        "x": 5689.8671875,
+        "y": 924.1332702636719,
+        "z": "fc139fb9.dc168",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1a438ee3.1dcae1",
+        "type": "switchNode",
+        "name": "switch length(vpn-binding.dst-access-ltp) == 0",
+        "xml": "<switch test=\"`length($tmp.aai.vpn-binding.dst-access-ltp-id) == 0`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4518.632568359375,
+        "y": 837.9666748046875,
+        "z": "fc139fb9.dc168",
+        "wires": [
+            [
+                "59c592c9.d7994c",
+                "7b7ded64.3b4eb4"
+            ]
+        ]
+    },
+    {
+        "id": "86b6e124.aff368",
+        "type": "switchNode",
+        "name": "switch length(vpn-binding.src-access-ltp) == 0",
+        "xml": "<switch test=\"`length($tmp.aai.vpn-binding.src-access-ltp-id) == 0`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5025.632568359375,
+        "y": 826.9664611816406,
+        "z": "fc139fb9.dc168",
+        "wires": [
+            [
+                "9a1a7af4.6ee1b",
+                "c570c72b.fde4f8"
+            ]
+        ]
+    },
+    {
+        "id": "4d979945.b240f8",
+        "type": "comment",
+        "name": "only dst ttp exists. No src",
+        "info": "",
+        "comments": "",
+        "x": 5283.6328125,
+        "y": 715.9664001464844,
+        "z": "fc139fb9.dc168",
+        "wires": []
+    },
+    {
+        "id": "ab52cc8a.9b36f",
+        "type": "comment",
+        "name": "both src and dst exist",
+        "info": "",
+        "comments": "",
+        "x": 5290.6328125,
+        "y": 877.9664001464844,
+        "z": "fc139fb9.dc168",
+        "wires": []
+    },
+    {
+        "id": "71f0c8c6.7df048",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5412.6328125,
+        "y": 923.9664611816406,
+        "z": "fc139fb9.dc168",
+        "wires": [
+            [
+                "2d036a80.ec4f6e"
+            ]
+        ]
+    },
+    {
+        "id": "59c592c9.d7994c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4780.566665649414,
+        "y": 894.5666656494141,
+        "z": "fc139fb9.dc168",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7b7ded64.3b4eb4",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4778.566665649414,
+        "y": 799.5666656494141,
+        "z": "fc139fb9.dc168",
+        "wires": [
+            [
+                "86b6e124.aff368"
+            ]
+        ]
+    },
+    {
+        "id": "c570c72b.fde4f8",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5247.7998046875,
+        "y": 925.36669921875,
+        "z": "fc139fb9.dc168",
+        "wires": [
+            [
+                "71f0c8c6.7df048"
+            ]
+        ]
+    },
+    {
+        "id": "9a1a7af4.6ee1b",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5269.7998046875,
+        "y": 767.36669921875,
+        "z": "fc139fb9.dc168",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-callbackdg-notification.xml b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-callbackdg-notification.xml
index e3d1c939..4a117b4c 100644
--- a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-callbackdg-notification.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-callbackdg-notification.xml
@@ -13,67 +13,211 @@
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
                 <parameter name='contextPrefix' value='prop' />
             </execute>
-            <switch test="`$push-change-update.datastore-changes.type == 'update' `">
-                <outcome value='true'>
-                    <block atomic="true">
-                        <set>
-                            <!--<parameter name='rcvdNotif' value='`$notifvalue`' />-->
-                            <parameter name='rcvd-etht-svc-end-point' value='`$push-change-update.datastore-changes.payload.parameter-value[0].etht-svc-end-point`' />
-                            <parameter name='rcvd-subscription-id' value='`$push-change-update.subscription-id`' />
-                            <parameter name='rcvd-bandwidth-value' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value`' />
-                            <parameter name='rcvd-service-instance-id' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value-description`' />
-                        </set>
-                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource="service-instance:metadata"
+            <block atomic="true">
+                <set>
+                    <parameter name='rcvd-etht-svc-end-point' value='`$performance-monitoring.service-pm[0].service-pm-state.performance-data[3].parameter-value[0].index`' />
+                    <!--<parameter name='rcvd-subscription-id' value='`$push-change-update.subscription-id`' />-->
+                    <parameter name='rcvd-bandwidth-value' value='`$performance-monitoring.service-pm[0].service-pm-state.performance-data[3].parameter-value[0].value`' />
+                    <parameter name='rcvd-etht-service-name' value='`$performance-monitoring.service-pm[0].service-name`' />
+                </set>
+                <set>
+                    <parameter name='found-connectivity' value="false" />
+                </set>
+                <set>
+                    <parameter name='tmp.the-connectivity.' value="" />
+                    <parameter name='rcvd-service-instance-id' value="" />
+                </set>
+                <set>
+                    <parameter name='tmp.aai.helper-all-connectivities.' value="" />
+                </set>
+                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                              resource="connectivities"
+                              key="selflink = 'https://aai.onap:8443/aai/v24/network/connectivities/'"
+                              local-only="false"
+                              pfx="tmp.aai.helper-all-connectivities" >
+                    <outcome value='success'>
+                        <block atomic="true">
+                            <for index='helpconnidx' start='0' end='`$tmp.aai.helper-all-connectivities.connectivity_length`' >
+                                <block atomic='true'>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                        <parameter name="logger" value="message-log" />
+                                        <parameter name="level" value="info" />
+                                        <parameter name="field1" value="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].etht-svc-name`"/>
+                                    </record>
+                                    <switch test='`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].etht-svc-name == $rcvd-etht-service-name`'>
+                                        <outcome value='false'>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value='true'>
+                                            <block>
+                                                <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].relationship-list.relationship_length`' >
+                                                    <switch test='`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].relationship-list.relationship[$cridx].related-to`'>
+                                                        <outcome value='service-instance'>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name='rcvd-service-instance-id' value="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].relationship-list.relationship[$cridx].relationship-data[2].relationship-value`" />
+                                                                </set>
+                                                                <break/>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                </for>
+                                            </block>
+                                        </outcome>
+                                    </switch>
+                                </block>
+                            </for>
+                        </block>
+                    </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.l3vpn.pe1_id`" />
+                        </return>
+                    </outcome>
+                    <outcome value='failure'>
+                        <return status='failure'>
+                            <parameter name='error-code' value='' />
+                            <parameter name='error-message' value='' />
+                        </return>
+                    </outcome>
+                </get-resource>
+                <set>
+                    <parameter name='tmp.metavalue' value='' />
+                </set>
+                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                              resource="metadatum"
                               key="service-instance.service-instance-id =  $rcvd-service-instance-id
+        AND customer.global-customer-id = 'IBNCustomer'
+        AND service-subscription.service-type = 'IBN'
+        AND metadatum.metaname = $rcvd-etht-svc-end-point"
+                              local-only="false"
+                              force="true" pfx="tmp.aai.service-instance.metadatum">
+                    <outcome value='success'>
+                        <block>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                <parameter name="logger" value="message-log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="`$tmp.aai.service-instance.metadatum.metaval`"/>
+                            </record>
+                            <switch test="`length($tmp.aai.service-instance.metadatum.metaval) == 0`">
+                                <outcome value='true'>
+                                    <block>
+                                        <set>
+                                            <parameter name='tmp.metavalue' value='2000000' />
+                                        </set>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="`$tmp.metavalue`"/>
+                                        </record>
+                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource="service-instance:metadata"
+                                              key="service-instance.service-instance-id =  $rcvd-service-instance-id
  AND customer.global-customer-id = 'IBNCustomer'
  AND service-subscription.service-type = 'IBN'"  force="true" pfx="tmp.AnAI-data">
-                            <parameter name="metadata.metadatum[0].metaname" value="`$rcvd-etht-svc-end-point`" />
-                            <parameter name="metadata.metadatum[0].metaval" value="`$rcvd-bandwidth-value`" />
-                        </save>
-                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource="service-instance"
-                                key="service-instance.service-instance-id =  $rcvd-service-instance-id
+                                            <parameter name="metadata.metadatum[0].metaname" value="`$rcvd-etht-svc-end-point`" />
+                                            <parameter name="metadata.metadatum[0].metaval" value="`$tmp.metavalue`" />
+                                        </save>
+                                    </block>
+                                </outcome>
+                                <outcome value='false'>
+                                    <block>
+                                        <set>
+                                            <parameter name='tmp.metavalue' value='`$tmp.aai.service-instance.metadatum.metaval + 500000`' />
+                                        </set>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="`$tmp.metavalue`"/>
+                                        </record>
+                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource="service-instance"
+                                                key="service-instance.service-instance-id =  $rcvd-service-instance-id
  AND customer.global-customer-id = 'IBNCustomer'
  AND service-subscription.service-type = 'IBN'
  AND metadatum.metaname = $rcvd-etht-svc-end-point"  force="true" pfx="tmp.AnAI-data">
-                            <parameter name="metaname" value="`$rcvd-etht-svc-end-point`" />
-                            <parameter name="metaval" value="`$rcvd-bandwidth-value`" />
-                            <!--AND metadatum.metaname = $rcvd-etht-svc-end-point-->
-                            <!--<parameter name="metadata.metadatum[0].metaname" value="`$rcvd-etht-svc-end-point`" />-->
-                            <!--    <parameter name="metadata.metadatum[0].metaval" value="`$rcvd-bandwidth-value`" />-->
-                        </update>
-                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                            <parameter name="ctx-destination" value="eventId-uuid"/>
-                        </execute>
-                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                            <parameter name="ctx-destination" value="eventName-uuid"/>
-                        </execute>
-                        <set>
-                            <parameter name='eventIdUuid' value="`'BandwidthChanged_' + $eventId-uuid`" />
-                            <parameter name='eventNameUuid' value='`$eventName-uuid`' />
-                            <parameter name='cclId' value='`$rcvd-service-instance-id`' />
-                            <parameter name='uniId' value='`$rcvd-etht-svc-end-point`' />
-                            <parameter name='bandwidthValue' value='`$rcvd-bandwidth-value`' />
-                        </set>
-                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-call-ves.templatefile`" />
-                            <!--<parameter name="restapiUrl" value="`$prop.dcaeAddrAndPort + '/eventListener/v7'`" />-->
-                            <parameter name="restapiUrl" value="https://dcae-ves-collector:8443/eventListener/v7" />
-                            <parameter name="restapiUser" value="sample1" />
-                            <parameter name="restapiPassword" value="sample1" />
-                            <parameter name="format" value="json"/>
-                            <parameter name="httpMethod" value="post"/>
-                            <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                            <parameter name="responsePrefix" value="ves-result"/>
-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.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="disableHostVerification" value="true"/>
-                            <parameter name="ssl" value="false"/>
-                        </execute>
-                    </block>
-                </outcome>
-            </switch>
+                                            <parameter name="metaname" value="`$rcvd-etht-svc-end-point`" />
+                                            <parameter name="metaval" value="`$tmp.metavalue`" />
+                                            <!--AND metadatum.metaname = $rcvd-etht-svc-end-point-->
+                                            <!--<parameter name="metadata.metadatum[0].metaname" value="`$rcvd-etht-svc-end-point`" />-->
+                                            <!--    <parameter name="metadata.metadatum[0].metaval" value="`$rcvd-bandwidth-value`" />-->
+                                        </update>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </block>
+                    </outcome>
+                    <outcome value='not-found'>
+                        <block>
+                            <set>
+                                <parameter name='tmp.metavalue' value='2000000' />
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                <parameter name="logger" value="message-log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="`$tmp.metavalue`"/>
+                            </record>
+                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource="service-instance:metadata"
+                                  key="service-instance.service-instance-id =  $rcvd-service-instance-id
+ AND customer.global-customer-id = 'IBNCustomer'
+ AND service-subscription.service-type = 'IBN'"  force="true" pfx="tmp.AnAI-data">
+                                <parameter name="metadata.metadatum[0].metaname" value="`$rcvd-etht-svc-end-point`" />
+                                <parameter name="metadata.metadatum[0].metaval" value="`$tmp.metavalue`" />
+                            </save>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <set>
+                                <parameter name='tmp.metavalue' value='2000000' />
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                <parameter name="logger" value="message-log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="`$tmp.metavalue`"/>
+                            </record>
+                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource="service-instance:metadata"
+                                  key="service-instance.service-instance-id =  $rcvd-service-instance-id
+ AND customer.global-customer-id = 'IBNCustomer'
+ AND service-subscription.service-type = 'IBN'"  force="true" pfx="tmp.AnAI-data">
+                                <parameter name="metadata.metadatum[0].metaname" value="`$rcvd-etht-svc-end-point`" />
+                                <parameter name="metadata.metadatum[0].metaval" value="`$tmp.metavalue`" />
+                            </save>
+                        </block>
+                    </outcome>
+                </get-resource>
+                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                    <parameter name="ctx-destination" value="eventId-uuid"/>
+                </execute>
+                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                    <parameter name="ctx-destination" value="eventName-uuid"/>
+                </execute>
+                <set>
+                    <parameter name='eventIdUuid' value="`'BandwidthChanged_' + $eventId-uuid`" />
+                    <parameter name='eventNameUuid' value='`$eventName-uuid`' />
+                    <parameter name='cclId' value='`$rcvd-service-instance-id`' />
+                    <parameter name='uniId' value='`$rcvd-etht-svc-end-point`' />
+                    <!--<parameter name='bandwidthValue' value='`$rcvd-bandwidth-value`' />-->
+                    <parameter name='bandwidthValue' value='`$tmp.metavalue`' />
+                </set>
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-call-ves.templatefile`" />
+                    <!--<parameter name="restapiUrl" value="`$prop.dcaeAddrAndPort + '/eventListener/v7'`" />-->
+                    <parameter name="restapiUrl" value="https://dcae-ves-collector:8443/eventListener/v7" />
+                    <parameter name="restapiUser" value="sample1" />
+                    <parameter name="restapiPassword" value="sample1" />
+                    <parameter name="format" value="json"/>
+                    <parameter name="httpMethod" value="post"/>
+                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                    <parameter name="responsePrefix" value="ves-result"/>
+                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.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="disableHostVerification" value="true"/>
+                    <parameter name="ssl" value="false"/>
+                </execute>
+            </block>
         </block>
     </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.xml b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.xml
index 599cd075..62163093 100644
--- a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.xml
@@ -148,26 +148,38 @@
                                                                                 <outcome value='failure'></outcome>
                                                                                 <outcome value='success'>
                                                                                     <block>
-                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.PeriodicDiscoveryNode' method='deleteSubscription' >
-                                                                                            <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url`" />
-                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`" />
-                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`" />
-                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
-                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
-                                                                                            <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
-                                                                                            <parameter name="format" value="json" />
-                                                                                            <parameter name="httpMethod" value="post" />
-                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />-->
-                                                                                            <parameter name="module" value="GENERIC-RESOURCE-API" />
-                                                                                            <parameter name="rpc" value="p2p-vnf-topology-operation-p2p-callbackdg-notification" />
-                                                                                            <parameter name="version" value="`$project.version`" />
-                                                                                            <parameter name="mode" value="sync" />
-                                                                                            <parameter name="responsePrefix" value="restapi-result"/>
-                                                                                        </execute>
+                                                                                        <switch test="`length($tmp.aai.vpn-binding.dst-access-ltp-id) == 0`">
+                                                                                            <outcome value='false'>
+                                                                                                <switch test="`length($tmp.aai.vpn-binding.src-access-ltp-id) == 0`">
+                                                                                                    <outcome value='true'></outcome>
+                                                                                                    <outcome value='false'>
+                                                                                                        <block atomic="true">
+                                                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.PeriodicDiscoveryNode' method='deleteSubscription' >
+                                                                                                                <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url`" />
+                                                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`" />
+                                                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`" />
+                                                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                                                <parameter name="format" value="json" />
+                                                                                                                <parameter name="httpMethod" value="post" />
+                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />-->
+                                                                                                                <parameter name="module" value="GENERIC-RESOURCE-API" />
+                                                                                                                <parameter name="rpc" value="p2p-vnf-topology-operation-p2p-callbackdg-notification" />
+                                                                                                                <parameter name="version" value="`$project.version`" />
+                                                                                                                <parameter name="mode" value="sync" />
+                                                                                                                <parameter name="responsePrefix" value="restapi-result"/>
+                                                                                                            </execute>
+                                                                                                        </block>
+                                                                                                    </outcome>
+                                                                                                </switch>
+                                                                                            </outcome>
+                                                                                            <outcome value='true'></outcome>
+                                                                                        </switch>
                                                                                     </block>
                                                                                 </outcome>
                                                                             </execute>
-- 
2.16.6