Some bug fixing for E-Line based Cloud Leased-Line service support in CCVPN use-case. 57/130857/1
authorHesam Rahimi <hesam.rahimi@huawei.com>
Mon, 12 Sep 2022 15:44:00 +0000 (11:44 -0400)
committerHesam Rahimi <hesam.rahimi@huawei.com>
Mon, 12 Sep 2022 15:45:44 +0000 (11:45 -0400)
Issue-ID: SDNC-1732
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I60ed754abd080879af1908680f7d6862460ef0a0

Former-commit-id: 7de23e988c7cf73972e07eaf2186728fb47ef756

19 files changed:
installation/src/main/properties/generic-resource-api-dg.properties
platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-activate.json
platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-callbackdg-notification.json [new file with mode: 0644]
platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-deactivate.json
platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.json
platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-modify.json
platform-logic/generic-resource-api/src/main/resources/graph.versions
platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-activate.xml
platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-callbackdg-notification.xml [new file with mode: 0644]
platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-deactivate.xml
platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.xml
platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-modify.xml
platform-logic/restapi-templates/src/main/json/p2p-call-ves.json [new file with mode: 0644]
platform-logic/restapi-templates/src/main/json/p2p-create-pm-data.json
platform-logic/restapi-templates/src/main/json/p2p-ethernet-service.json
platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-domainG.json
platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-dst-domain.json
platform-logic/restapi-templates/src/main/json/p2p-otn-tunnel-src-domain.json
platform-logic/restapi-templates/src/main/json/p2p-subscribe-notification.json

index 10b6d67..4ba4695 100644 (file)
@@ -44,6 +44,14 @@ restapi.ts-otn-dst-domain-creation.templatefile=ts-otn-tunnel-dst-domain.json
 restapi.ts-otn-domainG-creation.templatefile=ts-otn-tunnel-domainG.json
 restapi.ts-ethernet-service.templatefile=ts-ethernet-service.json
 restapi.ts-coloring-uni-port.templatefile=ts-coloring-uni-port.json
+restapi.p2p-otn-src-domain-creation.templatefile=p2p-otn-tunnel-src-domain.json
+restapi.p2p-otn-dst-domain-creation.templatefile=p2p-otn-tunnel-dst-domain.json
+restapi.p2p-otn-domainG-creation.templatefile=p2p-otn-tunnel-domainG.json
+restapi.p2p-ethernet-service.templatefile=p2p-ethernet-service.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
+restapi.p2p-call-ves.templatefile=p2p-call-ves.json
 restapi.cll-ethernet-service-loop.templatefile=cll-ethernet-service-loop.json
 restapi.cll-ethernet-service-loop-protection.templatefile=cll-ethernet-service-loop-protection.json
 restapi.cll-otn-src-domain-creation.templatefile=cll-otn-tunnel-src-domain.json
index 8047f55..879663f 100644 (file)
             [\r
                 "4fa6f4cb.4aa39c",\r
                 "f065baf1.f73c4",\r
-                "677bc6cc.c2278"\r
+                "677bc6cc.c2278",\r
+                "fce678f7.abc0e",\r
+                "c53e4466.6aae58",\r
+                "4b53c1cb.8fea68"\r
             ]\r
         ]\r
     },\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5351.75,\r
-        "y": 703.75,\r
+        "x": 5538.750244140625,\r
+        "y": 578.75,\r
         "z": "30d84baa.6f57bc",\r
         "wires": [\r
             []\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 5215.75,\r
-        "y": 662.75,\r
+        "x": 5402.750244140625,\r
+        "y": 537.75,\r
         "z": "30d84baa.6f57bc",\r
         "wires": []\r
     },\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5278.75,\r
-        "y": 749.75,\r
+        "x": 5465.750244140625,\r
+        "y": 624.75,\r
         "z": "30d84baa.6f57bc",\r
         "wires": [\r
             []\r
             [\r
                 "22d7dd70.1841ea",\r
                 "3dfc3096.80b288",\r
-                "d67d1410.76b2b8"\r
+                "d67d1410.76b2b8",\r
+                "d6603080.c5623",\r
+                "31942261.57ab16",\r
+                "99f2f22d.ceb08"\r
             ]\r
         ]\r
     },\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance' \n      key='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<parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='orchestration-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5298.5,\r
-        "y": 810.25,\r
+        "x": 5485.500244140625,\r
+        "y": 685.25,\r
         "z": "30d84baa.6f57bc",\r
         "wires": [\r
             []\r
         "wires": [\r
             []\r
         ]\r
+    },\r
+    {\r
+        "id": "fce678f7.abc0e",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Create Performance Monitoring Data",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5557.667236328125,\r
+        "y": 764.3333129882812,\r
+        "z": "30d84baa.6f57bc",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "c53e4466.6aae58",\r
+        "type": "execute",\r
+        "name": "execute RestconfDiscoveryNode establishSubscription",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\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=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5530.6669921875,\r
+        "y": 823.3331909179688,\r
+        "z": "30d84baa.6f57bc",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4b53c1cb.8fea68",\r
+        "type": "execute",\r
+        "name": "execute RestconfDiscoveryNode establishPersistentConnection",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\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=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5556.667236328125,\r
+        "y": 877.3331909179688,\r
+        "z": "30d84baa.6f57bc",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "d6603080.c5623",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Create Performance Monitoring Data",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4783.6669921875,\r
+        "y": 2380.33349609375,\r
+        "z": "30d84baa.6f57bc",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "31942261.57ab16",\r
+        "type": "execute",\r
+        "name": "execute RestconfDiscoveryNode establishSubscription",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\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=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4756.666748046875,\r
+        "y": 2439.3333740234375,\r
+        "z": "30d84baa.6f57bc",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "99f2f22d.ceb08",\r
+        "type": "execute",\r
+        "name": "execute RestconfDiscoveryNode establishPersistentConnection",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\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=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4782.6669921875,\r
+        "y": 2493.3333740234375,\r
+        "z": "30d84baa.6f57bc",\r
+        "wires": [\r
+            []\r
+        ]\r
     }\r
 ]
\ 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
new file mode 100644 (file)
index 0000000..e2d91c0
--- /dev/null
@@ -0,0 +1,254 @@
+[\r
+    {\r
+        "id": "146661fc.5f1716",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
+        "outputs": 1,\r
+        "x": 231.3333282470703,\r
+        "y": 168.33334350585938,\r
+        "z": "b7370f57.e5898",\r
+        "wires": [\r
+            [\r
+                "86a2b61b.9e561"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "86a2b61b.9e561",\r
+        "type": "service-logic",\r
+        "name": "GENERIC-RESOURCE-API 888",\r
+        "module": "GENERIC-RESOURCE-API",\r
+        "version": "888",\r
+        "comments": "",\r
+        "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'>",\r
+        "outputs": 1,\r
+        "x": 515.6190185546875,\r
+        "y": 229.5714521408081,\r
+        "z": "b7370f57.e5898",\r
+        "wires": [\r
+            [\r
+                "75333460.3692e4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "75333460.3692e4",\r
+        "type": "method",\r
+        "name": "method p2p-vnf-topology-operation-p2p-callbackdg-notification",\r
+        "xml": "<method rpc='p2p-vnf-topology-operation-p2p-callbackdg-notification' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 502.7619171142578,\r
+        "y": 305.3333740234375,\r
+        "z": "b7370f57.e5898",\r
+        "wires": [\r
+            [\r
+                "a3ba9640.ce2a68"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "3fe77da.9239682",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1090.5713653564453,\r
+        "y": 530.0000152587891,\r
+        "z": "b7370f57.e5898",\r
+        "wires": [\r
+            [\r
+                "431c42fb.f6e204",\r
+                "3460fdb3.e8d272",\r
+                "730e4c82.49807c",\r
+                "c0f75bcd.e70238",\r
+                "11c77827.79f3f8",\r
+                "467dc2f0.3c1dec",\r
+                "cea32b3b.64c058"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5ebdcbc8.001434",\r
+        "type": "execute",\r
+        "name": "execute properties",\r
+        "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' />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1082.3333282470703,\r
+        "y": 306.3333435058594,\r
+        "z": "b7370f57.e5898",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "431c42fb.f6e204",\r
+        "type": "set",\r
+        "name": "set received notification parameters",\r
+        "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`' />",\r
+        "comments": "",\r
+        "x": 1411.3333282470703,\r
+        "y": 488.3333282470703,\r
+        "z": "b7370f57.e5898",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a593f0c.3d3a59",\r
+        "type": "record",\r
+        "name": "record",\r
+        "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`\"/>-->",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1046.3333892822266,\r
+        "y": 250.33334350585938,\r
+        "z": "b7370f57.e5898",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "467dc2f0.3c1dec",\r
+        "type": "save",\r
+        "name": "save:metadata to AAI",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1349.3333129882812,\r
+        "y": 698.3333282470703,\r
+        "z": "b7370f57.e5898",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "c0f75bcd.e70238",\r
+        "type": "set",\r
+        "name": "set parameters",\r
+        "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",\r
+        "comments": "",\r
+        "x": 1340.3333129882812,\r
+        "y": 1026.3332977294922,\r
+        "z": "b7370f57.e5898",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "11c77827.79f3f8",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode call VES",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1398.3333129882812,\r
+        "y": 1069.3332977294922,\r
+        "z": "b7370f57.e5898",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "3460fdb3.e8d272",\r
+        "type": "execute",\r
+        "name": "execute UUID generator for eventId",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventId-uuid\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1402.3333129882812,\r
+        "y": 934.3332977294922,\r
+        "z": "b7370f57.e5898",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "730e4c82.49807c",\r
+        "type": "execute",\r
+        "name": "execute UUID generator for eventName",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventName-uuid\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1415.3333129882812,\r
+        "y": 976.3332977294922,\r
+        "z": "b7370f57.e5898",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "65d0a166.302088",\r
+        "type": "comment",\r
+        "name": "Calling VES and passing notification parameters",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 1429.3333129882812,\r
+        "y": 879.3332977294922,\r
+        "z": "b7370f57.e5898",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "349d4c54.f7933c",\r
+        "type": "switchNode",\r
+        "name": "switch change type == upadte",\r
+        "xml": "<switch test=\"`$push-change-update.datastore-changes.type == 'update' `\">\n\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1107.3333282470703,\r
+        "y": 381.3333282470703,\r
+        "z": "b7370f57.e5898",\r
+        "wires": [\r
+            [\r
+                "fb0217.09e69de8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fb0217.09e69de8",\r
+        "type": "outcome",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1322.3333282470703,\r
+        "y": 379.3333282470703,\r
+        "z": "b7370f57.e5898",\r
+        "wires": [\r
+            [\r
+                "3fe77da.9239682"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a3ba9640.ce2a68",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 837.3333282470703,\r
+        "y": 306.3333282470703,\r
+        "z": "b7370f57.e5898",\r
+        "wires": [\r
+            [\r
+                "a593f0c.3d3a59",\r
+                "5ebdcbc8.001434",\r
+                "349d4c54.f7933c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cea32b3b.64c058",\r
+        "type": "save",\r
+        "name": "update:metadata to AAI",\r
+        "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`\" />-->",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1358.3333129882812,\r
+        "y": 753.3333282470703,\r
+        "z": "b7370f57.e5898",\r
+        "wires": [\r
+            []\r
+        ]\r
+    }\r
+]
\ No newline at end of file
index c9a977f..b8c6b8c 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "7987293a.445a38",\r
+        "id": "d98dcf0e.93938",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 167.75,\r
-        "y": 154,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 210.3333282470703,\r
+        "y": 183.33334350585938,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "45444450.d7f6dc"\r
+                "319ab0df.6ee57"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45444450.d7f6dc",\r
+        "id": "319ab0df.6ee57",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 299.0356903076172,\r
-        "y": 203.23810863494873,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 341.6190185546875,\r
+        "y": 232.5714521408081,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "ae3ab411.371d58"\r
+                "dbf82646.30e808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae3ab411.371d58",\r
+        "id": "dbf82646.30e808",\r
         "type": "method",\r
-        "name": "method tsli-vnf-topology-operation-trans-slice-deactivate",\r
-        "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-deactivate' mode='sync'>\n",\r
+        "name": "method p2p-vnf-topology-operation-p2p-deactivate",\r
+        "xml": "<method rpc='p2p-vnf-topology-operation-p2p-deactivate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 302.1786193847656,\r
-        "y": 288.00003242492676,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 344.76194763183594,\r
+        "y": 317.33337593078613,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "d12b8d84.55791"\r
+                "3957bde9.7965f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d12b8d84.55791",\r
+        "id": "3957bde9.7965f2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 451.988037109375,\r
-        "y": 417.6666564941406,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 494.5713653564453,\r
+        "y": 447,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "1c123ec2.4b5549",\r
-                "134fd372.6771b5",\r
-                "ab4d5dd1.8ac7f"\r
+                "78baadd0.d3fb44",\r
+                "2d184474.a022a4",\r
+                "94f651c0.50e168"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1c123ec2.4b5549",\r
+        "id": "78baadd0.d3fb44",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 726.3216552734375,\r
-        "y": 684.59716796875,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 768.9049835205078,\r
+        "y": 713.9305114746094,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "901e34f6.602458",\r
+        "id": "2b013ae4.1229c6",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 757.75,\r
-        "y": 359,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 800.3333282470703,\r
+        "y": 388.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "134fd372.6771b5",\r
+        "id": "2d184474.a022a4",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "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<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-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 777.75,\r
-        "y": 455,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 820.3333282470703,\r
+        "y": 484.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "2d1d6b25.d0297c",\r
-                "507ea16f.c4686",\r
-                "afd8f070.eec4e8"\r
+                "f1b2a987.371a3",\r
+                "e9f71e05.b9b1f",\r
+                "bd4a22a3.cd4418"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d1d6b25.d0297c",\r
+        "id": "f1b2a987.371a3",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 996.75,\r
-        "y": 393,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 1039.3333282470703,\r
+        "y": 422.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "97138a32.2f3f5"\r
+                "c581d6e1.222a78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "507ea16f.c4686",\r
+        "id": "e9f71e05.b9b1f",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1006.240966796875,\r
-        "y": 435.57403564453125,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 1048.8242950439453,\r
+        "y": 464.9073791503906,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "888faa2.34cabd8"\r
+                "d0a2ce90.fc9c7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "afd8f070.eec4e8",\r
+        "id": "bd4a22a3.cd4418",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 994.75,\r
-        "y": 482,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 1037.3333282470703,\r
+        "y": 511.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "50c527ec.505a7"\r
+                "dfb27a3e.e61018"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "888faa2.34cabd8",\r
+        "id": "d0a2ce90.fc9c7",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1159.8123779296875,\r
-        "y": 438.8597717285156,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 1202.3957061767578,\r
+        "y": 468.193115234375,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "50c527ec.505a7",\r
+        "id": "dfb27a3e.e61018",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1163.75,\r
-        "y": 483,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 1206.3333282470703,\r
+        "y": 512.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "97138a32.2f3f5",\r
+        "id": "c581d6e1.222a78",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1193.75,\r
-        "y": 389,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 1236.3333282470703,\r
+        "y": 418.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "73002c56.e20dcc"\r
+                "c916b66c.2d0ed"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73002c56.e20dcc",\r
+        "id": "c916b66c.2d0ed",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1417.08349609375,\r
-        "y": 388.99993896484375,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 1459.6668243408203,\r
+        "y": 418.3332824707031,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "f5ce1b9b.6f43c"\r
+                "92806cc2.c66de8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5ce1b9b.6f43c",\r
+        "id": "92806cc2.c66de8",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1617.7501335144043,\r
-        "y": 390.00002098083496,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 1660.3334617614746,\r
+        "y": 419.33336448669434,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "5b31678.585da18"\r
+                "a2f1e4fa.ab8b98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab4d5dd1.8ac7f",\r
+        "id": "94f651c0.50e168",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "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' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 743.75,\r
-        "y": 403,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 786.3333282470703,\r
+        "y": 432.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5b31678.585da18",\r
+        "id": "a2f1e4fa.ab8b98",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1855.75,\r
-        "y": 392,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 1898.3333282470703,\r
+        "y": 421.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "7e6bd44c.4a0d84",\r
-                "3c965ca8.a0aa94",\r
-                "a01cc737.c0329"\r
+                "ed2a7178.6b056",\r
+                "cd09831d.de74c8",\r
+                "a3036edf.1e05d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e6bd44c.4a0d84",\r
+        "id": "ed2a7178.6b056",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2063.75,\r
-        "y": 356,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2106.3333282470703,\r
+        "y": 385.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "acdeaad5.a6cc1"\r
+                "901ec956.b36b88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c965ca8.a0aa94",\r
+        "id": "cd09831d.de74c8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2064.240966796875,\r
-        "y": 401.57403564453125,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2106.8242950439453,\r
+        "y": 430.9073791503906,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "905f7b79.76f648"\r
+                "45fbb915.2d083"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a01cc737.c0329",\r
+        "id": "a3036edf.1e05d8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2061.75,\r
-        "y": 445,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2104.3333282470703,\r
+        "y": 474.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "76441f4c.a06df"\r
+                "2f98e497.095aa4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "905f7b79.76f648",\r
+        "id": "45fbb915.2d083",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2226.8123779296875,\r
-        "y": 401.8597717285156,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2269.395706176758,\r
+        "y": 431.193115234375,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "76441f4c.a06df",\r
+        "id": "2f98e497.095aa4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2230.75,\r
-        "y": 446,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2273.3333282470703,\r
+        "y": 475.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40981562.d0dc0c",\r
+        "id": "8158b5e1.0a585",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2536.75,\r
-        "y": 445,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2579.3333282470703,\r
+        "y": 474.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "b886e1a9.d43df",\r
-                "4c757dd3.2c3a1c",\r
-                "490d4ff6.7bfb2"\r
+                "87ee8ab9.1e01d",\r
+                "3621ff2f.804af",\r
+                "4896a29e.06bc3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29ed7f6b.7ef5c",\r
+        "id": "fa999a4d.1ab52",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2920.75,\r
-        "y": 445,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2963.3333282470703,\r
+        "y": 474.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "dbce8d50.3a5c2",\r
-                "697b34e.12e544c",\r
-                "595bb85e.e54e8",\r
-                "e28e0e7a.57d778"\r
+                "5ce16a5f.d1a7a4",\r
+                "ad2097c8.6a19b",\r
+                "15c593ac.788fc4",\r
+                "80663318.de3fc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b886e1a9.d43df",\r
+        "id": "87ee8ab9.1e01d",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2747.75,\r
-        "y": 447,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2790.3333282470703,\r
+        "y": 476.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "29ed7f6b.7ef5c"\r
+                "fa999a4d.1ab52"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4c757dd3.2c3a1c",\r
+        "id": "3621ff2f.804af",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2748.240966796875,\r
-        "y": 492.57403564453125,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2790.8242950439453,\r
+        "y": 521.9073791503906,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "cd02fceb.e80ee8"\r
+                "f4c4347e.16c668"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "490d4ff6.7bfb2",\r
+        "id": "4896a29e.06bc3c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2745.75,\r
-        "y": 536,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2788.3333282470703,\r
+        "y": 565.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "10b6485e.f13c18"\r
+                "eb7db10f.2b3ab8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "10b6485e.f13c18",\r
+        "id": "eb7db10f.2b3ab8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2912.75,\r
-        "y": 535,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2955.3333282470703,\r
+        "y": 564.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cd02fceb.e80ee8",\r
+        "id": "f4c4347e.16c668",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2910.8123779296875,\r
-        "y": 492.8597717285156,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2953.395706176758,\r
+        "y": 522.193115234375,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "acdeaad5.a6cc1",\r
+        "id": "901ec956.b36b88",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2264.75,\r
-        "y": 351,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2307.3333282470703,\r
+        "y": 380.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "590f481d.6deaf8"\r
+                "dada8f4e.0ceef"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "590f481d.6deaf8",\r
+        "id": "dada8f4e.0ceef",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2469.75,\r
-        "y": 351,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2512.3333282470703,\r
+        "y": 380.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "3e88a914.31d29e"\r
+                "75d22c63.5e7cac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e88a914.31d29e",\r
+        "id": "75d22c63.5e7cac",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2635.75,\r
-        "y": 351,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2678.3333282470703,\r
+        "y": 380.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "d5611bfd.8b5ba8"\r
+                "42f7bc9.ecd26c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5611bfd.8b5ba8",\r
+        "id": "42f7bc9.ecd26c4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2798.75,\r
-        "y": 351,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 2841.3333282470703,\r
+        "y": 380.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "40981562.d0dc0c"\r
+                "8158b5e1.0a585"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dbce8d50.3a5c2",\r
+        "id": "5ce16a5f.d1a7a4",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 3135.75,\r
-        "y": 155,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3178.3333282470703,\r
+        "y": 184.33334350585938,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "697b34e.12e544c",\r
+        "id": "ad2097c8.6a19b",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3161.75,\r
-        "y": 272,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3204.3333282470703,\r
+        "y": 301.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "d00072ef.37f678",\r
-                "e25ba00b.85ab78",\r
-                "af08c977.c21ff8"\r
+                "43b23d4f.547d54",\r
+                "30274991.38252e",\r
+                "50a3db86.4834dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d00072ef.37f678",\r
+        "id": "43b23d4f.547d54",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3357.2501220703125,\r
-        "y": 224,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3399.833450317383,\r
+        "y": 253.33334350585938,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "5add0fc2.e455a8"\r
+                "a478ad49.449108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e25ba00b.85ab78",\r
+        "id": "30274991.38252e",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3349.2501220703125,\r
-        "y": 279,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3391.833450317383,\r
+        "y": 308.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "e5b74ae2.bf4d7"\r
+                "d9ec800f.57eab"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5add0fc2.e455a8",\r
+        "id": "a478ad49.449108",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3501.6324462890625,\r
-        "y": 223.65567016601562,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3544.215774536133,\r
+        "y": 252.989013671875,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "7c91c82b.801f4"\r
+                "5da14bf8.d82d04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c91c82b.801f4",\r
+        "id": "5da14bf8.d82d04",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3685.75,\r
-        "y": 222,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3728.3333282470703,\r
+        "y": 251.33334350585938,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "40f3da44.52c9bc"\r
+                "d20fbb15.205b28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40f3da44.52c9bc",\r
+        "id": "d20fbb15.205b28",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3880.75,\r
-        "y": 222,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3923.3333282470703,\r
+        "y": 251.33334350585938,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "ec33b794.fa679"\r
+                "997f14d.5069ee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af08c977.c21ff8",\r
+        "id": "50a3db86.4834dc",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3354.2501220703125,\r
-        "y": 336,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3396.833450317383,\r
+        "y": 365.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "d0c572d6.450d98"\r
+                "f0e3dab8.1633e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0c572d6.450d98",\r
+        "id": "f0e3dab8.1633e8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3506.2501220703125,\r
-        "y": 337,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3548.833450317383,\r
+        "y": 366.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e5b74ae2.bf4d7",\r
+        "id": "d9ec800f.57eab",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3517.2501220703125,\r
-        "y": 280,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3559.833450317383,\r
+        "y": 309.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5f838eee.116ce",\r
+        "id": "56a5b801.2c46b",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4468.75,\r
-        "y": 239,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4511.33332824707,\r
+        "y": 268.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "50b81d5a.269cfc",\r
-                "baecba51.c84f4",\r
-                "3764c57a.2235a2"\r
+                "65f63d9b.60c494",\r
+                "476b44db.0c29ec",\r
+                "91ab2d3d.2af768"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9bd9c8c.3dcca",\r
+        "id": "c300b0fa.ab3bc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4262.75,\r
-        "y": 226,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4305.33332824707,\r
+        "y": 255.33334350585938,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "df5cc029.1b2a68",\r
-                "5f838eee.116ce",\r
-                "7167c2a2.e60ca4"\r
+                "6b92b5f6.a883cc",\r
+                "56a5b801.2c46b",\r
+                "616cedeb.464a7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df5cc029.1b2a68",\r
+        "id": "6b92b5f6.a883cc",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "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",\r
         "comments": "",\r
-        "x": 4498.75,\r
-        "y": 187,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4541.33332824707,\r
+        "y": 216.33334350585938,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "50b81d5a.269cfc",\r
+        "id": "65f63d9b.60c494",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4678.75,\r
-        "y": 230,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4721.33332824707,\r
+        "y": 259.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "cd3637d1.c154d8"\r
+                "69a4e55a.c658e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "baecba51.c84f4",\r
+        "id": "476b44db.0c29ec",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4670.75,\r
-        "y": 285,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4713.33332824707,\r
+        "y": 314.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "47ed2855.6b69a"\r
+                "cf55f25.74f1b9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3764c57a.2235a2",\r
+        "id": "91ab2d3d.2af768",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4675.75,\r
-        "y": 342,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4718.33332824707,\r
+        "y": 371.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "c2dbfa93.1077a"\r
+                "bb217f8d.57e2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2dbfa93.1077a",\r
+        "id": "bb217f8d.57e2c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4827.75,\r
-        "y": 343,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4870.33332824707,\r
+        "y": 372.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "47ed2855.6b69a",\r
+        "id": "cf55f25.74f1b9",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4838.75,\r
-        "y": 288,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4881.33332824707,\r
+        "y": 317.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cd3637d1.c154d8",\r
+        "id": "69a4e55a.c658e4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4823.13232421875,\r
-        "y": 227.65567016601562,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4865.71565246582,\r
+        "y": 256.989013671875,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "a315466.e353338"\r
+                "7460951.b1d226c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec33b794.fa679",\r
+        "id": "997f14d.5069ee8",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4083.75,\r
-        "y": 226,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4126.33332824707,\r
+        "y": 255.33334350585938,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "c9bd9c8c.3dcca"\r
+                "c300b0fa.ab3bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a315466.e353338",\r
+        "id": "7460951.b1d226c",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "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",\r
         "comments": "",\r
-        "x": 5037.75,\r
-        "y": 224,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 5080.33332824707,\r
+        "y": 253.33334350585938,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7167c2a2.e60ca4",\r
+        "id": "616cedeb.464a7c",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4418.75,\r
-        "y": 303,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4461.33332824707,\r
+        "y": 332.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "921a6da5.facfa8",\r
+        "id": "342c942c.6c5404",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete ethernet Service without token",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3796.75,\r
-        "y": 652,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3839.3333282470703,\r
+        "y": 681.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "f23ad1ae.7a421",\r
-                "2e318f27.a95f18"\r
+                "d7185f4c.815fa8",\r
+                "bd8b4a.3a1a5cb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f23ad1ae.7a421",\r
+        "id": "d7185f4c.815fa8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4143.25,\r
-        "y": 645,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4185.83332824707,\r
+        "y": 674.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "e679ed8f.b4a3b"\r
+                "d8fc63c9.a17498"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e318f27.a95f18",\r
+        "id": "bd8b4a.3a1a5cb8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4147.25,\r
-        "y": 685,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4189.83332824707,\r
+        "y": 714.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "85d951e1.733df8"\r
+                "814975d7.622368"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "85d951e1.733df8",\r
+        "id": "814975d7.622368",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4304.75,\r
-        "y": 685,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4347.33332824707,\r
+        "y": 714.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "cd6438e5.f17948",\r
-                "9dae1cfd.fe5bb8",\r
-                "c8b6c5b0.42c5d"\r
+                "4e0ba888.e9035",\r
+                "178cdc7a.cb1604",\r
+                "e80f9137.31e308"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e679ed8f.b4a3b",\r
+        "id": "d8fc63c9.a17498",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
         "comments": "",\r
-        "x": 4301.25,\r
-        "y": 645,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4343.83332824707,\r
+        "y": 674.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cd6438e5.f17948",\r
+        "id": "4e0ba888.e9035",\r
         "type": "save",\r
         "name": "update vpn-binding resource (aka. OTN domainA) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Deactivated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4633.25,\r
-        "y": 685,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4675.83332824707,\r
+        "y": 714.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9dae1cfd.fe5bb8",\r
+        "id": "178cdc7a.cb1604",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Deactivated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4560.25,\r
-        "y": 731,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4602.83332824707,\r
+        "y": 760.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "595bb85e.e54e8",\r
+        "id": "15c593ac.788fc4",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete OTN tunnel with token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\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=\"responsePrefix\" value=\"otn-oof\"/>\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=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3264.75,\r
-        "y": 539,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3307.3333282470703,\r
+        "y": 568.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "3b1365ed.b0919a",\r
-                "2f6c4f0a.446848"\r
+                "41a25bdd.13ab7c",\r
+                "cea79f93.dca02"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b1365ed.b0919a",\r
+        "id": "41a25bdd.13ab7c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3597.25,\r
-        "y": 509,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3639.8333282470703,\r
+        "y": 538.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "fc7e9165.b22f48"\r
+                "80750e32.c906b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f6c4f0a.446848",\r
+        "id": "cea79f93.dca02",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3602.25,\r
-        "y": 574,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3644.8333282470703,\r
+        "y": 603.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "12d60626.768032"\r
+                "e8f70307.d77428"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc7e9165.b22f48",\r
+        "id": "80750e32.c906b8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 3773.25,\r
-        "y": 509,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3815.8333282470703,\r
+        "y": 538.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": []\r
     },\r
     {\r
-        "id": "12d60626.768032",\r
+        "id": "e8f70307.d77428",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3768.75,\r
-        "y": 574,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3811.3333282470703,\r
+        "y": 603.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e28e0e7a.57d778",\r
+        "id": "80663318.de3fc8",\r
         "type": "switchNode",\r
         "name": "switch connectivity has ethernet service",\r
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3202.75,\r
-        "y": 674,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3245.3333282470703,\r
+        "y": 703.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "58217adc.044174",\r
-                "7dc25247.ea55a4"\r
+                "e01c13fc.9a3438",\r
+                "16296fc9.7a4618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7dc25247.ea55a4",\r
+        "id": "16296fc9.7a4618",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3455.75,\r
-        "y": 652,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3498.3333282470703,\r
+        "y": 681.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             [\r
-                "921a6da5.facfa8"\r
+                "342c942c.6c5404"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58217adc.044174",\r
+        "id": "e01c13fc.9a3438",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3455.75,\r
-        "y": 708,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 3498.3333282470703,\r
+        "y": 737.3333435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c8b6c5b0.42c5d",\r
+        "id": "e80f9137.31e308",\r
         "type": "save",\r
         "name": "update service-instance resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance' \n      key='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<parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='orchestration-status' value='Deactivated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4578,\r
-        "y": 784.75,\r
-        "z": "316d1be5.aa32c4",\r
+        "x": 4620.58332824707,\r
+        "y": 814.0833435058594,\r
+        "z": "89e81e2a.0dc22",\r
         "wires": [\r
             []\r
         ]\r
index 1e28b05..10db6b4 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "1ffbc02a.2de6d",\r
+        "id": "9559f36c.7d99",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 133,\r
-        "y": 76,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 210.3333282470703,\r
+        "y": 176.33334350585938,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "74e0b2b2.75108c"\r
+                "589aff20.58fdd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74e0b2b2.75108c",\r
+        "id": "589aff20.58fdd8",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 264.2856903076172,\r
-        "y": 125.23810863494873,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 341.6190185546875,\r
+        "y": 225.5714521408081,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "f846ccbd.4406d8"\r
+                "7be85682.4a664"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f846ccbd.4406d8",\r
+        "id": "7be85682.4a664",\r
         "type": "method",\r
-        "name": "method tsli-vnf-topology-operation-trans-slice-delete",\r
-        "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-delete' mode='sync'>\n",\r
+        "name": "method p2p-vnf-topology-operation-p2p-delete",\r
+        "xml": "<method rpc='p2p-vnf-topology-operation-p2p-delete' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 267.4286193847656,\r
-        "y": 210.00003242492676,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 344.76194763183594,\r
+        "y": 310.33337593078613,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "dc51143b.674018"\r
+                "75b89bd3.b7035c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dc51143b.674018",\r
+        "id": "75b89bd3.b7035c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 417.238037109375,\r
-        "y": 339.6666564941406,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 494.5713653564453,\r
+        "y": 440,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "45b2aaee.4a9d2c",\r
-                "3e78a125.3512fe",\r
-                "45ccee1d.26f07"\r
+                "b92c8346.1030c",\r
+                "d4055fd6.d46db",\r
+                "6a8d6043.e67918"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45b2aaee.4a9d2c",\r
+        "id": "b92c8346.1030c",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 713.5716552734375,\r
-        "y": 616.59716796875,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 790.9049835205078,\r
+        "y": 716.9305114746094,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9ea4d60.c51a0a8",\r
+        "id": "ee6a8ea4.1c7198",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 745,\r
-        "y": 291,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 822.3333282470703,\r
+        "y": 391.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3e78a125.3512fe",\r
+        "id": "d4055fd6.d46db",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "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-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 765,\r
-        "y": 387,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 842.3333282470703,\r
+        "y": 487.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "86ee6067.0c17a8",\r
-                "bf4bb2c3.815168",\r
-                "ac6196ae.1ef19"\r
+                "381d7bc0.f1068c",\r
+                "4a8a0c1b.ab698c",\r
+                "31b9c3f9.83b5cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "86ee6067.0c17a8",\r
+        "id": "381d7bc0.f1068c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 984,\r
-        "y": 325,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 1061.3333282470703,\r
+        "y": 425.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "eb95b4de.4ca18"\r
+                "78172321.e32f04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bf4bb2c3.815168",\r
+        "id": "4a8a0c1b.ab698c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 993.490966796875,\r
-        "y": 367.57403564453125,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 1070.8242950439453,\r
+        "y": 467.9073791503906,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "4da0ff5c.9fdf8"\r
+                "fb661f4a.a35e88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac6196ae.1ef19",\r
+        "id": "31b9c3f9.83b5cc",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 982,\r
-        "y": 414,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 1059.3333282470703,\r
+        "y": 514.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "49170b5b.8b327c"\r
+                "c596dceb.f440c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4da0ff5c.9fdf8",\r
+        "id": "fb661f4a.a35e88",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1147.0623779296875,\r
-        "y": 370.8597717285156,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 1224.3957061767578,\r
+        "y": 471.193115234375,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "49170b5b.8b327c",\r
+        "id": "c596dceb.f440c8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1151,\r
-        "y": 415,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 1228.3333282470703,\r
+        "y": 515.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb95b4de.4ca18",\r
+        "id": "78172321.e32f04",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1181,\r
-        "y": 321,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 1258.3333282470703,\r
+        "y": 421.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "4f2c512c.91fb8"\r
+                "2b97696b.7fb036"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f2c512c.91fb8",\r
+        "id": "2b97696b.7fb036",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1404.33349609375,\r
-        "y": 320.99993896484375,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 1481.6668243408203,\r
+        "y": 421.3332824707031,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "fa463b5.38a29c8"\r
+                "42c2b0bd.f47dd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa463b5.38a29c8",\r
+        "id": "42c2b0bd.f47dd",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1605.0001335144043,\r
-        "y": 322.00002098083496,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 1682.3334617614746,\r
+        "y": 422.33336448669434,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "e51d2b5.f353758"\r
+                "2d4b22d.3ad5fde"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45ccee1d.26f07",\r
+        "id": "6a8d6043.e67918",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "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' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 731,\r
-        "y": 335,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 808.3333282470703,\r
+        "y": 435.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e51d2b5.f353758",\r
+        "id": "2d4b22d.3ad5fde",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1843,\r
-        "y": 324,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 1920.3333282470703,\r
+        "y": 424.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "bd96538d.fc9d98",\r
-                "d296a5a5.03f2d8",\r
-                "59d0b561.049ff4"\r
+                "767f3312.da0fc4",\r
+                "6e6e816a.046da8",\r
+                "7240a2d3.cdb52c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd96538d.fc9d98",\r
+        "id": "767f3312.da0fc4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2051,\r
-        "y": 288,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2128.3333282470703,\r
+        "y": 388.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "a935f75b.7b8ae8"\r
+                "9782a1c0.c96908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d296a5a5.03f2d8",\r
+        "id": "6e6e816a.046da8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2051.490966796875,\r
-        "y": 333.57403564453125,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2128.8242950439453,\r
+        "y": 433.9073791503906,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "b4d9ea13.dc5c6"\r
+                "2e176049.379ac8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59d0b561.049ff4",\r
+        "id": "7240a2d3.cdb52c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2049,\r
-        "y": 377,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2126.3333282470703,\r
+        "y": 477.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "cc59ead5.ab58f"\r
+                "33c68883.4e4dd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4d9ea13.dc5c6",\r
+        "id": "2e176049.379ac8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2214.0623779296875,\r
-        "y": 333.8597717285156,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2291.395706176758,\r
+        "y": 434.193115234375,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cc59ead5.ab58f",\r
+        "id": "33c68883.4e4dd8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2218,\r
-        "y": 378,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2295.3333282470703,\r
+        "y": 478.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2055e9c.9575d16",\r
+        "id": "2a05bc5b.b08dc4",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2524,\r
-        "y": 377,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2601.3333282470703,\r
+        "y": 477.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "1719bc42.5de0cc",\r
-                "b2907373.b3b1a",\r
-                "fb17b477.f9109"\r
+                "efe59340.81f6b",\r
+                "9ec2589f.db3418",\r
+                "4f5683a7.464474"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c87f5113.e0af38",\r
+        "id": "37afe5ee.53cc62",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2908,\r
-        "y": 377,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2985.3333282470703,\r
+        "y": 477.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "1985ee34.d96bba",\r
-                "52698c53.01b1dc",\r
-                "6e17a44c.f8e15c",\r
-                "9562cdef.811fc8",\r
-                "51f18b3b.809efc",\r
-                "9405a159.40925",\r
-                "e776447c.da84c8"\r
+                "e3b2dd80.eef1a8",\r
+                "a9ed431c.c281c",\r
+                "d4052d30.ad8718",\r
+                "fddd2ea9.355138",\r
+                "9f2982f0.62eef8",\r
+                "3eed71af.4521b6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1719bc42.5de0cc",\r
+        "id": "efe59340.81f6b",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2735,\r
-        "y": 379,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2812.3333282470703,\r
+        "y": 479.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "c87f5113.e0af38"\r
+                "37afe5ee.53cc62"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b2907373.b3b1a",\r
+        "id": "9ec2589f.db3418",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2735.490966796875,\r
-        "y": 424.57403564453125,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2812.8242950439453,\r
+        "y": 524.9073791503906,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "34c1a665.03471a"\r
+                "597b7a11.444784"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fb17b477.f9109",\r
+        "id": "4f5683a7.464474",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2733,\r
-        "y": 468,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2810.3333282470703,\r
+        "y": 568.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "8d4bf215.03d04"\r
+                "7e03ef7b.cd722"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d4bf215.03d04",\r
+        "id": "7e03ef7b.cd722",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2900,\r
-        "y": 467,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2977.3333282470703,\r
+        "y": 567.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "34c1a665.03471a",\r
+        "id": "597b7a11.444784",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2898.0623779296875,\r
-        "y": 424.8597717285156,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2975.395706176758,\r
+        "y": 525.193115234375,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a935f75b.7b8ae8",\r
+        "id": "9782a1c0.c96908",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2252,\r
-        "y": 283,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2329.3333282470703,\r
+        "y": 383.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "67091bed.864304"\r
+                "650cd08b.3ade4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67091bed.864304",\r
+        "id": "650cd08b.3ade4",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2457,\r
-        "y": 283,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2534.3333282470703,\r
+        "y": 383.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "4e4ac25c.008624"\r
+                "aa3600cc.a7aae8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e4ac25c.008624",\r
+        "id": "aa3600cc.a7aae8",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2623,\r
-        "y": 283,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2700.3333282470703,\r
+        "y": 383.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "7c62e56b.ccfd7c"\r
+                "fb75e488.be7c5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c62e56b.ccfd7c",\r
+        "id": "fb75e488.be7c5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2786,\r
-        "y": 283,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 2863.3333282470703,\r
+        "y": 383.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "2055e9c.9575d16"\r
+                "2a05bc5b.b08dc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1985ee34.d96bba",\r
+        "id": "e3b2dd80.eef1a8",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 3123,\r
-        "y": 87,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3200.3333282470703,\r
+        "y": 187.33334350585938,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "52698c53.01b1dc",\r
+        "id": "a9ed431c.c281c",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3149,\r
-        "y": 204,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3226.3333282470703,\r
+        "y": 304.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "df3dfd24.e7243",\r
-                "21f9901e.5c5cb",\r
-                "23d5d99c.1069c6"\r
+                "886463ef.2aa938",\r
+                "42b42c71.803e4c",\r
+                "a6449502.70e2c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df3dfd24.e7243",\r
+        "id": "886463ef.2aa938",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3344.5001220703125,\r
-        "y": 156,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3421.833450317383,\r
+        "y": 256.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "b45e1015.15138"\r
+                "c18c6719.20bd2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21f9901e.5c5cb",\r
+        "id": "42b42c71.803e4c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3336.5001220703125,\r
-        "y": 211,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3413.833450317383,\r
+        "y": 311.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "77f6a688.81ce38"\r
+                "30a99a18.cda186"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b45e1015.15138",\r
+        "id": "c18c6719.20bd2",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3488.8824462890625,\r
-        "y": 155.65567016601562,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3566.215774536133,\r
+        "y": 255.989013671875,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "a3edca1c.ba087"\r
+                "c69e4003.7eb5b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3edca1c.ba087",\r
+        "id": "c69e4003.7eb5b8",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3673,\r
-        "y": 154,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3750.3333282470703,\r
+        "y": 254.33334350585938,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "db4aebfd.10c0f"\r
+                "690e98ca.6414f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db4aebfd.10c0f",\r
+        "id": "690e98ca.6414f8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3868,\r
-        "y": 154,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3945.3333282470703,\r
+        "y": 254.33334350585938,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "47e44765.fd9158"\r
+                "2770cf70.6b8d58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23d5d99c.1069c6",\r
+        "id": "a6449502.70e2c8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3341.5001220703125,\r
-        "y": 268,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3418.833450317383,\r
+        "y": 368.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "4952922a.0e6edc"\r
+                "6503d576.73a654"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4952922a.0e6edc",\r
+        "id": "6503d576.73a654",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3493.5001220703125,\r
-        "y": 269,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3570.833450317383,\r
+        "y": 369.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "77f6a688.81ce38",\r
+        "id": "30a99a18.cda186",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3504.5001220703125,\r
-        "y": 212,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3581.833450317383,\r
+        "y": 312.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fa4dfe6b.cee79",\r
+        "id": "9068d2cf.278dc8",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4456,\r
-        "y": 171,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 4533.33332824707,\r
+        "y": 271.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "cbb209f7.a6664",\r
-                "74e5e9b0.d9729",\r
-                "a328bb91.cda89"\r
+                "1fca2290.06e8dd",\r
+                "c7116ee2.229ee",\r
+                "d17cbdef.3c1178"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f03e2fb.b5f81e",\r
+        "id": "7354c66b.f20a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4250,\r
-        "y": 158,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 4327.33332824707,\r
+        "y": 258.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "8d9a188f.1a7a4",\r
-                "fa4dfe6b.cee79",\r
-                "920b64ba.47efa"\r
+                "3bcdb5b2.4a3a62",\r
+                "9068d2cf.278dc8",\r
+                "99f73767.79f228"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8d9a188f.1a7a4",\r
+        "id": "3bcdb5b2.4a3a62",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "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",\r
         "comments": "",\r
-        "x": 4486,\r
-        "y": 119,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 4563.33332824707,\r
+        "y": 219.33334350585938,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cbb209f7.a6664",\r
+        "id": "1fca2290.06e8dd",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4666,\r
-        "y": 162,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 4743.33332824707,\r
+        "y": 262.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "d166346a.002478"\r
+                "243ff6d9.66256a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74e5e9b0.d9729",\r
+        "id": "c7116ee2.229ee",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4658,\r
-        "y": 217,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 4735.33332824707,\r
+        "y": 317.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "73697be7.45641c"\r
+                "bfdc168b.3ce728"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a328bb91.cda89",\r
+        "id": "d17cbdef.3c1178",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4663,\r
-        "y": 274,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 4740.33332824707,\r
+        "y": 374.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "482cf24f.1774ec"\r
+                "77929148.a8a1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "482cf24f.1774ec",\r
+        "id": "77929148.a8a1",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4815,\r
-        "y": 275,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 4892.33332824707,\r
+        "y": 375.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "73697be7.45641c",\r
+        "id": "bfdc168b.3ce728",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4826,\r
-        "y": 220,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 4903.33332824707,\r
+        "y": 320.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d166346a.002478",\r
+        "id": "243ff6d9.66256a",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4810.38232421875,\r
-        "y": 159.65567016601562,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 4887.71565246582,\r
+        "y": 259.989013671875,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "2f421760.45d288"\r
+                "ea25b28e.9d40c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "47e44765.fd9158",\r
+        "id": "2770cf70.6b8d58",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4071,\r
-        "y": 158,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 4148.33332824707,\r
+        "y": 258.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "3f03e2fb.b5f81e"\r
+                "7354c66b.f20a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f421760.45d288",\r
+        "id": "ea25b28e.9d40c",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "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",\r
         "comments": "",\r
-        "x": 5025,\r
-        "y": 156,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 5102.33332824707,\r
+        "y": 256.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "920b64ba.47efa",\r
+        "id": "99f73767.79f228",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4406,\r
-        "y": 235,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 4483.33332824707,\r
+        "y": 335.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9405a159.40925",\r
+        "id": "774630ef.e09c58",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete transport slice without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url +  '/restconf/operations/ietf-optical-slice:deallocate-optical-slice'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\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=' + $prop.sdncRestApi.token_id`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3273,\r
-        "y": 502,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3350.3333282470703,\r
+        "y": 602.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "ecacf915.574818",\r
-                "e290fc99.96c1d8"\r
+                "8a18cee3.35ffe",\r
+                "99cc1156.473278"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ecacf915.574818",\r
+        "id": "8a18cee3.35ffe",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3616.5,\r
-        "y": 497,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3693.8333282470703,\r
+        "y": 597.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "6c0fb618.3be698"\r
+                "a2ed508f.5c119"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e290fc99.96c1d8",\r
+        "id": "99cc1156.473278",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3620.5,\r
-        "y": 537,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3697.8333282470703,\r
+        "y": 637.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "735428f1.2ceb3"\r
+                "912161a0.cf7bf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "735428f1.2ceb3",\r
+        "id": "912161a0.cf7bf",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3778,\r
-        "y": 537,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3855.3333282470703,\r
+        "y": 637.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6c0fb618.3be698",\r
+        "id": "a2ed508f.5c119",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing deallocate transport slice rest api\" />\n",\r
         "comments": "",\r
-        "x": 3774.5,\r
-        "y": 497,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3851.8333282470703,\r
+        "y": 597.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e17a44c.f8e15c",\r
+        "id": "3eed71af.4521b6",\r
         "type": "set",\r
         "name": "set attachment_param for TN NSSSI deleteion in PNC",\r
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",\r
         "comments": "",\r
-        "x": 3249,\r
-        "y": 377,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3326.3333282470703,\r
+        "y": 477.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9562cdef.811fc8",\r
+        "id": "d4052d30.ad8718",\r
         "type": "save",\r
         "name": "delete connectivity resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3179,\r
-        "y": 812,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3256.3333282470703,\r
+        "y": 912.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "51f18b3b.809efc",\r
+        "id": "fddd2ea9.355138",\r
         "type": "save",\r
         "name": "delete vpn-binding resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3175,\r
-        "y": 856,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3252.3333282470703,\r
+        "y": 956.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9ec21c40.e14a88",\r
+        "id": "81312607.6bb828",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode domain UNI deColoring",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `\" />\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=\"responsePrefix\" value=\"otn-oof\"/>\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=' + $prop.sdncRestApi.token_id`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3759,\r
-        "y": 676,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3836.3333282470703,\r
+        "y": 776.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "f05a4dc0.054df",\r
-                "f0f39295.b7b9a8"\r
+                "cd905ee1.eaa9b8",\r
+                "3271c447.28d454"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0f39295.b7b9a8",\r
+        "id": "3271c447.28d454",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4025,\r
-        "y": 656,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 4102.33332824707,\r
+        "y": 756.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "b586e36a.93b3e8"\r
+                "e043f0ae.c34d08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f05a4dc0.054df",\r
+        "id": "cd905ee1.eaa9b8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4026.000213623047,\r
-        "y": 706.9999094009399,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 4103.333541870117,\r
+        "y": 807.3332529067993,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "67ce9419.db502c"\r
+                "a5def9d3.538c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b586e36a.93b3e8",\r
+        "id": "e043f0ae.c34d08",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing decoloring UNI rest api\" />\n",\r
         "comments": "",\r
-        "x": 4165.000247955322,\r
-        "y": 656.0000009536743,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 4242.333576202393,\r
+        "y": 756.3333444595337,\r
+        "z": "9455099.1e285f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "67ce9419.db502c",\r
+        "id": "a5def9d3.538c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4171.02725982666,\r
-        "y": 704.7453947067261,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 4248.3605880737305,\r
+        "y": 805.0787382125854,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e776447c.da84c8",\r
+        "id": "9f2982f0.62eef8",\r
         "type": "switchNode",\r
         "name": "switch connectivity has ethernet service",\r
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3208,\r
-        "y": 693,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3285.3333282470703,\r
+        "y": 793.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "a367a533.706f78",\r
-                "4d988de7.d09044"\r
+                "e2b757bb.931bf8",\r
+                "73b037b.7f08a48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d988de7.d09044",\r
+        "id": "73b037b.7f08a48",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3446,\r
-        "y": 676,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3523.3333282470703,\r
+        "y": 776.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             [\r
-                "9ec21c40.e14a88"\r
+                "81312607.6bb828"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a367a533.706f78",\r
+        "id": "e2b757bb.931bf8",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3458,\r
-        "y": 743,\r
-        "z": "e2fe7a53.da009",\r
+        "x": 3535.3333282470703,\r
+        "y": 843.3333435058594,\r
+        "z": "9455099.1e285f8",\r
         "wires": [\r
             []\r
         ]\r
index df10744..651d55c 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "b86b0fef.6d8f2",\r
+        "id": "2211395a.011d9e",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 228.56666564941406,\r
-        "y": 144.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 163.3333282470703,\r
+        "y": 160.33334350585938,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "2128d45c.da5aa4"\r
+                "76c66690.98a45"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2128d45c.da5aa4",\r
+        "id": "76c66690.98a45",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 453.85235595703125,\r
-        "y": 218.8047742843628,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 388.6190185546875,\r
+        "y": 234.5714521408081,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "70e99b08.a81814"\r
+                "b63d123d.97032"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70e99b08.a81814",\r
+        "id": "b63d123d.97032",\r
         "type": "method",\r
-        "name": "method tsli-vnf-topology-operation-trans-slice-modify",\r
-        "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-modify' mode='sync'>\n",\r
+        "name": "method p2p-vnf-topology-operation-p2p-modify",\r
+        "xml": "<method rpc='p2p-vnf-topology-operation-p2p-modify' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 459.9952697753906,\r
-        "y": 303.5666961669922,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 394.7619323730469,\r
+        "y": 319.3333740234375,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "3d648e68.8f83fa"\r
+                "8673b8f9.6a3da8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d648e68.8f83fa",\r
+        "id": "8673b8f9.6a3da8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 829.8047027587891,\r
-        "y": 328.2333526611328,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 764.5713653564453,\r
+        "y": 344.0000305175781,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "4898a5d2.c4814c",\r
-                "43d16cc8.33970c",\r
-                "dd074b01.699d5"\r
+                "ae3ebf6e.ef0d08",\r
+                "ab777fe6.923ff8",\r
+                "74df18ed.a4e518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4898a5d2.c4814c",\r
+        "id": "ae3ebf6e.ef0d08",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 1085.138198852539,\r
-        "y": 482.1636505126953,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1019.9048614501953,\r
+        "y": 497.9303283691406,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "43d16cc8.33970c",\r
+        "id": "ab777fe6.923ff8",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "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[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\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<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1152.566665649414,\r
-        "y": 301.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1087.3333282470703,\r
+        "y": 317.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "5739653.c5aef1c",\r
-                "4e5f3667.ce514",\r
-                "7d9553c0.a90d3c"\r
+                "aea97b8e.023f8",\r
+                "722dfa8c.b5ceac",\r
+                "9688fc7c.73aaf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5739653.c5aef1c",\r
+        "id": "aea97b8e.023f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1377.566665649414,\r
-        "y": 159.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1312.3333282470703,\r
+        "y": 175.33334350585938,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "fc0ebeea.3842e8"\r
+                "ef41f2be.ad3298"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e5f3667.ce514",\r
+        "id": "722dfa8c.b5ceac",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1373.057632446289,\r
-        "y": 229.1407012939453,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1307.8242950439453,\r
+        "y": 244.90737915039062,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "9ccb6432.a6f758"\r
+                "1d2d7b8b.bf556c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d9553c0.a90d3c",\r
+        "id": "9688fc7c.73aaf",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1361.566665649414,\r
-        "y": 275.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1296.3333282470703,\r
+        "y": 291.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "2159c0a9.b6525"\r
+                "8b1a56ec.d55058"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc0ebeea.3842e8",\r
+        "id": "ef41f2be.ad3298",\r
         "type": "switchNode",\r
         "name": "switch allotted-resources_length != 0",\r
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1616.566665649414,\r
-        "y": 156.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1551.3333282470703,\r
+        "y": 172.33334350585938,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "9f0f2f3b.2aa0c8",\r
-                "29eb9fec.58b94"\r
+                "34ae60f0.b22a",\r
+                "2322bdf8.c6bb02"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ccb6432.a6f758",\r
+        "id": "1d2d7b8b.bf556c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1526.6290435791016,\r
-        "y": 232.4264373779297,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1461.3957061767578,\r
+        "y": 248.193115234375,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2159c0a9.b6525",\r
+        "id": "8b1a56ec.d55058",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1530.566665649414,\r
-        "y": 276.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1465.3333282470703,\r
+        "y": 292.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9f0f2f3b.2aa0c8",\r
+        "id": "34ae60f0.b22a",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1829.566665649414,\r
-        "y": 180.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1764.3333282470703,\r
+        "y": 196.33334350585938,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "c939819f.3d19a"\r
+                "3d51a7bc.14e5d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29eb9fec.58b94",\r
+        "id": "2322bdf8.c6bb02",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1831.566665649414,\r
-        "y": 120.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1766.3333282470703,\r
+        "y": 136.33334350585938,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1c8a1ea6.0feed9",\r
+        "id": "660e6b22.7f394c",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1131.566665649414,\r
-        "y": 189.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1066.3333282470703,\r
+        "y": 205.33334350585938,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c939819f.3d19a",\r
+        "id": "3d51a7bc.14e5d",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1774.566665649414,\r
-        "y": 362.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1709.3333282470703,\r
+        "y": 378.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "f0cde51e.fc048",\r
-                "5a4aff44.5be78",\r
-                "e781046f.1418e",\r
-                "127eaa7a.98449e",\r
-                "8780743f.a296a",\r
-                "323fc4b1.60fe74"\r
+                "5c997953.c5b528",\r
+                "38f52a4e.84a6be",\r
+                "efd37c2f.4ac7f",\r
+                "ba577b94.b0dc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db6151f2.0aacb",\r
+        "id": "c943499a.5fba18",\r
         "type": "set",\r
         "name": "set network-route-A",\r
         "xml": "<set>\n<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-name`\" />\n<!--<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-id`\" />-->\n\n\n",\r
         "comments": "",\r
-        "x": 4343.566665649414,\r
-        "y": 869.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4278.33332824707,\r
+        "y": 885.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e016be81.6c64f",\r
+        "id": "a02a2dea.0be938",\r
         "type": "set",\r
         "name": "set network-route-B",\r
         "xml": "<set>\n<parameter name='network-route-B' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 4344.566665649414,\r
-        "y": 924.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4279.33332824707,\r
+        "y": 940.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "103cc7a8.7e9b88",\r
+        "id": "b14c900.06de0f",\r
         "type": "save",\r
         "name": "get allotted-resource from aai",\r
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\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         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2300.566665649414,\r
-        "y": 319.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2235.3333282470703,\r
+        "y": 335.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "f2966e51.e2caf8",\r
-                "2b2db624.af7c1a",\r
-                "626f780f.86dfb8"\r
+                "dfed5f78.dacb98",\r
+                "5582b318.e9d204",\r
+                "2fce3c04.1858e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f2966e51.e2caf8",\r
+        "id": "dfed5f78.dacb98",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2516.566665649414,\r
-        "y": 386.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2451.3333282470703,\r
+        "y": 402.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "8eff1c95.000698"\r
+                "782c069d.e39358"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b2db624.af7c1a",\r
+        "id": "5582b318.e9d204",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2517.057632446289,\r
-        "y": 286.14064025878906,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2451.8242950439453,\r
+        "y": 301.9073181152344,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "e741338f.fadbb8"\r
+                "6fdc0c14.bf49ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "626f780f.86dfb8",\r
+        "id": "2fce3c04.1858e4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2512.566665649414,\r
-        "y": 335.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2447.3333282470703,\r
+        "y": 351.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "2cb8a0b4.ed0f98"\r
+                "40e570f4.a7125"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e741338f.fadbb8",\r
+        "id": "6fdc0c14.bf49ec",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2694.629165649414,\r
-        "y": 286.42640686035156,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2629.3958282470703,\r
+        "y": 302.1930847167969,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2cb8a0b4.ed0f98",\r
+        "id": "40e570f4.a7125",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2694.566665649414,\r
-        "y": 335.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2629.3333282470703,\r
+        "y": 351.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1c10a7b4.762648",\r
+        "id": "c63be28d.8bf768",\r
         "type": "save",\r
         "name": "get logical-link from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3569.566665649414,\r
-        "y": 840.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3504.3333282470703,\r
+        "y": 856.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "54f63921.d24288",\r
-                "11c3d54e.f4363b",\r
-                "e636914f.ca32e"\r
+                "fe4eb74e.b16da8",\r
+                "f1a8adba.61278",\r
+                "1668ffd4.4ff0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54f63921.d24288",\r
+        "id": "fe4eb74e.b16da8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3861.057632446289,\r
-        "y": 819.1406402587891,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3795.8242950439453,\r
+        "y": 834.9073181152344,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "4ad84bdb.1011e4"\r
+                "1a4b644b.4c6e64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11c3d54e.f4363b",\r
+        "id": "f1a8adba.61278",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3849.566665649414,\r
-        "y": 863.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3784.3333282470703,\r
+        "y": 879.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "611bd1d0.bbec68"\r
+                "9213678.fc93898"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ad84bdb.1011e4",\r
+        "id": "1a4b644b.4c6e64",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4009.629165649414,\r
-        "y": 819.4264068603516,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3944.3958282470703,\r
+        "y": 835.1930847167969,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "611bd1d0.bbec68",\r
+        "id": "9213678.fc93898",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 4008.566665649414,\r
-        "y": 863.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3943.3333282470703,\r
+        "y": 879.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e636914f.ca32e",\r
+        "id": "1668ffd4.4ff0c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3855.566665649414,\r
-        "y": 910.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3790.3333282470703,\r
+        "y": 926.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4dddc413.6cd63c",\r
+        "id": "498e3ba4.cbc914",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4009.566665649414,\r
-        "y": 949.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3944.3333282470703,\r
+        "y": 965.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "db6151f2.0aacb",\r
-                "e016be81.6c64f",\r
-                "9f8998d0.ce9c48",\r
-                "44a9159e.85e724",\r
-                "8f0ab711.e0d798",\r
-                "d96045a7.1a29c8",\r
-                "7c9d6be0.59e3fc",\r
-                "5f01b0d6.663678",\r
-                "96f11e74.5cf9",\r
-                "32dd1d69.d1982a",\r
-                "fefb165c.6d9d48",\r
-                "afd6fb79.f36b6",\r
-                "1a397526.128d93"\r
+                "c943499a.5fba18",\r
+                "a02a2dea.0be938",\r
+                "baaef2d3.b5b91",\r
+                "217d122e.216aae",\r
+                "f7348f80.aa12e8",\r
+                "7a252ae2.45ae64",\r
+                "9446dea5.335408",\r
+                "adfb9d4f.ef8fd8",\r
+                "586bfbbd.46cc14",\r
+                "2a7b5024.c32ac8",\r
+                "8e0823d9.c3d5f",\r
+                "642b12a.3e870ec",\r
+                "f34b01.8e0f75"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9f8998d0.ce9c48",\r
+        "id": "baaef2d3.b5b91",\r
         "type": "save",\r
         "name": "get network-route-A from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-A'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-A\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4356.566665649414,\r
-        "y": 992.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4291.33332824707,\r
+        "y": 1008.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "ad94bc3e.2edb18",\r
-                "3c6b8cbe.35a074",\r
-                "e925e05d.5c3e7"\r
+                "d4cc395.cbcc8c8",\r
+                "73709604.b968f",\r
+                "7296162a.34f3c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44a9159e.85e724",\r
+        "id": "217d122e.216aae",\r
         "type": "save",\r
         "name": "get network-route-B from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-B'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-B\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4335.566665649414,\r
-        "y": 1594.5665435791016,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4270.33332824707,\r
+        "y": 1610.3332214355469,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "ce3181da.534ae8",\r
-                "dd474f13.0169c8",\r
-                "1e53e46c.6ee5dc"\r
+                "33c50f98.788ad",\r
+                "41cb8574.dd9304",\r
+                "d536577b.eef8e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad94bc3e.2edb18",\r
+        "id": "d4cc395.cbcc8c8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4557.566665649414,\r
-        "y": 876.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4492.33332824707,\r
+        "y": 892.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "11095a88.1d6375"\r
+                "d86c12e3.b2275"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c6b8cbe.35a074",\r
+        "id": "73709604.b968f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4553.075698852539,\r
-        "y": 925.9926910400391,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4487.842361450195,\r
+        "y": 941.7593688964844,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "1c85f4a2.49e393"\r
+                "800e46e3.3573a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e925e05d.5c3e7",\r
+        "id": "7296162a.34f3c8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4557.075698852539,\r
-        "y": 976.9926910400391,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4491.842361450195,\r
+        "y": 992.7593688964844,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "7e7cdd76.7cfb84"\r
+                "a34e2377.27ccd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11095a88.1d6375",\r
+        "id": "d86c12e3.b2275",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4706.138198852539,\r
-        "y": 875.8524322509766,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4640.904861450195,\r
+        "y": 891.6191101074219,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1c85f4a2.49e393",\r
+        "id": "800e46e3.3573a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 4696.075698852539,\r
-        "y": 925.9926910400391,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4630.842361450195,\r
+        "y": 941.7593688964844,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ce3181da.534ae8",\r
+        "id": "33c50f98.788ad",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4558.566665649414,\r
-        "y": 1564.5665435791016,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4493.33332824707,\r
+        "y": 1580.3332214355469,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "b22dee41.00f36"\r
+                "4a962304.a215f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd474f13.0169c8",\r
+        "id": "41cb8574.dd9304",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4554.075698852539,\r
-        "y": 1613.9925689697266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4488.842361450195,\r
+        "y": 1629.7592468261719,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "6933584e.ecc31"\r
+                "310d3fa7.cc4238"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e53e46c.6ee5dc",\r
+        "id": "d536577b.eef8e8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4558.075698852539,\r
-        "y": 1664.9925689697266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4492.842361450195,\r
+        "y": 1680.7592468261719,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "b7fe5d85.6c90f"\r
+                "c757b760.b406b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b22dee41.00f36",\r
+        "id": "4a962304.a215f4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4707.138198852539,\r
-        "y": 1563.852310180664,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4641.904861450195,\r
+        "y": 1579.6189880371094,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6933584e.ecc31",\r
+        "id": "310d3fa7.cc4238",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 4697.075698852539,\r
-        "y": 1613.9925689697266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4631.842361450195,\r
+        "y": 1629.7592468261719,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "95843474.b9bce8",\r
+        "id": "62da33ab.561f8c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5371.233169555664,\r
-        "y": 1020.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5305.99983215332,\r
+        "y": 1036.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "b4615ea7.1bce1",\r
-                "be2e7ced.c4df",\r
-                "ce2c131b.42f24",\r
-                "71b17710.70c14",\r
-                "89a7842f.afd83"\r
+                "70f308bc.05dc48",\r
+                "a4aed251.f9b08",\r
+                "d868e9d5.e95cb",\r
+                "2078a502.9da27a",\r
+                "8465e4fd.6de0a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4503129f.bd2fd4",\r
+        "id": "24a2bf70.dd5f6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5198.566665649414,\r
-        "y": 1021.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5133.33332824707,\r
+        "y": 1037.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "95843474.b9bce8"\r
+                "62da33ab.561f8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8659354b.96b4a",\r
+        "id": "b92bac73.6c9778",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5208.057632446289,\r
-        "y": 1064.1407012939453,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5142.824295043945,\r
+        "y": 1079.9073791503906,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "df26ebdc.1c7d8"\r
+                "e76a7bba.50458"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f14e9aee.41ddd",\r
+        "id": "4c3b9d0a.797a8c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5196.566665649414,\r
-        "y": 1110.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5131.33332824707,\r
+        "y": 1126.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "779f16ad.79c298"\r
+                "24a51d5a.eb4b0a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df26ebdc.1c7d8",\r
+        "id": "e76a7bba.50458",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5361.629043579102,\r
-        "y": 1067.4264373779297,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5296.395706176758,\r
+        "y": 1083.193115234375,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "779f16ad.79c298",\r
+        "id": "24a51d5a.eb4b0a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 5365.566665649414,\r
-        "y": 1111.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5300.33332824707,\r
+        "y": 1127.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7e7cdd76.7cfb84",\r
+        "id": "a34e2377.27ccd8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4718.566665649414,\r
-        "y": 978.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4653.33332824707,\r
+        "y": 994.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "d6ce477c.e6b1",\r
-                "6ff01134.d27b1"\r
+                "709f1167.bbcf68",\r
+                "77da836c.7c453c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b7fe5d85.6c90f",\r
+        "id": "c757b760.b406b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4708.566665649414,\r
-        "y": 1666.5665435791016,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4643.33332824707,\r
+        "y": 1682.3332214355469,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "44dc4d90.b0cc4c",\r
-                "abe40e95.5db908"\r
+                "e832df40.3cb4e8",\r
+                "e46caf0e.563478"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12aedd33.0f1043",\r
+        "id": "e7fcac87.3713a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5339.233169555664,\r
-        "y": 1856.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5273.99983215332,\r
+        "y": 1872.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "e22e2a42.a26b1",\r
-                "cf28df7d.f3d4b",\r
-                "daaed265.7759a8",\r
-                "cb8398b0.7dbb5",\r
-                "7bc8d59f.6d2444"\r
+                "53c6fb5d.111ec4",\r
+                "34b35dcd.443f82",\r
+                "3a858051.3cdb98",\r
+                "a5489f79.fd4018",\r
+                "a9a1085f.9d214"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a2935ba.2db97",\r
+        "id": "d0bf9af7.9310c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5166.566665649414,\r
-        "y": 1857.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5101.33332824707,\r
+        "y": 1873.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "12aedd33.0f1043"\r
+                "e7fcac87.3713a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dcc235b8.72838",\r
+        "id": "26c8c3e3.b7c694",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5176.057632446289,\r
-        "y": 1900.1407012939453,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5110.824295043945,\r
+        "y": 1915.9073791503906,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "6a73fa3d.d6c2b4"\r
+                "a82c31f6.750ae8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "262965f5.6cf9ea",\r
+        "id": "dbc3af7a.2f9fb8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5164.566665649414,\r
-        "y": 1946.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5099.33332824707,\r
+        "y": 1962.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "403c1229.13a954"\r
+                "10e75613.88aafa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a73fa3d.d6c2b4",\r
+        "id": "a82c31f6.750ae8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5329.629043579102,\r
-        "y": 1903.4264373779297,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5264.395706176758,\r
+        "y": 1919.193115234375,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "403c1229.13a954",\r
+        "id": "10e75613.88aafa",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 5333.566665649414,\r
-        "y": 1947.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5268.33332824707,\r
+        "y": 1963.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b4615ea7.1bce1",\r
+        "id": "70f308bc.05dc48",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5635.566665649414,\r
-        "y": 1004.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5570.33332824707,\r
+        "y": 1020.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "7fca3373.091184",\r
-                "84a28ee2.eeb658"\r
+                "6bbffa2e.46690c",\r
+                "77cd07cb.ebdf78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84a28ee2.eeb658",\r
+        "id": "77cd07cb.ebdf78",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5858.566665649414,\r
-        "y": 959.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5793.33332824707,\r
+        "y": 975.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "70d4fffc.d22c5"\r
+                "e975bc36.28a99"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7fca3373.091184",\r
+        "id": "6bbffa2e.46690c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5860.566665649414,\r
-        "y": 1023.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5795.33332824707,\r
+        "y": 1039.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "3dce84d0.b85dd4"\r
+                "8466cb9d.f4bc28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "850dbb90.b4b68",\r
+        "id": "d8fed17b.7e481",\r
         "type": "set",\r
         "name": "set ltpId",\r
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",\r
         "comments": "",\r
-        "x": 6193.566665649414,\r
-        "y": 914.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6128.33332824707,\r
+        "y": 930.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3dce84d0.b85dd4",\r
+        "id": "8466cb9d.f4bc28",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 6022.566665649414,\r
-        "y": 1019.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5957.33332824707,\r
+        "y": 1035.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "70d4fffc.d22c5",\r
+        "id": "e975bc36.28a99",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 6023.566665649414,\r
-        "y": 956.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5958.33332824707,\r
+        "y": 972.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "caf9269d.270b2",\r
-                "850dbb90.b4b68"\r
+                "34be39c3.d02096",\r
+                "d8fed17b.7e481"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "caf9269d.270b2",\r
+        "id": "34be39c3.d02096",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",\r
         "comments": "",\r
-        "x": 6194.566665649414,\r
-        "y": 1022.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6129.33332824707,\r
+        "y": 1038.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "59bf2583.d75a84",\r
+        "id": "becbdb78.8c28c",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",\r
         "comments": "",\r
-        "x": 6195.566665649414,\r
-        "y": 971.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6130.33332824707,\r
+        "y": 987.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "be2e7ced.c4df",\r
+        "id": "a4aed251.f9b08",\r
         "type": "execute",\r
         "name": "execute UUID generator for connectivity domainA",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5682.566665649414,\r
-        "y": 1073.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5617.33332824707,\r
+        "y": 1089.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "27594e13.316c22",\r
+        "id": "1e8d2c8e.4a5dbb",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",\r
         "comments": "",\r
-        "x": 5571.566665649414,\r
-        "y": 1114.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5506.33332824707,\r
+        "y": 1130.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e22e2a42.a26b1",\r
+        "id": "53c6fb5d.111ec4",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5625.566665649414,\r
-        "y": 1860.5667877197266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5560.33332824707,\r
+        "y": 1876.3334655761719,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "b2f644ca.d12c2",\r
-                "b58bca2c.4bf2c"\r
+                "46b3e138.d3f2e8",\r
+                "cddf08d4.ef0a5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b58bca2c.4bf2c",\r
+        "id": "cddf08d4.ef0a5",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5848.566665649414,\r
-        "y": 1815.5667877197266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5783.33332824707,\r
+        "y": 1831.3334655761719,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "983024ad.f8675"\r
+                "f20f3066.a035b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b2f644ca.d12c2",\r
+        "id": "46b3e138.d3f2e8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5850.566665649414,\r
-        "y": 1879.5667877197266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5785.33332824707,\r
+        "y": 1895.3334655761719,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "4af84f4.a49b8b"\r
+                "2b8acdb2.b50cfa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c96d7934.c0e9e8",\r
+        "id": "db0e4a6.96bfeb8",\r
         "type": "set",\r
         "name": "set ltpId",\r
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",\r
         "comments": "",\r
-        "x": 6183.566665649414,\r
-        "y": 1773.5667877197266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6118.33332824707,\r
+        "y": 1789.3334655761719,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4af84f4.a49b8b",\r
+        "id": "2b8acdb2.b50cfa",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 6009.566665649414,\r
-        "y": 1898.5667877197266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5944.33332824707,\r
+        "y": 1914.3334655761719,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "983024ad.f8675",\r
+        "id": "f20f3066.a035b8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 6013.566665649414,\r
-        "y": 1812.5667877197266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5948.33332824707,\r
+        "y": 1828.3334655761719,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "c96d7934.c0e9e8",\r
-                "183e4dc8.9e45ba"\r
+                "db0e4a6.96bfeb8",\r
+                "aa82495b.a24c98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "183e4dc8.9e45ba",\r
+        "id": "aa82495b.a24c98",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",\r
         "comments": "",\r
-        "x": 6184.566665649414,\r
-        "y": 1878.5667877197266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6119.33332824707,\r
+        "y": 1894.3334655761719,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "57730d78.763bfc",\r
+        "id": "76704f22.ba3f58",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",\r
         "comments": "",\r
-        "x": 6179.566665649414,\r
-        "y": 1827.5667877197266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6114.33332824707,\r
+        "y": 1843.3334655761719,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "daaed265.7759a8",\r
+        "id": "3a858051.3cdb98",\r
         "type": "save",\r
         "name": "save connectivity resource in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5627.566665649414,\r
-        "y": 2019.5667877197266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5562.33332824707,\r
+        "y": 2035.3334655761719,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cf28df7d.f3d4b",\r
+        "id": "34b35dcd.443f82",\r
         "type": "execute",\r
         "name": "execute UUID generator for connectivity domainB",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5672.566665649414,\r
-        "y": 1929.5667877197266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5607.33332824707,\r
+        "y": 1945.3334655761719,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9f3e922b.b3211",\r
+        "id": "c373fb4d.a3a7f",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",\r
         "comments": "",\r
-        "x": 5561.566665649414,\r
-        "y": 1967.5667877197266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5496.33332824707,\r
+        "y": 1983.3334655761719,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8f0ab711.e0d798",\r
+        "id": "f7348f80.aa12e8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4556.566665649414,\r
-        "y": 2264.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4491.33332824707,\r
+        "y": 2280.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d96045a7.1a29c8",\r
+        "id": "7a252ae2.45ae64",\r
         "type": "set",\r
         "name": "set attachment_param",\r
         "xml": "<set>\n<parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n\n<!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->\n",\r
         "comments": "",\r
-        "x": 4350.566665649414,\r
-        "y": 2165.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4285.33332824707,\r
+        "y": 2181.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d2d69fa1.baa39",\r
+        "id": "c4146d99.a600e",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "put proper values for src topology-id, node-id, ltp-id, etc (in domain A)\nand dst topology-id, node-id, ltp-id, etc (in domain B)",\r
         "comments": "",\r
-        "x": 4324.566665649414,\r
-        "y": 2118.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4259.33332824707,\r
+        "y": 2134.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ce2c131b.42f24",\r
+        "id": "d868e9d5.e95cb",\r
         "type": "save",\r
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5765.566665649414,\r
-        "y": 1211.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5700.33332824707,\r
+        "y": 1227.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cb8398b0.7dbb5",\r
+        "id": "a5489f79.fd4018",\r
         "type": "save",\r
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5754.566665649414,\r
-        "y": 2084.5667877197266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5689.33332824707,\r
+        "y": 2100.333465576172,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "92b1873d.551bc",\r
+        "id": "e38e7099.4c1268",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6809.566665649414,\r
-        "y": 731.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6744.33332824707,\r
+        "y": 747.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "3b96c7df.05e2",\r
-                "1eec19a2.07645e",\r
-                "b1213bca.c3532"\r
+                "60adc82e.ec907",\r
+                "ef6befb7.25ec38",\r
+                "2514309d.ea219"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8eff1c95.000698",\r
+        "id": "782c069d.e39358",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2696.566665649414,\r
-        "y": 386.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2631.3333282470703,\r
+        "y": 402.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "ad97eaf2.db3cf"\r
+                "5b7c0727.9a035"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c4d87c2.cacd08",\r
+        "id": "47d4cad8.17d52c",\r
         "type": "outcome",\r
         "name": "logical-link",\r
         "xml": "<outcome value='logical-link'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1093.5667877197266,\r
-        "y": 781.5667877197266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1028.3334503173828,\r
+        "y": 797.3334655761719,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "ba05feca.357468"\r
+                "6079a4cf.66fe14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41f5506e.8f5aa",\r
+        "id": "21c0e3fe.82515c",\r
         "type": "switchNode",\r
         "name": "switch allotted-resource.relationship-list not empty",\r
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2259.566665649414,\r
-        "y": 480.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2194.3333282470703,\r
+        "y": 496.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "8b2a546b.9f5318",\r
-                "f654fc01.bf0048"\r
+                "8d2ba343.63f8c8",\r
+                "ae4416d5.ca7b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f654fc01.bf0048",\r
+        "id": "ae4416d5.ca7b4",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2580.566665649414,\r
-        "y": 462.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2515.3333282470703,\r
+        "y": 478.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8b2a546b.9f5318",\r
+        "id": "8d2ba343.63f8c8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2562.566665649414,\r
-        "y": 560.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2497.3333282470703,\r
+        "y": 576.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "24772c6a.a8483c"\r
+                "b6502203.02c108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "94799b47.aa87f8",\r
+        "id": "8bb28c9b.5b048",\r
         "type": "set",\r
         "name": "set the current logical-link-name",\r
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n<parameter name='currLinkIsFound' value=\"false\" />\n\n\n",\r
         "comments": "",\r
-        "x": 1516.566665649414,\r
-        "y": 684.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1451.3333282470703,\r
+        "y": 700.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ba05feca.357468",\r
+        "id": "6079a4cf.66fe14",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1270.566665649414,\r
-        "y": 774.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1205.3333282470703,\r
+        "y": 790.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "94799b47.aa87f8",\r
-                "433e887a.5dd2c",\r
-                "fc0b0bdf.af57e8"\r
+                "8bb28c9b.5b048",\r
+                "b7e06d6e.f371a",\r
+                "9653963e.b4d7a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa0822cd.53caf",\r
+        "id": "485e027f.e391bc",\r
         "type": "comment",\r
         "name": "Question?",\r
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
         "comments": "",\r
-        "x": 4898.566665649414,\r
-        "y": 983.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4833.33332824707,\r
+        "y": 999.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d6ce477c.e6b1",\r
+        "id": "709f1167.bbcf68",\r
         "type": "save",\r
         "name": "get p-interface-src from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4941.566665649414,\r
-        "y": 1048.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4876.33332824707,\r
+        "y": 1064.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "4503129f.bd2fd4",\r
-                "8659354b.96b4a",\r
-                "f14e9aee.41ddd"\r
+                "24a2bf70.dd5f6",\r
+                "b92bac73.6c9778",\r
+                "4c3b9d0a.797a8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44dc4d90.b0cc4c",\r
+        "id": "e832df40.3cb4e8",\r
         "type": "save",\r
         "name": "get p-interface-dst from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4938.566665649414,\r
-        "y": 1892.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4873.33332824707,\r
+        "y": 1908.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "9a2935ba.2db97",\r
-                "dcc235b8.72838",\r
-                "262965f5.6cf9ea"\r
+                "d0bf9af7.9310c",\r
+                "26c8c3e3.b7c694",\r
+                "dbc3af7a.2f9fb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2ca1c6c2.0f0f22",\r
+        "id": "a33a2969.97acc",\r
         "type": "comment",\r
         "name": "Question?",\r
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
         "comments": "",\r
-        "x": 4899.566665649414,\r
-        "y": 1836.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4834.33332824707,\r
+        "y": 1852.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad97eaf2.db3cf",\r
+        "id": "5b7c0727.9a035",\r
         "type": "save",\r
         "name": "get allotted-resource relationship from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\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         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2989.566665649414,\r
-        "y": 333.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2924.3333282470703,\r
+        "y": 349.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "ef5e96fe.587c78",\r
-                "e171a2b9.a46c9",\r
-                "ed7e8b76.daabf"\r
+                "ca1aef51.5c2e6",\r
+                "fa2abd46.be79a8",\r
+                "6dcd89ce.d8f7b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e171a2b9.a46c9",\r
+        "id": "fa2abd46.be79a8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3263.057632446289,\r
-        "y": 226.14064025878906,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3197.8242950439453,\r
+        "y": 241.90731811523438,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "ae21063b.421918"\r
+                "3cf8b5c.596c24a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae21063b.421918",\r
+        "id": "3cf8b5c.596c24a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3440.629165649414,\r
-        "y": 226.42640686035156,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3375.3958282470703,\r
+        "y": 242.19308471679688,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ed7e8b76.daabf",\r
+        "id": "6dcd89ce.d8f7b8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3258.566665649414,\r
-        "y": 275.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3193.3333282470703,\r
+        "y": 291.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "1fe6476a.260d99"\r
+                "143224ce.735913"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1fe6476a.260d99",\r
+        "id": "143224ce.735913",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 3440.566665649414,\r
-        "y": 275.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3375.3333282470703,\r
+        "y": 291.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ef5e96fe.587c78",\r
+        "id": "ca1aef51.5c2e6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3262.566665649414,\r
-        "y": 326.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3197.3333282470703,\r
+        "y": 342.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "5ed5bf6.6fd244"\r
+                "eadcd586.811458"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ed5bf6.6fd244",\r
+        "id": "eadcd586.811458",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3442.566665649414,\r
-        "y": 326.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3377.3333282470703,\r
+        "y": 342.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "41f5506e.8f5aa"\r
+                "21c0e3fe.82515c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99ef6a45.9ad878",\r
+        "id": "d8bf1877.11fa58",\r
         "type": "for",\r
         "name": "for each allotted-resource relationship",\r
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 868.5666656494141,\r
-        "y": 710.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 803.3333282470703,\r
+        "y": 726.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "99689150.5b9778"\r
+                "a6f98a69.92187"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99689150.5b9778",\r
+        "id": "a6f98a69.92187",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1139.566665649414,\r
-        "y": 706.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1074.3333282470703,\r
+        "y": 722.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "5c4d87c2.cacd08"\r
+                "47d4cad8.17d52c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2bf740bc.b587b",\r
+        "id": "a15de96b.529998",\r
         "type": "outcome",\r
         "name": "network-policy",\r
         "xml": "<outcome value='network-policy'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3418.566665649414,\r
-        "y": 524.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3353.3333282470703,\r
+        "y": 540.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "3a3c2a70.68a7ee"\r
+                "d0adfe64.da86a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a3c2a70.68a7ee",\r
+        "id": "d0adfe64.da86a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3595.5665435791016,\r
-        "y": 517.5665435791016,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3530.333206176758,\r
+        "y": 533.3332214355469,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "e9454f9d.caf03",\r
-                "6d43a86.3d48758"\r
+                "d9045bb1.a62d4",\r
+                "d7d4dfac.f8ef88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9454f9d.caf03",\r
+        "id": "d9045bb1.a62d4",\r
         "type": "set",\r
         "name": "set the 1st network-policy-id",\r
         "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 3838.5665435791016,\r
-        "y": 474.56654357910156,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3773.333206176758,\r
+        "y": 490.3332214355469,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6d43a86.3d48758",\r
+        "id": "d7d4dfac.f8ef88",\r
         "type": "save",\r
         "name": "get network-policy from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3827.5665435791016,\r
-        "y": 529.5665435791016,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3762.333206176758,\r
+        "y": 545.3332214355469,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "8a364a72.424c28",\r
-                "fd07ec43.4387a",\r
-                "4d3c4393.f4c224"\r
+                "641b6dc1.ae62a4",\r
+                "e8473ac4.f5e678",\r
+                "d854cd7f.05151"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d3c4393.f4c224",\r
+        "id": "d854cd7f.05151",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4080.566665649414,\r
-        "y": 415.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4015.3333282470703,\r
+        "y": 431.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "8a48cdf4.281a78"\r
+                "d89f7cfd.a998c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8a48cdf4.281a78",\r
+        "id": "d89f7cfd.a998c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4229.138198852539,\r
-        "y": 415.85243225097656,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4163.904861450195,\r
+        "y": 431.6191101074219,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "81c305db.010dc",\r
+        "id": "40195b62.cb5874",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 4228.075698852539,\r
-        "y": 459.99269104003906,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4162.842361450195,\r
+        "y": 475.7593688964844,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fd07ec43.4387a",\r
+        "id": "e8473ac4.f5e678",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4069.075698852539,\r
-        "y": 459.99269104003906,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4003.8423614501953,\r
+        "y": 475.7593688964844,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "81c305db.010dc"\r
+                "40195b62.cb5874"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8a364a72.424c28",\r
+        "id": "641b6dc1.ae62a4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4076.075698852539,\r
-        "y": 538.9926910400391,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4010.8423614501953,\r
+        "y": 554.7593688964844,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "41b3b67d.c6f8e8"\r
+                "cfb2b016.ca50d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41b3b67d.c6f8e8",\r
+        "id": "cfb2b016.ca50d",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4215.075698852539,\r
-        "y": 538.9926910400391,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4149.842361450195,\r
+        "y": 554.7593688964844,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "f0091688.66654",\r
-                "4f7a1356.449274"\r
+                "4e1d40ab.8f7c48",\r
+                "6ab22d0b.607efc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0091688.66654",\r
+        "id": "4e1d40ab.8f7c48",\r
         "type": "set",\r
         "name": "set the max bandwidth",\r
         "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
         "comments": "",\r
-        "x": 4420.566665649414,\r
-        "y": 536.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4355.33332824707,\r
+        "y": 552.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6ff01134.d27b1",\r
+        "id": "77da836c.7c453c",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4942.566665649414,\r
-        "y": 718.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4877.33332824707,\r
+        "y": 734.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "39467319.609964",\r
-                "3cc969fb.c20abe"\r
+                "f644ca88.cc84",\r
+                "e4420296.1dde4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3cc969fb.c20abe",\r
+        "id": "e4420296.1dde4",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5165.566665649414,\r
-        "y": 704.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5100.33332824707,\r
+        "y": 720.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "2dfb867b.202c62"\r
+                "1b75d3d5.946174"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39467319.609964",\r
+        "id": "f644ca88.cc84",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5167.566665649414,\r
-        "y": 737.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5102.33332824707,\r
+        "y": 753.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "fb83e9be.2efe"\r
+                "ccf559e8.ec486"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fb83e9be.2efe",\r
+        "id": "ccf559e8.ec486",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 5310.566665649414,\r
-        "y": 734.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5245.33332824707,\r
+        "y": 750.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2dfb867b.202c62",\r
+        "id": "1b75d3d5.946174",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5313.566665649414,\r
-        "y": 697.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5248.33332824707,\r
+        "y": 713.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "15d7491f.df8677",\r
-                "965ca101.13418"\r
+                "a48b4f87.115f58",\r
+                "eae40c98.29734"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15d7491f.df8677",\r
+        "id": "a48b4f87.115f58",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",\r
         "comments": "",\r
-        "x": 5475.566665649414,\r
-        "y": 692.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5410.33332824707,\r
+        "y": 708.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "abe40e95.5db908",\r
+        "id": "e46caf0e.563478",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4956.566665649414,\r
-        "y": 1555.5665435791016,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4891.33332824707,\r
+        "y": 1571.3332214355469,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "d51c262f.477ec",\r
-                "4509355c.99159c"\r
+                "970472a2.405aa8",\r
+                "224c4d4.84eea32"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4509355c.99159c",\r
+        "id": "224c4d4.84eea32",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5179.566665649414,\r
-        "y": 1541.5665435791016,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5114.33332824707,\r
+        "y": 1557.3332214355469,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "d6d3b9d3.95749"\r
+                "1f5eda96.09790d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d51c262f.477ec",\r
+        "id": "970472a2.405aa8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5181.566665649414,\r
-        "y": 1574.5665435791016,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5116.33332824707,\r
+        "y": 1590.3332214355469,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "41fb7895.687548"\r
+                "66cb0f3.6d8da7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41fb7895.687548",\r
+        "id": "66cb0f3.6d8da7",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 5324.566665649414,\r
-        "y": 1571.5665435791016,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5259.33332824707,\r
+        "y": 1587.3332214355469,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d6d3b9d3.95749",\r
+        "id": "1f5eda96.09790d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5327.566665649414,\r
-        "y": 1534.5665435791016,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5262.33332824707,\r
+        "y": 1550.3332214355469,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "dc31fe9c.b39df",\r
-                "22e60879.c39a9"\r
+                "a035c695.e5c6c8",\r
+                "ce893d50.59c348"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dc31fe9c.b39df",\r
+        "id": "a035c695.e5c6c8",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",\r
         "comments": "",\r
-        "x": 5521.566665649414,\r
-        "y": 1537.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5456.33332824707,\r
+        "y": 1553.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dd074b01.699d5",\r
+        "id": "74df18ed.a4e518",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "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' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1119.566665649414,\r
-        "y": 241.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1054.3333282470703,\r
+        "y": 257.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "71b17710.70c14",\r
+        "id": "2078a502.9da27a",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5589.566665649414,\r
-        "y": 1288.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5524.33332824707,\r
+        "y": 1304.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "262b12c7.d4eb86"\r
+                "34f7a0cd.8f1da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "262b12c7.d4eb86",\r
+        "id": "34f7a0cd.8f1da",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5795.566665649414,\r
-        "y": 1288.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5730.33332824707,\r
+        "y": 1304.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "5944b4c4.a90d9c"\r
+                "9675c47c.3f1e28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5944b4c4.a90d9c",\r
+        "id": "9675c47c.3f1e28",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6010.852310180664,\r
-        "y": 1288.388442993164,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5945.61897277832,\r
+        "y": 1304.1551208496094,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "97ca4a46.233f6"\r
+                "c3bcfe29.7893b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "97ca4a46.233f6",\r
+        "id": "c3bcfe29.7893b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 6217.683853149414,\r
-        "y": 1288.906997680664,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6152.45051574707,\r
+        "y": 1304.6736755371094,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "18a90b5a.512eed",\r
-                "9b9213f3.dfc428",\r
-                "21506293.2b15d6"\r
+                "69e0123c.36df34",\r
+                "c9b70802.7fae28",\r
+                "bff980ae.51a118"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18a90b5a.512eed",\r
+        "id": "69e0123c.36df34",\r
         "type": "set",\r
         "name": "set source ttp-id",\r
         "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 6432.683853149414,\r
-        "y": 1250.906997680664,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6367.45051574707,\r
+        "y": 1266.6736755371094,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9b9213f3.dfc428",\r
+        "id": "c9b70802.7fae28",\r
         "type": "get-resource",\r
         "name": "get-resource src TTP",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6429.683853149414,\r
-        "y": 1289.906997680664,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6364.45051574707,\r
+        "y": 1305.6736755371094,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "8cbab548.0454b"\r
+                "f008b798.fbfc48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21506293.2b15d6",\r
+        "id": "bff980ae.51a118",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 6385.183853149414,\r
-        "y": 1331.906997680664,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6319.95051574707,\r
+        "y": 1347.6736755371094,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8cbab548.0454b",\r
+        "id": "f008b798.fbfc48",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6610.183853149414,\r
-        "y": 1288.906997680664,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6544.95051574707,\r
+        "y": 1304.6736755371094,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "326ba546.7f7e7a"\r
+                "d5a58693.57d22"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "326ba546.7f7e7a",\r
+        "id": "d5a58693.57d22",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 6768.183853149414,\r
-        "y": 1288.906997680664,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6702.95051574707,\r
+        "y": 1304.6736755371094,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "49cced3d.6f7764"\r
+                "396517b4.b44f88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49cced3d.6f7764",\r
+        "id": "396517b4.b44f88",\r
         "type": "set",\r
         "name": "set source tunnel tp ip",\r
         "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",\r
         "comments": "",\r
-        "x": 6975.183853149414,\r
-        "y": 1288.906997680664,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6909.95051574707,\r
+        "y": 1304.6736755371094,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7bc8d59f.6d2444",\r
+        "id": "a9a1085f.9d214",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5586.566665649414,\r
-        "y": 2157.5667877197266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5521.33332824707,\r
+        "y": 2173.333465576172,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "8f6d6d5b.1cead8"\r
+                "a77b3a4c.0b52a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f6d6d5b.1cead8",\r
+        "id": "a77b3a4c.0b52a",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5792.566665649414,\r
-        "y": 2157.5667877197266,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5727.33332824707,\r
+        "y": 2173.333465576172,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "e19b436a.7033d"\r
+                "db3ff85.e969d08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e19b436a.7033d",\r
+        "id": "db3ff85.e969d08",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6007.852310180664,\r
-        "y": 2157.3885650634766,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5942.61897277832,\r
+        "y": 2173.155242919922,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "bec0ab0f.3e04c8"\r
+                "9bb2d2a8.a44c98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bec0ab0f.3e04c8",\r
+        "id": "9bb2d2a8.a44c98",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 6214.683853149414,\r
-        "y": 2157.9071197509766,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6149.45051574707,\r
+        "y": 2173.673797607422,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "27fbcba1.3d3b74",\r
-                "ceb087f2.f1a2d",\r
-                "f5af142d.56f9a8"\r
+                "c3db954c.458008",\r
+                "bccacc6d.699c5",\r
+                "cc6698ed.a3038"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27fbcba1.3d3b74",\r
+        "id": "c3db954c.458008",\r
         "type": "set",\r
         "name": "set destination ttp-id",\r
         "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 6429.683853149414,\r
-        "y": 2119.9071197509766,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6364.45051574707,\r
+        "y": 2135.673797607422,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ceb087f2.f1a2d",\r
+        "id": "bccacc6d.699c5",\r
         "type": "get-resource",\r
         "name": "get-resource src TTP",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6426.683853149414,\r
-        "y": 2158.9071197509766,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6361.45051574707,\r
+        "y": 2174.673797607422,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "3dd2b911.678516"\r
+                "534b81c9.17a2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5af142d.56f9a8",\r
+        "id": "cc6698ed.a3038",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 6382.183853149414,\r
-        "y": 2200.9071197509766,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6316.95051574707,\r
+        "y": 2216.673797607422,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3dd2b911.678516",\r
+        "id": "534b81c9.17a2c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6607.183853149414,\r
-        "y": 2157.9071197509766,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6541.95051574707,\r
+        "y": 2173.673797607422,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "2d748944.5ecffe"\r
+                "faa75b91.1af87"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d748944.5ecffe",\r
+        "id": "faa75b91.1af87",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 6765.183853149414,\r
-        "y": 2157.9071197509766,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6699.95051574707,\r
+        "y": 2173.673797607422,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "6570963f.999c3"\r
+                "ba3c4c7d.18cfc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6570963f.999c3",\r
+        "id": "ba3c4c7d.18cfc",\r
         "type": "set",\r
         "name": "set destination tunnel tp ip",\r
         "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",\r
         "comments": "",\r
-        "x": 6972.183853149414,\r
-        "y": 2157.9071197509766,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6906.95051574707,\r
+        "y": 2173.673797607422,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "965ca101.13418",\r
+        "id": "eae40c98.29734",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5502.566665649414,\r
-        "y": 764.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5437.33332824707,\r
+        "y": 780.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "50b56074.398fb8",\r
-                "37713986.ac02f6",\r
-                "9d9c191d.f7c08"\r
+                "6fc687f8.9a3218",\r
+                "d8b6607b.4ee438",\r
+                "5c6d770a.c0fbc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50b56074.398fb8",\r
+        "id": "6fc687f8.9a3218",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5698.066787719727,\r
-        "y": 716.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5632.833450317383,\r
+        "y": 732.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "e3c2a355.360d3"\r
+                "ee2e2b2e.648d3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37713986.ac02f6",\r
+        "id": "d8b6607b.4ee438",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5690.066787719727,\r
-        "y": 771.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5624.833450317383,\r
+        "y": 787.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "f545ca2e.f44db"\r
+                "7003cbf4.1f7a3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d9c191d.f7c08",\r
+        "id": "5c6d770a.c0fbc8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5695.066787719727,\r
-        "y": 828.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5629.833450317383,\r
+        "y": 844.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "e48b21a8.d61508"\r
+                "4cd59828.2f4188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e48b21a8.d61508",\r
+        "id": "4cd59828.2f4188",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5847.066787719727,\r
-        "y": 829.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5781.833450317383,\r
+        "y": 845.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f545ca2e.f44db",\r
+        "id": "7003cbf4.1f7a3c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5858.066787719727,\r
-        "y": 774.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5792.833450317383,\r
+        "y": 790.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e3c2a355.360d3",\r
+        "id": "ee2e2b2e.648d3",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5842.449111938477,\r
-        "y": 714.2223358154297,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5777.215774536133,\r
+        "y": 729.989013671875,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "206fadad.185672"\r
+                "76f14509.f7c67c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "16b234e1.30a8c3",\r
+        "id": "85f22617.8c77a",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6424.566665649414,\r
-        "y": 732.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6359.33332824707,\r
+        "y": 748.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "e787bf98.1dda3"\r
+                "ee84357b.71ae88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e787bf98.1dda3",\r
+        "id": "ee84357b.71ae88",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 6601.566665649414,\r
-        "y": 724.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6536.33332824707,\r
+        "y": 740.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "71a48553.06547c",\r
-                "92b1873d.551bc"\r
+                "cd9128cb.f1f28",\r
+                "e38e7099.4c1268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "206fadad.185672",\r
+        "id": "76f14509.f7c67c",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6026.566665649414,\r
-        "y": 728.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5961.33332824707,\r
+        "y": 744.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "69c3e96a.358898"\r
+                "c8a88cd4.d8034"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69c3e96a.358898",\r
+        "id": "c8a88cd4.d8034",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6221.566665649414,\r
-        "y": 728.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6156.33332824707,\r
+        "y": 744.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "16b234e1.30a8c3",\r
-                "90deb9f8.a72b18"\r
+                "85f22617.8c77a",\r
+                "bf124b63.5099c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "71a48553.06547c",\r
+        "id": "cd9128cb.f1f28",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainA id",\r
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 6839.566665649414,\r
-        "y": 679.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6774.33332824707,\r
+        "y": 695.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3b96c7df.05e2",\r
+        "id": "60adc82e.ec907",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 7019.566665649414,\r
-        "y": 722.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6954.33332824707,\r
+        "y": 738.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "6f8ea6fb.24df1"\r
+                "dbbdd720.ee73d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1eec19a2.07645e",\r
+        "id": "ef6befb7.25ec38",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 7011.566665649414,\r
-        "y": 777.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6946.33332824707,\r
+        "y": 793.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "91f5de57.10361"\r
+                "3ad0c537.936882"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b1213bca.c3532",\r
+        "id": "2514309d.ea219",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 7016.566665649414,\r
-        "y": 834.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6951.33332824707,\r
+        "y": 850.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "62327f7e.aacf68"\r
+                "2203278b.ee8d48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62327f7e.aacf68",\r
+        "id": "2203278b.ee8d48",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 7168.566665649414,\r
-        "y": 835.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 7103.33332824707,\r
+        "y": 851.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "91f5de57.10361",\r
+        "id": "3ad0c537.936882",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 7179.566665649414,\r
-        "y": 780.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 7114.33332824707,\r
+        "y": 796.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6f8ea6fb.24df1",\r
+        "id": "dbbdd720.ee73d",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 7163.948989868164,\r
-        "y": 720.2223358154297,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 7098.71565246582,\r
+        "y": 735.989013671875,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "10e59332.2edbc5"\r
+                "3a2f5b08.ae9d74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "10e59332.2edbc5",\r
+        "id": "3a2f5b08.ae9d74",\r
         "type": "set",\r
         "name": "set controller domainA data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.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",\r
         "comments": "",\r
-        "x": 7378.566665649414,\r
-        "y": 716.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 7313.33332824707,\r
+        "y": 732.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "22e60879.c39a9",\r
+        "id": "ce893d50.59c348",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5543.566665649414,\r
-        "y": 1605.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5478.33332824707,\r
+        "y": 1621.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "3be38b30.4b1f64",\r
-                "53e462a7.300ecc",\r
-                "be7dfbd6.3bfbb"\r
+                "11d6f276.27b5f6",\r
+                "da24ed5d.ec28b8",\r
+                "60f19c6c.a06434"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3be38b30.4b1f64",\r
+        "id": "11d6f276.27b5f6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5739.066787719727,\r
-        "y": 1557.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5673.833450317383,\r
+        "y": 1573.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "3d4c22c4.8bc33e"\r
+                "888d9251.ae059"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "53e462a7.300ecc",\r
+        "id": "da24ed5d.ec28b8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5731.066787719727,\r
-        "y": 1612.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5665.833450317383,\r
+        "y": 1628.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "cc499006.fb3a6"\r
+                "6f593c1a.aa4654"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "be7dfbd6.3bfbb",\r
+        "id": "60f19c6c.a06434",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5736.066787719727,\r
-        "y": 1669.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5670.833450317383,\r
+        "y": 1685.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "95cfda12.13aa08"\r
+                "9d43ea5b.7c699"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "95cfda12.13aa08",\r
+        "id": "9d43ea5b.7c699",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5888.066787719727,\r
-        "y": 1670.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5822.833450317383,\r
+        "y": 1686.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cc499006.fb3a6",\r
+        "id": "6f593c1a.aa4654",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5899.066787719727,\r
-        "y": 1615.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5833.833450317383,\r
+        "y": 1631.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3d4c22c4.8bc33e",\r
+        "id": "888d9251.ae059",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5883.449111938477,\r
-        "y": 1555.2223358154297,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5818.215774536133,\r
+        "y": 1570.989013671875,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "7d552eed.53cb2"\r
+                "ca25d5e8.786f18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ebd5273.de974c",\r
+        "id": "ad6fdb4e.87cfb",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6465.566665649414,\r
-        "y": 1573.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6400.33332824707,\r
+        "y": 1589.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "d2cb326b.2ce928"\r
+                "4ceff195.e94608"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d2cb326b.2ce928",\r
+        "id": "4ceff195.e94608",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 6642.566665649414,\r
-        "y": 1565.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6577.33332824707,\r
+        "y": 1581.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "afdd7500.c5c358",\r
-                "995d487d.d5b57"\r
+                "d9a17cf0.5ffca8",\r
+                "76506084.c842f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d552eed.53cb2",\r
+        "id": "ca25d5e8.786f18",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6067.566665649414,\r
-        "y": 1569.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6002.33332824707,\r
+        "y": 1585.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "6d34d717.589238"\r
+                "52693a86.8017bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d34d717.589238",\r
+        "id": "52693a86.8017bc",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6262.566665649414,\r
-        "y": 1569.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6197.33332824707,\r
+        "y": 1585.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "6ebd5273.de974c",\r
-                "9bbf0d49.94213"\r
+                "ad6fdb4e.87cfb",\r
+                "6c3438b4.5be28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "995d487d.d5b57",\r
+        "id": "76506084.c842f8",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6850.566665649414,\r
-        "y": 1572.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6785.33332824707,\r
+        "y": 1588.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "bb91f7ce.3ad978",\r
-                "8e3f2e93.c1d45",\r
-                "c8e3caf1.3f9eb8"\r
+                "aefba90d.b82758",\r
+                "3df8e74b.556d28",\r
+                "a16ee96.560b218"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "afdd7500.c5c358",\r
+        "id": "d9a17cf0.5ffca8",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainB id",\r
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 6880.566665649414,\r
-        "y": 1520.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6815.33332824707,\r
+        "y": 1536.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bb91f7ce.3ad978",\r
+        "id": "aefba90d.b82758",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 7060.566665649414,\r
-        "y": 1563.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6995.33332824707,\r
+        "y": 1579.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "ced1d2ca.c0f7c"\r
+                "3639d79a.d4db38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e3f2e93.c1d45",\r
+        "id": "3df8e74b.556d28",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 7052.566665649414,\r
-        "y": 1618.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6987.33332824707,\r
+        "y": 1634.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "20b91ac9.f7bb0e"\r
+                "185761cf.ebd5ee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8e3caf1.3f9eb8",\r
+        "id": "a16ee96.560b218",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 7057.566665649414,\r
-        "y": 1675.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6992.33332824707,\r
+        "y": 1691.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "625c69e0.19da8"\r
+                "6f08e25f.8ff0f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "625c69e0.19da8",\r
+        "id": "6f08e25f.8ff0f4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 7209.566665649414,\r
-        "y": 1676.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 7144.33332824707,\r
+        "y": 1692.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "20b91ac9.f7bb0e",\r
+        "id": "185761cf.ebd5ee",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 7220.566665649414,\r
-        "y": 1621.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 7155.33332824707,\r
+        "y": 1637.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ced1d2ca.c0f7c",\r
+        "id": "3639d79a.d4db38",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 7204.948989868164,\r
-        "y": 1561.2223358154297,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 7139.71565246582,\r
+        "y": 1576.989013671875,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "483f20c0.02d49"\r
+                "27770afe.2fe37e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "483f20c0.02d49",\r
+        "id": "27770afe.2fe37e",\r
         "type": "set",\r
         "name": "set controller domainB data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.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",\r
         "comments": "",\r
-        "x": 7419.566665649414,\r
-        "y": 1557.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 7354.33332824707,\r
+        "y": 1573.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "24772c6a.a8483c",\r
+        "id": "b6502203.02c108",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 416.56666564941406,\r
-        "y": 686.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 351.3333282470703,\r
+        "y": 702.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "3dd61cc7.9b7d74",\r
-                "99ef6a45.9ad878"\r
+                "ae72f64.7ced288",\r
+                "d8bf1877.11fa58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3dd61cc7.9b7d74",\r
+        "id": "ae72f64.7ced288",\r
         "type": "for",\r
         "name": "for each allotted-resource relationship",\r
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 862.5666656494141,\r
-        "y": 545.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 797.3333282470703,\r
+        "y": 561.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "51cf951b.e925c4"\r
+                "56a6a6ce.1c9e38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "51cf951b.e925c4",\r
+        "id": "56a6a6ce.1c9e38",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3227.566665649414,\r
-        "y": 527.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3162.3333282470703,\r
+        "y": 543.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "2bf740bc.b587b"\r
+                "a15de96b.529998"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90deb9f8.a72b18",\r
+        "id": "bf124b63.5099c",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6427.566665649414,\r
-        "y": 806.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6362.33332824707,\r
+        "y": 822.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "d620e654.6255c"\r
+                "cf9d9db9.ed34d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d620e654.6255c",\r
+        "id": "cf9d9db9.ed34d8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 6604.566665649414,\r
-        "y": 798.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6539.33332824707,\r
+        "y": 814.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "4397af3f.dc85e"\r
+                "e093ed3f.1bfe98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4397af3f.dc85e",\r
+        "id": "e093ed3f.1bfe98",\r
         "type": "set",\r
         "name": "set domainA ethernet layer network-id",\r
         "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 6839.566665649414,\r
-        "y": 922.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6774.33332824707,\r
+        "y": 938.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40a79108.ee4848",\r
+        "id": "f8b7be24.4e873",\r
         "type": "set",\r
         "name": "set domainB ethernet layer network-id",\r
         "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 6879.566665649414,\r
-        "y": 1762.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6814.33332824707,\r
+        "y": 1778.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "607a3e65.d46208",\r
+        "id": "796da710.8b0ab8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 6644.566665649414,\r
-        "y": 1638.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6579.33332824707,\r
+        "y": 1654.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "40a79108.ee4848"\r
+                "f8b7be24.4e873"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9bbf0d49.94213",\r
+        "id": "6c3438b4.5be28",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6467.566665649414,\r
-        "y": 1646.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6402.33332824707,\r
+        "y": 1662.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "607a3e65.d46208"\r
+                "796da710.8b0ab8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f7a1356.449274",\r
+        "id": "6ab22d0b.607efc",\r
         "type": "set",\r
         "name": "set the max bandwidth",\r
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
         "comments": "",\r
-        "x": 4419.566665649414,\r
-        "y": 582.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4354.33332824707,\r
+        "y": 598.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d1460a52.2dc398",\r
+        "id": "45cbb167.26c3e8",\r
         "type": "execute",\r
         "name": "execute UUID generator for ethernet-service-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4441.566665649414,\r
-        "y": 717.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4376.33332824707,\r
+        "y": 733.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "96f11e74.5cf9",\r
+        "id": "586bfbbd.46cc14",\r
         "type": "execute",\r
         "name": "execute UUID generator for otn-tunnel-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4422.566665649414,\r
-        "y": 767.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4357.33332824707,\r
+        "y": 783.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f0cde51e.fc048",\r
+        "id": "5c997953.c5b528",\r
         "type": "for",\r
         "name": "for each allotted-resource",\r
         "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2032.566665649414,\r
-        "y": 315.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1967.3333282470703,\r
+        "y": 331.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "fe22e044.99d4c8",\r
-                "103cc7a8.7e9b88"\r
+                "e42627f6.b8767",\r
+                "b14c900.06de0f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe22e044.99d4c8",\r
+        "id": "e42627f6.b8767",\r
         "type": "set",\r
         "name": "set the current allotted-resource-id",\r
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 2297.566665649414,\r
-        "y": 238.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2232.3333282470703,\r
+        "y": 254.33334350585938,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7c9d6be0.59e3fc",\r
+        "id": "9446dea5.335408",\r
         "type": "set",\r
         "name": "set query_param",\r
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",\r
         "comments": "",\r
-        "x": 4339.566665649414,\r
-        "y": 2217.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4274.33332824707,\r
+        "y": 2233.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5f01b0d6.663678",\r
+        "id": "adfb9d4f.ef8fd8",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value='' />\n<parameter name='domain-A.node-id' value='' />\n<parameter name='domain-A.network-id' value=\"\" />\n<parameter name='domain-A.provider-id' value=\"\" />\n<parameter name='domain-A.client-id' value=\"\" />\n<parameter name='domain-A.te-topo-id' value=\"\" />\n<parameter name='domain-A.network-type' value=\"\" />\n<parameter name='domain-A.ltpId' value=\"\" />\n<parameter name='tmp.domain-A.network-id' value=\"\" />\n<parameter name='tmp.domain-A.ttp-id' value=\"\" />\n<parameter name='network-route-A' value=\"\" />\n<!--<parameter name='domain-A.' value=\"\" />-->\n\n<parameter name='request-id' value='' />\n<parameter name='otn-source-node' value='' />\n<parameter name='otn-dest-node' value='' />\n<parameter name='bw-odu' value=\"\" />\n<parameter name='src-ttp-id' value='' />\n<parameter name='dst-ttp-id' value='' />\n\n<parameter name='domain-B.tunnel-tp-id' value='' />\n<parameter name='domain-B.node-id' value='' />\n<parameter name='domain-B.network-id' value=\"\" />\n<parameter name='domain-B.provider-id' value=\"\" />\n<parameter name='domain-B.client-id' value=\"\" />\n<parameter name='domain-B.te-topo-id' value=\"\" />\n<parameter name='domain-B.network-type' value=\"\" />\n<parameter name='domain-B.ltpId' value=\"\" />\n<parameter name='tmp.domain-B.network-id' value=\"\" />\n<parameter name='tmp.domain-B.ttp-id' value=\"\" />\n<parameter name='network-route-B' value=\"\" />\n<!--<parameter name='domain-B.' value=\"\" />-->\n\n\n\n\n\n",\r
         "comments": "",\r
-        "x": 4322.566665649414,\r
-        "y": 3975.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4257.33332824707,\r
+        "y": 3991.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "32dd1d69.d1982a",\r
+        "id": "2a7b5024.c32ac8",\r
         "type": "set",\r
         "name": "set new ethernet-service-name",\r
         "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",\r
         "comments": "",\r
-        "x": 4379.566665649414,\r
-        "y": 812.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4314.33332824707,\r
+        "y": 828.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fefb165c.6d9d48",\r
+        "id": "e65eb704.1a5ee",\r
         "type": "for",\r
         "name": "for vidx..tmp.otninfo_length[]",\r
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4368.566665649414,\r
-        "y": 2457.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4303.33332824707,\r
+        "y": 2473.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "15c5a249.e6ba26"\r
+                "70d68732.b14c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1531085f.c55ba",\r
+        "id": "9fe431f7.1a7068",\r
         "type": "save",\r
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5496.566665649414,\r
-        "y": 2964.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5431.33332824707,\r
+        "y": 2980.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "fcadaec7.4e387"\r
+                "9da9527c.fe7dd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "24f90323.65c334",\r
+        "id": "36a781af.2ddb3e",\r
         "type": "save",\r
         "name": "save connectivity-A relationship to vpn-binding-A, in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6069.066665649414,\r
-        "y": 3068.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6003.83332824707,\r
+        "y": 3084.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fcadaec7.4e387",\r
+        "id": "9da9527c.fe7dd",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5802.566665649414,\r
-        "y": 2963.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5737.33332824707,\r
+        "y": 2979.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "47fc66cf.f2219"\r
+                "3d5ff1a1.a7195e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "47fc66cf.f2219",\r
+        "id": "3d5ff1a1.a7195e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6012.066665649414,\r
-        "y": 2963.820571899414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5946.83332824707,\r
+        "y": 2979.5872497558594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e4910759.e9a85",\r
+        "id": "dfe4a3e1.5f7a28",\r
         "type": "execute",\r
         "name": "execute UUID generator for vpn-binding $otnidx",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5532.566665649414,\r
-        "y": 2428.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5467.33332824707,\r
+        "y": 2444.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "19efb26.3a5054e",\r
+        "id": "d4a2c427.226738",\r
         "type": "switchNode",\r
         "name": "switch otnidx == 0",\r
         "xml": "<switch test='`$otnidx == 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5405.566665649414,\r
-        "y": 3081.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5340.33332824707,\r
+        "y": 3097.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "6ac91bae.a4e2fc",\r
-                "f696dd3e.08c3d"\r
+                "e5869a7d.a035e8",\r
+                "4f7fb15.bbc855"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ac91bae.a4e2fc",\r
+        "id": "e5869a7d.a035e8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5588.566665649414,\r
-        "y": 3081.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5523.33332824707,\r
+        "y": 3097.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "5559f5ba.2a16b4"\r
+                "11b27338.362ff5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f696dd3e.08c3d",\r
+        "id": "4f7fb15.bbc855",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5413.566665649414,\r
-        "y": 3228.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5348.33332824707,\r
+        "y": 3244.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "16a87f5a.f1d3a9"\r
+                "5e731523.edaba4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b74045ae.325b78",\r
+        "id": "df75995c.9d6d7",\r
         "type": "switchNode",\r
         "name": "switch otnidx == last",\r
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5754.566665649414,\r
-        "y": 3309.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5689.33332824707,\r
+        "y": 3325.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "93c212f0.0f2258",\r
-                "d060ce07.272bc8"\r
+                "8d4f5504.9d4348",\r
+                "dc78732e.2c80d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93c212f0.0f2258",\r
+        "id": "8d4f5504.9d4348",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5939.566665649414,\r
-        "y": 3310.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5874.33332824707,\r
+        "y": 3326.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "8ce15cd2.dd2d"\r
+                "48ad14bc.45fb34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d060ce07.272bc8",\r
+        "id": "dc78732e.2c80d8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5958.566665649414,\r
-        "y": 3576.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5893.33332824707,\r
+        "y": 3592.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "1b72857d.e58193"\r
+                "1d8019eb.b8f316"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a4b93978.557f9",\r
+        "id": "c9167223.c48c5",\r
         "type": "save",\r
         "name": "save connectivity-B relationship to vpn-binding-B, in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6369.566665649414,\r
-        "y": 3311.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6304.33332824707,\r
+        "y": 3327.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c7b0c40a.9c6038",\r
+        "id": "82593f3c.44e9a",\r
         "type": "execute",\r
         "name": "execute UUID generator for connectivity domain otnidx",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6443.566665649414,\r
-        "y": 3609.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6378.33332824707,\r
+        "y": 3625.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "689f50a5.dff04",\r
+        "id": "a5aff8c7.dcc0d",\r
         "type": "save",\r
         "name": "save connectivity resource in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='CBS' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='EBS' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6379.566665649414,\r
-        "y": 3660.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6314.33332824707,\r
+        "y": 3676.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "67d0e07e.cd61f8",\r
+        "id": "48179575.56acdc",\r
         "type": "save",\r
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6508.566665649414,\r
-        "y": 3710.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6443.33332824707,\r
+        "y": 3726.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8bcc08c5.9c4d7",\r
+        "id": "4fc515a8.51d2e4",\r
         "type": "comment",\r
         "name": "connectivity has not been created for middle domains, so we have to create one",\r
         "info": "",\r
         "comments": "",\r
-        "x": 6518.566665649414,\r
-        "y": 3553.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6453.33332824707,\r
+        "y": 3569.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "64006ab7.c64d44",\r
+        "id": "c0955063.7c75f",\r
         "type": "save",\r
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6476.566665649414,\r
-        "y": 3769.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6411.33332824707,\r
+        "y": 3785.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1b72857d.e58193",\r
+        "id": "1d8019eb.b8f316",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6115.566665649414,\r
-        "y": 3577.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6050.33332824707,\r
+        "y": 3593.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "c7b0c40a.9c6038",\r
-                "689f50a5.dff04",\r
-                "67d0e07e.cd61f8",\r
-                "64006ab7.c64d44",\r
-                "9642c24b.bc1f8"\r
+                "82593f3c.44e9a",\r
+                "a5aff8c7.dcc0d",\r
+                "48179575.56acdc",\r
+                "c0955063.7c75f",\r
+                "ab63214f.ab52e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15c5a249.e6ba26",\r
+        "id": "70d68732.b14c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4625.566665649414,\r
-        "y": 2457.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4560.33332824707,\r
+        "y": 2473.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "e4910759.e9a85",\r
-                "1531085f.c55ba",\r
-                "19efb26.3a5054e",\r
-                "ad7dc399.bf418",\r
-                "59469467.70a6d4",\r
-                "982e5c66.4703f8",\r
-                "e9c05ada.bb249"\r
+                "dfe4a3e1.5f7a28",\r
+                "9fe431f7.1a7068",\r
+                "d4a2c427.226738",\r
+                "6c1ad513.ca11a4",\r
+                "ddb6267f.2382f",\r
+                "39bce85.43eb118",\r
+                "e250e406.45b0b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b962e9bf.f7ec68",\r
+        "id": "7dffa406.706e6c",\r
         "type": "set",\r
         "name": "set attachment_param domain A",\r
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n\n",\r
         "comments": "",\r
-        "x": 5993.566665649414,\r
-        "y": 3125.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5928.33332824707,\r
+        "y": 3141.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7f4b2d0d.ab9d0c",\r
+        "id": "7214f15c.14004",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode domainA UNI Coloring",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\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=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6046.566665649414,\r
-        "y": 3169.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5981.33332824707,\r
+        "y": 3185.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "d0a8f560.124258",\r
-                "e919fb8f.48aeb"\r
+                "d7742ed9.525e08",\r
+                "f96706f6.1edf38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e919fb8f.48aeb",\r
+        "id": "f96706f6.1edf38",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6317.566665649414,\r
-        "y": 3154.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6252.33332824707,\r
+        "y": 3170.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "408ad253.15a054"\r
+                "70a27353.90bdbc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0a8f560.124258",\r
+        "id": "d7742ed9.525e08",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6315.566879272461,\r
-        "y": 3212.566575050354,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6250.333541870117,\r
+        "y": 3228.3332529067993,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "bfaa06ad.2149c"\r
+                "eb2a823e.260b78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "408ad253.15a054",\r
+        "id": "70a27353.90bdbc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI Coloring for domain A\" />\n",\r
         "comments": "",\r
-        "x": 6457.566913604736,\r
-        "y": 3154.5666666030884,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6392.333576202393,\r
+        "y": 3170.3333444595337,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bfaa06ad.2149c",\r
+        "id": "eb2a823e.260b78",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6463.593925476074,\r
-        "y": 3203.31206035614,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6398.3605880737305,\r
+        "y": 3219.0787382125854,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5559f5ba.2a16b4",\r
+        "id": "11b27338.362ff5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5729.566665649414,\r
-        "y": 3071.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5664.33332824707,\r
+        "y": 3087.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "24f90323.65c334",\r
-                "7f4b2d0d.ab9d0c",\r
-                "b962e9bf.f7ec68"\r
+                "36a781af.2ddb3e",\r
+                "7dffa406.706e6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ce15cd2.dd2d",\r
+        "id": "48ad14bc.45fb34",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6073.566665649414,\r
-        "y": 3311.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6008.33332824707,\r
+        "y": 3327.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "a4b93978.557f9",\r
-                "fc367338.14f248",\r
-                "546374c7.67c9c4"\r
+                "c9167223.c48c5",\r
+                "c8df83a3.bc227"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "546374c7.67c9c4",\r
+        "id": "c8df83a3.bc227",\r
         "type": "set",\r
         "name": "set attachment_param domain B",\r
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n",\r
         "comments": "",\r
-        "x": 6293.566665649414,\r
-        "y": 3355.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6228.33332824707,\r
+        "y": 3371.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fc367338.14f248",\r
+        "id": "d358673f.8a632",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode domainB UNI Coloring",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\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=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6344.566665649414,\r
-        "y": 3399.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6279.33332824707,\r
+        "y": 3415.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "edc516eb.d6818",\r
-                "889681a1.8aebb"\r
+                "c74c0688.e153c8",\r
+                "bbe92e0a.776158"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "889681a1.8aebb",\r
+        "id": "bbe92e0a.776158",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6607.566665649414,\r
-        "y": 3379.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6542.33332824707,\r
+        "y": 3395.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "b62983f6.8b1c68"\r
+                "745303bf.c36e14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "edc516eb.d6818",\r
+        "id": "c74c0688.e153c8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6608.566879272461,\r
-        "y": 3430.566575050354,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6543.333541870117,\r
+        "y": 3446.3332529067993,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "51aaba5d.abae2c"\r
+                "16fe3b7.bef5ac5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b62983f6.8b1c68",\r
+        "id": "745303bf.c36e14",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI coloring for domain B\" />\n",\r
         "comments": "",\r
-        "x": 6747.566913604736,\r
-        "y": 3379.5666666030884,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6682.333576202393,\r
+        "y": 3395.3333444595337,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "51aaba5d.abae2c",\r
+        "id": "16fe3b7.bef5ac5",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6753.593925476074,\r
-        "y": 3428.31206035614,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6688.3605880737305,\r
+        "y": 3444.0787382125854,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9642c24b.bc1f8",\r
+        "id": "ab63214f.ab52e",\r
         "type": "set",\r
         "name": "set attachment_param domain otnidx",\r
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",\r
         "comments": "",\r
-        "x": 6390.566665649414,\r
-        "y": 3829.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6325.33332824707,\r
+        "y": 3845.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "127eaa7a.98449e",\r
+        "id": "758165ab.6ede0c",\r
         "type": "save",\r
         "name": "get all-vpn-bindings from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3709.566665649414,\r
-        "y": 4176.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3644.3333282470703,\r
+        "y": 4192.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "4f7f9fac.fe049",\r
-                "7f9abc32.a826f4",\r
-                "58223279.e77444"\r
+                "342e9d1a.c50cf2",\r
+                "85e441ba.70e1e",\r
+                "cd45d3e5.a8a2f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f7f9fac.fe049",\r
+        "id": "342e9d1a.c50cf2",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3897.566665649414,\r
-        "y": 4189.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3832.3333282470703,\r
+        "y": 4205.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "f21f6a6d.7c0b9"\r
+                "24a9c2eb.e19b9e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7f9abc32.a826f4",\r
+        "id": "85e441ba.70e1e",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3898.057632446289,\r
-        "y": 4235.140701293945,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3832.8242950439453,\r
+        "y": 4250.907379150391,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "5b9e9e7e.bd3fb8"\r
+                "abf9be0d.a5d62"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58223279.e77444",\r
+        "id": "cd45d3e5.a8a2f",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3895.566665649414,\r
-        "y": 4278.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3830.3333282470703,\r
+        "y": 4294.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "81ac9378.5e17c8"\r
+                "5bf5c027.26df9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f21f6a6d.7c0b9",\r
+        "id": "24a9c2eb.e19b9e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4070.566665649414,\r
-        "y": 4187.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4005.3333282470703,\r
+        "y": 4203.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "1562d3ab.607dc4"\r
+                "5543848d.3b0414"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5b9e9e7e.bd3fb8",\r
+        "id": "abf9be0d.a5d62",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4060.6290435791016,\r
-        "y": 4235.42643737793,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3995.395706176758,\r
+        "y": 4251.193115234375,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "81ac9378.5e17c8",\r
+        "id": "5bf5c027.26df9",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 4062.566665649414,\r
-        "y": 4277.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3997.3333282470703,\r
+        "y": 4293.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e781046f.1418e",\r
+        "id": "b32c7a7e.680c18",\r
         "type": "for",\r
         "name": "for vidx..tmp.otninfo_length[]",\r
         "xml": "<for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3698.566665649414,\r
-        "y": 4367.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3633.3333282470703,\r
+        "y": 4383.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "d5bebf9c.374a9"\r
+                "e206a705.651b58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a7536813.9c6d5",\r
+        "id": "aad93e89.0d91f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4508.566665649414,\r
-        "y": 4367.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4443.33332824707,\r
+        "y": 4383.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "a13486f2.279748"\r
+                "aa320024.3f29d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d852a581.272668",\r
+        "id": "371672f7.af2966",\r
         "type": "for",\r
         "name": "for vidx..tmp.otninfo_length[]",\r
         "xml": "<for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4280.566665649414,\r
-        "y": 4367.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4215.33332824707,\r
+        "y": 4383.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "a7536813.9c6d5"\r
+                "aad93e89.0d91f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "35196fa7.3e82b8",\r
+        "id": "b7b629ca.699bf",\r
         "type": "set",\r
         "name": "set providerValue",\r
         "xml": "<set>\n<parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\n<parameter name='found' value='false' />\n\n\n",\r
         "comments": "",\r
-        "x": 5400.566665649414,\r
-        "y": 4134.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5335.33332824707,\r
+        "y": 4150.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1b7fbbc1.fdc524",\r
+        "id": "278fac8.6485754",\r
         "type": "set",\r
         "name": "set",\r
         "xml": "<set>\n<parameter name='testingvalue' value='$tmp.otninfo_length -1' />\n",\r
         "comments": "",\r
-        "x": 5702.566665649414,\r
-        "y": 3260.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5637.33332824707,\r
+        "y": 3276.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "16a87f5a.f1d3a9",\r
+        "id": "5e731523.edaba4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5537.566665649414,\r
-        "y": 3235.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5472.33332824707,\r
+        "y": 3251.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "1b7fbbc1.fdc524",\r
-                "b74045ae.325b78"\r
+                "278fac8.6485754",\r
+                "df75995c.9d6d7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a4aff44.5be78",\r
+        "id": "38f52a4e.84a6be",\r
         "type": "set",\r
         "name": "set tmp.arr",\r
         "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n<parameter name='bwModified' value='false' />\n",\r
         "comments": "",\r
-        "x": 1991.566665649414,\r
-        "y": 265.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1926.3333282470703,\r
+        "y": 281.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1562d3ab.607dc4",\r
+        "id": "5543848d.3b0414",\r
         "type": "for",\r
         "name": "for vpnidx in all-vpn-bindings",\r
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4299.566665649414,\r
-        "y": 4188.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4234.33332824707,\r
+        "y": 4204.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "1d7f1d69.47cb1b"\r
+                "f4fb2913.3f08e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d7f1d69.47cb1b",\r
+        "id": "f4fb2913.3f08e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4514.566665649414,\r
-        "y": 4189.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4449.33332824707,\r
+        "y": 4205.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "25f755d1.b61592"\r
+                "b4dc52fa.e41dc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d5ba3f2.74414c",\r
+        "id": "59decc03.5b792c",\r
         "type": "for",\r
         "name": "for arridx in tmp.arr",\r
         "xml": "<for index='arridx' start='0' end='`$tmp.arr_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5967.566665649414,\r
-        "y": 4109.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5902.33332824707,\r
+        "y": 4125.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "c853cdfd.dbbe38"\r
+                "12c019ee.a843ee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4d44dab.0baa88",\r
+        "id": "97c70d48.16fe38",\r
         "type": "switchNode",\r
         "name": "switch $tmp.arr_length != 0",\r
         "xml": "<switch test='`$tmp.arr_length != 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5433.566665649414,\r
-        "y": 4189.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5368.33332824707,\r
+        "y": 4205.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "62eec498.21eadc",\r
-                "978a0072.3fd11"\r
+                "6bfc5feb.67a1e",\r
+                "f9517302.701ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62eec498.21eadc",\r
+        "id": "6bfc5feb.67a1e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5629.566665649414,\r
-        "y": 4159.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5564.33332824707,\r
+        "y": 4175.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "899efa3b.42e148"\r
+                "8987adcc.4e1008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "978a0072.3fd11",\r
+        "id": "f9517302.701ea",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5630.566665649414,\r
-        "y": 4230.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5565.33332824707,\r
+        "y": 4246.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "214f2c3d.6d899c"\r
+                "35a88f3a.b6ac08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "899efa3b.42e148",\r
+        "id": "8987adcc.4e1008",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5780.566665649414,\r
-        "y": 4157.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5715.33332824707,\r
+        "y": 4173.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "5d5ba3f2.74414c",\r
-                "a601628e.52c128"\r
+                "59decc03.5b792c",\r
+                "6882fe7c.6197e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c853cdfd.dbbe38",\r
+        "id": "12c019ee.a843ee",\r
         "type": "switchNode",\r
         "name": "switch tmp.arr[$arridx] == $providerValue",\r
         "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6258.566665649414,\r
-        "y": 4109.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6193.33332824707,\r
+        "y": 4125.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "32f1af6e.548f98",\r
-                "aa4fe454.7a4ce"\r
+                "e5c18223.e30628",\r
+                "cba25abe.848d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32f1af6e.548f98",\r
+        "id": "e5c18223.e30628",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6533.566665649414,\r
-        "y": 4078.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6468.33332824707,\r
+        "y": 4094.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "811e814b.5875b8"\r
+                "4b465147.34a4b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa4fe454.7a4ce",\r
+        "id": "cba25abe.848d6",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6534.566665649414,\r
-        "y": 4149.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6469.33332824707,\r
+        "y": 4165.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "989bacbe.4af828"\r
+                "ace0f3a2.ba867"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "811e814b.5875b8",\r
+        "id": "4b465147.34a4b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6684.566665649414,\r
-        "y": 4076.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6619.33332824707,\r
+        "y": 4092.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "af4f903c.21f488",\r
-                "2d6d2965.4ae4be",\r
-                "e5b6e917.a4d33",\r
-                "1c32b22d.5aadde",\r
-                "1865add8.1adbe2"\r
+                "2155a1a2.b1abbe",\r
+                "f005c04e.d898a8",\r
+                "4fb6d7b7.ecc78",\r
+                "46824160.b1d988",\r
+                "1e06ac9b.2a6bc3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af4f903c.21f488",\r
+        "id": "2155a1a2.b1abbe",\r
         "type": "set",\r
         "name": "set found to true",\r
         "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",\r
         "comments": "",\r
-        "x": 6872.566665649414,\r
-        "y": 4036.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6807.33332824707,\r
+        "y": 4052.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2d6d2965.4ae4be",\r
+        "id": "f005c04e.d898a8",\r
         "type": "save",\r
         "name": "store $arridx somewhere in vpn-binding",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx`' />\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6944.566665649414,\r
-        "y": 4081.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6879.33332824707,\r
+        "y": 4097.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1865add8.1adbe2",\r
+        "id": "1e06ac9b.2a6bc3",\r
         "type": "set",\r
         "name": "set twoD arr",\r
         "xml": "<set>\n\n<!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\n<!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\n<parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\n\n",\r
         "comments": "",\r
-        "x": 6859.566665649414,\r
-        "y": 4208.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6794.33332824707,\r
+        "y": 4224.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1c32b22d.5aadde",\r
+        "id": "46824160.b1d988",\r
         "type": "set",\r
         "name": "set sizeOfSliceList",\r
         "xml": "<set>\n<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\n\n\n",\r
         "comments": "",\r
-        "x": 6880.566665649414,\r
-        "y": 4144.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6815.33332824707,\r
+        "y": 4160.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "214f2c3d.6d899c",\r
+        "id": "35a88f3a.b6ac08",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5782.566665649414,\r
-        "y": 4230.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5717.33332824707,\r
+        "y": 4246.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "2a37cb43.8a38d4",\r
-                "2a56e17b.8d5c2e"\r
+                "bec1bd98.095008",\r
+                "6bef5837.fb58f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a37cb43.8a38d4",\r
+        "id": "bec1bd98.095008",\r
         "type": "save",\r
         "name": "store $arridx somewhere in vpn-binding",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='0' />\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6037.566665649414,\r
-        "y": 4223.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5972.33332824707,\r
+        "y": 4239.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2a56e17b.8d5c2e",\r
+        "id": "6bef5837.fb58f",\r
         "type": "set",\r
         "name": "set twoD array",\r
         "xml": "<set>\n<parameter name='tmp.arr[0]' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='1' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='1' />\n<parameter name='otn-tunnel-slice[0].list_length' value='1' />\n\n",\r
         "comments": "",\r
-        "x": 5965.566665649414,\r
-        "y": 4270.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5900.33332824707,\r
+        "y": 4286.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a601628e.52c128",\r
+        "id": "6882fe7c.6197e8",\r
         "type": "switchNode",\r
         "name": "switch found?",\r
         "xml": "<switch test='`$found`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5958.566665649414,\r
-        "y": 4154.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5893.33332824707,\r
+        "y": 4170.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "38e10d32.2b93c2",\r
-                "dbcc850c.fc8dd"\r
+                "fe294cd.9421bb",\r
+                "65b4ebb1.845464"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38e10d32.2b93c2",\r
+        "id": "fe294cd.9421bb",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6118.566665649414,\r
-        "y": 4146.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6053.33332824707,\r
+        "y": 4162.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "b21401a.fc6228"\r
+                "e093232d.0ab56"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dbcc850c.fc8dd",\r
+        "id": "65b4ebb1.845464",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6116.566665649414,\r
-        "y": 4183.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6051.33332824707,\r
+        "y": 4199.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "e4683213.00ce18"\r
+                "ab13fab7.3aabe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b21401a.fc6228",\r
+        "id": "e093232d.0ab56",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6243.566665649414,\r
-        "y": 4146.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6178.33332824707,\r
+        "y": 4162.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a2a7d328.f35de8",\r
+        "id": "62438f19.a66048",\r
         "type": "save",\r
         "name": "store $arridx+1 somewhere in vpn-binding",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx + 1`' />\n\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6550.566665649414,\r
-        "y": 4204.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6485.33332824707,\r
+        "y": 4220.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e4683213.00ce18",\r
+        "id": "ab13fab7.3aabe",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6276.566665649414,\r
-        "y": 4191.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6211.33332824707,\r
+        "y": 4207.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "a2a7d328.f35de8",\r
-                "930daebd.33fb78"\r
+                "62438f19.a66048",\r
+                "f4afeb0e.ae0db"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "930daebd.33fb78",\r
+        "id": "f4afeb0e.ae0db",\r
         "type": "set",\r
         "name": "set twoD array",\r
         "xml": "<set>\n<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\n\n",\r
         "comments": "",\r
-        "x": 6467.566665649414,\r
-        "y": 4250.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6402.33332824707,\r
+        "y": 4266.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "989bacbe.4af828",\r
+        "id": "ace0f3a2.ba867",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6667.566665649414,\r
-        "y": 4148.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6602.33332824707,\r
+        "y": 4164.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e5b6e917.a4d33",\r
+        "id": "4fb6d7b7.ecc78",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 6838.566665649414,\r
-        "y": 4275.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6773.33332824707,\r
+        "y": 4291.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad7dc399.bf418",\r
+        "id": "6c1ad513.ca11a4",\r
         "type": "switchNode",\r
         "name": "switch dstPort == NULL",\r
         "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5235.566665649414,\r
-        "y": 2487.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5170.33332824707,\r
+        "y": 2503.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "359b938e.1f1cd4",\r
-                "64d68365.eb604c"\r
+                "e5311d8f.316e3",\r
+                "377e7dc.719a502"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "359b938e.1f1cd4",\r
+        "id": "e5311d8f.316e3",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5624.566665649414,\r
-        "y": 2465.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5559.33332824707,\r
+        "y": 2481.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "73a3115c.3a191"\r
+                "53a0d07b.9ddd2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64d68365.eb604c",\r
+        "id": "377e7dc.719a502",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5625.566665649414,\r
-        "y": 2511.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5560.33332824707,\r
+        "y": 2527.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "40a2bbc1.5980e4"\r
+                "bda8eef7.7834b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73a3115c.3a191",\r
+        "id": "53a0d07b.9ddd2",\r
         "type": "set",\r
         "name": "set access-provider-id and client-id",\r
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n",\r
         "comments": "",\r
-        "x": 5838.566665649414,\r
-        "y": 2464.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5773.33332824707,\r
+        "y": 2480.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40a2bbc1.5980e4",\r
+        "id": "bda8eef7.7834b",\r
         "type": "set",\r
         "name": "set access-provider-id and client-id",\r
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\n",\r
         "comments": "",\r
-        "x": 5836.566665649414,\r
-        "y": 2509.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5771.33332824707,\r
+        "y": 2525.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a13486f2.279748",\r
+        "id": "aa320024.3f29d",\r
         "type": "set",\r
         "name": "set attachment_param sliceG",\r
         "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`\" />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />\n\n\n<parameter name=\"tmp.domainG.restapiUrl\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`\" />\n<parameter name=\"tmp.domainG.restapiUser\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`\" />\n<parameter name=\"tmp.domainG.restapiPassword\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`\" />",\r
         "comments": "",\r
-        "x": 4761.566665649414,\r
-        "y": 4365.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4696.33332824707,\r
+        "y": 4381.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3fa485d1.c8f9c2",\r
+        "id": "582f4b19.cbc35c",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode sliceG creation domainG",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$tmp.domainG.restapiUser`\" />\n<parameter name=\"restapiPassword\" value=\"`tmp.domainG.restapiPassword`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\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=' + $prop.sdncRestApi.token_id`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4346.566665649414,\r
-        "y": 4473.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4281.33332824707,\r
+        "y": 4489.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "f023dd0f.b91278",\r
-                "29f41b43.8a7c44"\r
+                "2ee5af11.6c1e68",\r
+                "dcd2689e.43975"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29f41b43.8a7c44",\r
+        "id": "dcd2689e.43975",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4629.566665649414,\r
-        "y": 4453.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4564.33332824707,\r
+        "y": 4469.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "e71ba272.6cc34"\r
+                "226131b5.dcdb56"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f023dd0f.b91278",\r
+        "id": "2ee5af11.6c1e68",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4630.566879272461,\r
-        "y": 4504.566575050354,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4565.333541870117,\r
+        "y": 4520.333252906799,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "7f431198.b36fd"\r
+                "9a360786.0f7708"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e71ba272.6cc34",\r
+        "id": "226131b5.dcdb56",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing slice creation api for domain A\" />\n",\r
         "comments": "",\r
-        "x": 4769.566913604736,\r
-        "y": 4453.566666603088,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4704.333576202393,\r
+        "y": 4469.333344459534,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7f431198.b36fd",\r
+        "id": "9a360786.0f7708",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4775.593925476074,\r
-        "y": 4502.31206035614,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4710.3605880737305,\r
+        "y": 4518.078738212585,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "59469467.70a6d4",\r
+        "id": "ddb6267f.2382f",\r
         "type": "set",\r
         "name": "set srcdstpnf-name",\r
         "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 5419.566665649414,\r
-        "y": 2607.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5354.33332824707,\r
+        "y": 2623.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "982e5c66.4703f8",\r
+        "id": "39bce85.43eb118",\r
         "type": "get-resource",\r
         "name": "get-resource tmp.srcdstpnf-name",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5463.566665649414,\r
-        "y": 2655.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5398.33332824707,\r
+        "y": 2671.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "48087d37.a26c6c",\r
-                "da051a0e.70b99",\r
-                "11fa1a3.3e28f66"\r
+                "e3200e7d.1b6158",\r
+                "a27bf097.a61688",\r
+                "aed031.10f8e7d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48087d37.a26c6c",\r
+        "id": "e3200e7d.1b6158",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5676.066665649414,\r
-        "y": 2602.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5610.83332824707,\r
+        "y": 2618.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "d7b6e1d4.5db9c8"\r
+                "ec0b5318.bd94a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da051a0e.70b99",\r
+        "id": "a27bf097.a61688",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5688.066665649414,\r
-        "y": 2652.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5622.83332824707,\r
+        "y": 2668.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "8bafac6.5725d5"\r
+                "194dd3a5.9683ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11fa1a3.3e28f66",\r
+        "id": "aed031.10f8e7d",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5679.066665649414,\r
-        "y": 2707.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5613.83332824707,\r
+        "y": 2723.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "1bd627d5.df5018"\r
+                "121802d5.075bad"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1bd627d5.df5018",\r
+        "id": "121802d5.075bad",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5824.066665649414,\r
-        "y": 2706.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5758.83332824707,\r
+        "y": 2722.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8bafac6.5725d5",\r
+        "id": "194dd3a5.9683ac",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5835.066665649414,\r
-        "y": 2649.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5769.83332824707,\r
+        "y": 2665.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d7b6e1d4.5db9c8",\r
+        "id": "ec0b5318.bd94a",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5801.449111938477,\r
-        "y": 2596.2223358154297,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5736.215774536133,\r
+        "y": 2611.989013671875,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "7412b5af.ff0f9c"\r
+                "6ffb5206.ab40dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b52018c.262d56",\r
+        "id": "a75d0b14.3b6cd8",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6360.566665649414,\r
-        "y": 2614.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6295.33332824707,\r
+        "y": 2630.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "691fa48a.848bcc"\r
+                "5ed989fd.7ba3d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "691fa48a.848bcc",\r
+        "id": "5ed989fd.7ba3d8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 6537.566665649414,\r
-        "y": 2606.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6472.33332824707,\r
+        "y": 2622.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "40d861d8.1df158",\r
-                "6005e754.3b403"\r
+                "4b327d9f.7fa68c",\r
+                "a56c9b9d.4b71c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7412b5af.ff0f9c",\r
+        "id": "6ffb5206.ab40dc",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5962.566665649414,\r
-        "y": 2610.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5897.33332824707,\r
+        "y": 2626.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "cee0c51f.59e4e8"\r
+                "157a7f1c.cef0f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cee0c51f.59e4e8",\r
+        "id": "157a7f1c.cef0f9",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6157.566665649414,\r
-        "y": 2610.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6092.33332824707,\r
+        "y": 2626.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "2b52018c.262d56"\r
+                "a75d0b14.3b6cd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6005e754.3b403",\r
+        "id": "a56c9b9d.4b71c",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6745.566665649414,\r
-        "y": 2613.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6680.33332824707,\r
+        "y": 2629.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "ba9890c1.c4a288",\r
-                "659d7a5f.8396d4",\r
-                "c60c2b5.88a3ed8"\r
+                "5942c841.aa6ee8",\r
+                "9c93c9ac.788a48",\r
+                "6429f071.39b59"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40d861d8.1df158",\r
+        "id": "4b327d9f.7fa68c",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainG id",\r
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 6775.566665649414,\r
-        "y": 2561.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6710.33332824707,\r
+        "y": 2577.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ba9890c1.c4a288",\r
+        "id": "5942c841.aa6ee8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6955.566665649414,\r
-        "y": 2604.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6890.33332824707,\r
+        "y": 2620.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "203ebc79.0da80c"\r
+                "f8702def.d95bc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "659d7a5f.8396d4",\r
+        "id": "9c93c9ac.788a48",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6947.566665649414,\r
-        "y": 2659.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6882.33332824707,\r
+        "y": 2675.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "23f5bad7.571c16"\r
+                "440237ad.5da15"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c60c2b5.88a3ed8",\r
+        "id": "6429f071.39b59",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6952.566665649414,\r
-        "y": 2716.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6887.33332824707,\r
+        "y": 2732.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "d78cb5ab.fdf3"\r
+                "2304d14f.3cde06"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d78cb5ab.fdf3",\r
+        "id": "2304d14f.3cde06",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 7104.566665649414,\r
-        "y": 2717.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 7039.33332824707,\r
+        "y": 2733.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "23f5bad7.571c16",\r
+        "id": "440237ad.5da15",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 7115.566665649414,\r
-        "y": 2662.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 7050.33332824707,\r
+        "y": 2678.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "203ebc79.0da80c",\r
+        "id": "f8702def.d95bc8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 7099.948989868164,\r
-        "y": 2602.2223358154297,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 7034.71565246582,\r
+        "y": 2617.989013671875,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "510e20cb.08311"\r
+                "f24381a1.f5a1a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "510e20cb.08311",\r
+        "id": "f24381a1.f5a1a8",\r
         "type": "set",\r
         "name": "set controller domainA data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.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",\r
         "comments": "",\r
-        "x": 7314.566665649414,\r
-        "y": 2598.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 7249.33332824707,\r
+        "y": 2614.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d5bebf9c.374a9",\r
+        "id": "e206a705.651b58",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3930.566665649414,\r
-        "y": 4365.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 3865.3333282470703,\r
+        "y": 4381.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "d852a581.272668",\r
-                "3fa485d1.c8f9c2"\r
+                "371672f7.af2966",\r
+                "582f4b19.cbc35c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9c05ada.bb249",\r
+        "id": "e250e406.45b0b8",\r
         "type": "switchNode",\r
         "name": "switch dmnsidx == 0 (domainA)",\r
         "xml": "<switch test='`$otnidx == 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5433.566665649414,\r
-        "y": 2824.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5368.33332824707,\r
+        "y": 2840.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "e3270b50.ca16b",\r
-                "1493e80e.a20608"\r
+                "7ec634eb.fd12e4",\r
+                "72b43008.da4948"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3270b50.ca16b",\r
+        "id": "7ec634eb.fd12e4",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5634.566665649414,\r
-        "y": 2822.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5569.33332824707,\r
+        "y": 2838.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "8c1f5350.45b238"\r
+                "9a8afed8.5944c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c1f5350.45b238",\r
+        "id": "9a8afed8.5944c",\r
         "type": "set",\r
         "name": "set attachment_param domain A",\r
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",\r
         "comments": "",\r
-        "x": 5848.566665649414,\r
-        "y": 2824.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5783.33332824707,\r
+        "y": 2840.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "efd041d2.1f57c",\r
+        "id": "a2a5b281.9fc21",\r
         "type": "switchNode",\r
         "name": "switch dmnsidx == last (domainB)",\r
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5851.566665649414,\r
-        "y": 2873.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5786.33332824707,\r
+        "y": 2889.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "18ead70f.a7a7d1",\r
-                "86ea5500.031798"\r
+                "51c23d0e.7b05dc",\r
+                "905f334d.4416a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18ead70f.a7a7d1",\r
+        "id": "51c23d0e.7b05dc",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6081.566665649414,\r
-        "y": 2869.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6016.33332824707,\r
+        "y": 2885.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "45ea107a.0ebac8"\r
+                "6e6ce692.530ee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45ea107a.0ebac8",\r
+        "id": "6e6ce692.530ee8",\r
         "type": "set",\r
         "name": "set attachment_param domain B",\r
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",\r
         "comments": "",\r
-        "x": 6295.566665649414,\r
-        "y": 2872.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6230.33332824707,\r
+        "y": 2888.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1493e80e.a20608",\r
+        "id": "72b43008.da4948",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5634.566665649414,\r
-        "y": 2871.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5569.33332824707,\r
+        "y": 2887.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "efd041d2.1f57c"\r
+                "a2a5b281.9fc21"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "86ea5500.031798",\r
+        "id": "905f334d.4416a8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6082.566665649414,\r
-        "y": 2915.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6017.33332824707,\r
+        "y": 2931.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "7828b5dc.b70c4c"\r
+                "17f66f36.7df949"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7828b5dc.b70c4c",\r
+        "id": "17f66f36.7df949",\r
         "type": "set",\r
         "name": "set attachment_param domain G",\r
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",\r
         "comments": "",\r
-        "x": 6296.566665649414,\r
-        "y": 2915.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6231.33332824707,\r
+        "y": 2931.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "72c2b2cc.2ba44c",\r
+        "id": "31ff32a6.490d6e",\r
         "type": "set",\r
         "name": "set tmp.slicevpns",\r
         "xml": "<set>\n<parameter name='`tmp.slicevpns[$tmp.slicevpns_length]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n<parameter name='tmp.slicevpns_length' value=\"`$tmp.slicevpns_length + 1`\" />\n\n<parameter name='`tmp.slicevpnuuids[$prop.vpn-binding-otnidx-uuid]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n\n",\r
         "comments": "",\r
-        "x": 6194.566665649414,\r
-        "y": 2964.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 6129.33332824707,\r
+        "y": 2980.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "25f755d1.b61592",\r
+        "id": "b4dc52fa.e41dc8",\r
         "type": "switchNode",\r
         "name": "switch vpnuuid is for this slice",\r
         "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n    \n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.aai.service-instance.service-instance-id `\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4758.566665649414,\r
-        "y": 4188.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4693.33332824707,\r
+        "y": 4204.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "15207d44.a4310b",\r
-                "179e4c90.1525b3"\r
+                "ddeec6d8.2b66d",\r
+                "ad3e1b09.a7dd3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15207d44.a4310b",\r
+        "id": "ddeec6d8.2b66d",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4975.566665649414,\r
-        "y": 4167.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4910.33332824707,\r
+        "y": 4183.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "64fe7f3a.b5df9"\r
+                "faf87a35.78eb88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "179e4c90.1525b3",\r
+        "id": "ad3e1b09.a7dd3",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4975.566665649414,\r
-        "y": 4216.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4910.33332824707,\r
+        "y": 4232.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "64fe7f3a.b5df9",\r
+        "id": "faf87a35.78eb88",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5143.566665649414,\r
-        "y": 4167.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5078.33332824707,\r
+        "y": 4183.333343505859,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "35196fa7.3e82b8",\r
-                "b4d44dab.0baa88"\r
+                "b7b629ca.699bf",\r
+                "97c70d48.16fe38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "433e887a.5dd2c",\r
+        "id": "b7e06d6e.f371a",\r
         "type": "save",\r
         "name": "get logical-link from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1483.566665649414,\r
-        "y": 798.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1418.3333282470703,\r
+        "y": 814.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "4058fc82.6dfacc",\r
-                "4151c29c.d64b0c",\r
-                "5541a408.f0ed0c"\r
+                "16c2412b.16deaf",\r
+                "ae26bbae.e630b8",\r
+                "e8c1e05c.a0ff5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4058fc82.6dfacc",\r
+        "id": "16c2412b.16deaf",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1696.057632446289,\r
-        "y": 765.1406402587891,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1630.8242950439453,\r
+        "y": 780.9073181152344,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "417a2c30.fd69ac"\r
+                "28aa8e7b.7b6a9a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4151c29c.d64b0c",\r
+        "id": "ae26bbae.e630b8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1684.566665649414,\r
-        "y": 809.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1619.3333282470703,\r
+        "y": 825.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "2fc8bb7d.787cac"\r
+                "d31e63f3.254"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "417a2c30.fd69ac",\r
+        "id": "28aa8e7b.7b6a9a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1844.629165649414,\r
-        "y": 765.4264068603516,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1779.3958282470703,\r
+        "y": 781.1930847167969,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2fc8bb7d.787cac",\r
+        "id": "d31e63f3.254",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1843.566665649414,\r
-        "y": 809.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1778.3333282470703,\r
+        "y": 825.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5541a408.f0ed0c",\r
+        "id": "e8c1e05c.a0ff5",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1689.566665649414,\r
-        "y": 852.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1624.3333282470703,\r
+        "y": 868.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "e145a9c3.48d208"\r
+                "c3b9530.73a28b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e145a9c3.48d208",\r
+        "id": "c3b9530.73a28b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 835.5666656494141,\r
-        "y": 1191.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 770.3333282470703,\r
+        "y": 1207.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "88efa0d6.0c1808"\r
+                "3e859b6c.a626d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88efa0d6.0c1808",\r
+        "id": "3e859b6c.a626d4",\r
         "type": "for",\r
         "name": "for each svc-instance relationship",\r
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1109.566665649414,\r
-        "y": 1191.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1044.3333282470703,\r
+        "y": 1207.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "c2dd1c9b.b3dd48"\r
+                "9fdac28f.05e248"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2dd1c9b.b3dd48",\r
+        "id": "9fdac28f.05e248",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1344.900161743164,\r
-        "y": 1192.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1279.6668243408203,\r
+        "y": 1208.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "e5b1da68.bc54"\r
+                "6b8b4db1.78e19c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5b1da68.bc54",\r
+        "id": "6b8b4db1.78e19c",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 628.5669097900391,\r
-        "y": 1345.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 563.3335723876953,\r
+        "y": 1361.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "fb4c81c8.58ec08"\r
+                "2aa5f521.f24e92"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "68774cff.da4f7c",\r
+        "id": "83814db5.2acc38",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1017.5666656494141,\r
-        "y": 1350.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 952.3333282470703,\r
+        "y": 1366.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "ae979c86.2af0a",\r
-                "c51e116c.9e96e",\r
-                "bc29e653.3cf5f8"\r
+                "f08fdd90.4c3b48",\r
+                "74408ee8.7c8248",\r
+                "bddcb73f.c2f73"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae979c86.2af0a",\r
+        "id": "f08fdd90.4c3b48",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1213.566665649414,\r
-        "y": 1315.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1148.3333282470703,\r
+        "y": 1331.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "323455e1.4146ea"\r
+                "b8ac9b43.4a9818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c51e116c.9e96e",\r
+        "id": "74408ee8.7c8248",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1214.057632446289,\r
-        "y": 1361.1407012939453,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1148.8242950439453,\r
+        "y": 1376.9073791503906,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "bf9be58f.d0c428"\r
+                "dda3b631.5e1b9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc29e653.3cf5f8",\r
+        "id": "bddcb73f.c2f73",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1178.566665649414,\r
-        "y": 1406.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1113.3333282470703,\r
+        "y": 1422.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "dd499616.1dbe"\r
+                "c0397cda.3cd818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bf9be58f.d0c428",\r
+        "id": "dda3b631.5e1b9",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1373.629165649414,\r
-        "y": 1358.4264068603516,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1308.3958282470703,\r
+        "y": 1374.1930847167969,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dd499616.1dbe",\r
+        "id": "c0397cda.3cd818",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1331.566665649414,\r
-        "y": 1408.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1266.3333282470703,\r
+        "y": 1424.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "66825a6f.db4e3c",\r
+        "id": "4d852904.6e1e58",\r
         "type": "switchNode",\r
         "name": "switch loglink-id exists in conn",\r
         "xml": "<switch test='`$tmp.aai.logical-link.link-id == $tmp.aai.connectivity.etht-svc-name`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1606.566665649414,\r
-        "y": 1298.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1541.3333282470703,\r
+        "y": 1314.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "85e80e78.a683f",\r
-                "e9363fe4.4910f8"\r
+                "28fd1bef.755efc",\r
+                "5889d337.e7ce3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "85e80e78.a683f",\r
+        "id": "28fd1bef.755efc",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1817.566665649414,\r
-        "y": 1263.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1752.3333282470703,\r
+        "y": 1279.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "ea49207.e144c6"\r
+                "b34d6866.bc5698"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9363fe4.4910f8",\r
+        "id": "5889d337.e7ce3c",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1814.566665649414,\r
-        "y": 1324.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1749.3333282470703,\r
+        "y": 1340.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a72bfa1e.2c0188",\r
+        "id": "2876f138.d4a73e",\r
         "type": "set",\r
         "name": "set currLinkIsFound",\r
         "xml": "<set>\n<parameter name='currLinkIsFound' value=\"true\" />\n\n\n",\r
         "comments": "",\r
-        "x": 2155.566665649414,\r
-        "y": 1236.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2090.3333282470703,\r
+        "y": 1252.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ea49207.e144c6",\r
+        "id": "b34d6866.bc5698",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1969.566665649414,\r
-        "y": 1264.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1904.3333282470703,\r
+        "y": 1280.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "a72bfa1e.2c0188"\r
+                "2876f138.d4a73e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77625e01.45cfa",\r
+        "id": "6674b61e.a06d68",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 2122.566665649414,\r
-        "y": 1292.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2057.3333282470703,\r
+        "y": 1308.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "747752c5.edcc6c",\r
+        "id": "ee2fec7a.bb72",\r
         "type": "comment",\r
         "name": "currLinkIsFound. Go to the next logical-link",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2127.566665649414,\r
-        "y": 1186.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2062.3333282470703,\r
+        "y": 1202.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fc0b0bdf.af57e8",\r
+        "id": "9653963e.b4d7a8",\r
         "type": "switchNode",\r
         "name": "switch currLinkIsFound",\r
         "xml": "<switch test='`$currLinkIsFound`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1409.566665649414,\r
-        "y": 916.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1344.3333282470703,\r
+        "y": 932.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "ec2c299e.a7094",\r
-                "12a10d8.78ec073"\r
+                "78ad0a60.3340ec",\r
+                "c4221fd4.9cf0f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec2c299e.a7094",\r
+        "id": "78ad0a60.3340ec",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1595.566665649414,\r
-        "y": 895.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1530.3333282470703,\r
+        "y": 911.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "43c18e2d.dbbe18"\r
+                "9a111eaa.a49b48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12a10d8.78ec073",\r
+        "id": "c4221fd4.9cf0f8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1592.566665649414,\r
-        "y": 1031.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1527.3333282470703,\r
+        "y": 1047.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "4dddc413.6cd63c"\r
+                "498e3ba4.cbc914"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43c18e2d.dbbe18",\r
+        "id": "9a111eaa.a49b48",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1837.566665649414,\r
-        "y": 890.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1772.3333282470703,\r
+        "y": 906.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6e81ab2b.cd2004",\r
+        "id": "bd09e3c8.ced5f8",\r
         "type": "comment",\r
         "name": "A new logical-link has been found: modify process should be triggered",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1783.566665649414,\r
-        "y": 994.5666656494141,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1718.3333282470703,\r
+        "y": 1010.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "323455e1.4146ea",\r
+        "id": "b8ac9b43.4a9818",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1377.566665649414,\r
-        "y": 1299.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1312.3333282470703,\r
+        "y": 1315.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "66825a6f.db4e3c",\r
-                "4b0ae75c.1aab4"\r
+                "4d852904.6e1e58",\r
+                "275b774d.5d0718"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b0ae75c.1aab4",\r
+        "id": "275b774d.5d0718",\r
         "type": "switchNode",\r
         "name": "switch connectivityBW == gfp",\r
         "xml": "<switch test='`$tmp.aai.connectivity.bandwidth-profile-name == $gfp`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1607.566665649414,\r
-        "y": 1389.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1542.3333282470703,\r
+        "y": 1405.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "c8e4becf.570ed8",\r
-                "efb821b0.8f5c8"\r
+                "8ffa4f79.ade61",\r
+                "c4dfc850.994ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8e4becf.570ed8",\r
+        "id": "8ffa4f79.ade61",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1812.566665649414,\r
-        "y": 1385.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1747.3333282470703,\r
+        "y": 1401.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "efb821b0.8f5c8",\r
+        "id": "c4dfc850.994ac",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1814.566665649414,\r
-        "y": 1435.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1749.3333282470703,\r
+        "y": 1451.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "35c21580.2c9b32"\r
+                "30c2ae4.1f45052"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd83a72b.0cf5a8",\r
+        "id": "30007844.075cd",\r
         "type": "set",\r
         "name": "set bwModified",\r
         "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",\r
         "comments": "",\r
-        "x": 2163.566665649414,\r
-        "y": 1413.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2098.3333282470703,\r
+        "y": 1429.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "35c21580.2c9b32",\r
+        "id": "30c2ae4.1f45052",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1968.566665649414,\r
-        "y": 1434.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1903.3333282470703,\r
+        "y": 1450.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "fd83a72b.0cf5a8",\r
-                "b1b00645.427888"\r
+                "30007844.075cd",\r
+                "b1f43ea6.58c508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b1b00645.427888",\r
+        "id": "b1f43ea6.58c508",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 988.5666656494141,\r
-        "y": 1639.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 923.3333282470703,\r
+        "y": 1655.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "3c4549a7.0d1376"\r
+                "5f59c5b8.8000ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c4549a7.0d1376",\r
+        "id": "5f59c5b8.8000ec",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1193.566665649414,\r
-        "y": 1639.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1128.3333282470703,\r
+        "y": 1655.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "adf26b65.8f90e"\r
+                "d7cb533e.bd93a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "adf26b65.8f90e",\r
+        "id": "d7cb533e.bd93a",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1359.566665649414,\r
-        "y": 1639.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1294.3333282470703,\r
+        "y": 1655.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "64e47481.3a26d4"\r
+                "5c501362.927b6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64e47481.3a26d4",\r
+        "id": "5c501362.927b6c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1522.566665649414,\r
-        "y": 1639.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1457.3333282470703,\r
+        "y": 1655.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "6e6ea5ef.8c2224",\r
-                "d5aad2e.d2c753"\r
+                "53a207fe.affe78",\r
+                "2105f763.ee4f68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5aad2e.d2c753",\r
+        "id": "2105f763.ee4f68",\r
         "type": "set",\r
         "name": "unset tmp.aai.vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
         "comments": "",\r
-        "x": 1751.566665649414,\r
-        "y": 1579.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1686.3333282470703,\r
+        "y": 1595.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e6ea5ef.8c2224",\r
+        "id": "53a207fe.affe78",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1260.566665649414,\r
-        "y": 1733.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1195.3333282470703,\r
+        "y": 1749.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "8146e5c8.89f0a",\r
-                "7ba4a096.c89f48",\r
-                "d58f3b9.ef82248"\r
+                "96d7c193.8b3058",\r
+                "915fad51.2fe24",\r
+                "52119562.4019b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f88195dd.98254",\r
+        "id": "e9bb6625.bf214",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1644.566665649414,\r
-        "y": 1733.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1579.3333282470703,\r
+        "y": 1749.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "1f6be69e.efcee9",\r
-                "dca75bc1.9206a8"\r
+                "aea8b329.30e9d",\r
+                "4aaf718e.250ab8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8146e5c8.89f0a",\r
+        "id": "96d7c193.8b3058",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1471.566665649414,\r
-        "y": 1735.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1406.3333282470703,\r
+        "y": 1751.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "f88195dd.98254"\r
+                "e9bb6625.bf214"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ba4a096.c89f48",\r
+        "id": "915fad51.2fe24",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1472.057632446289,\r
-        "y": 1781.1407012939453,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1406.8242950439453,\r
+        "y": 1796.9073791503906,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "e8dc9623.1376d8"\r
+                "9471576f.097388"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d58f3b9.ef82248",\r
+        "id": "52119562.4019b4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1469.566665649414,\r
-        "y": 1824.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1404.3333282470703,\r
+        "y": 1840.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "1a1a5ddc.251932"\r
+                "18330305.6a2a7d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a1a5ddc.251932",\r
+        "id": "18330305.6a2a7d",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1636.566665649414,\r
-        "y": 1841.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1571.3333282470703,\r
+        "y": 1857.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e8dc9623.1376d8",\r
+        "id": "9471576f.097388",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1634.6290435791016,\r
-        "y": 1781.4264373779297,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1569.3957061767578,\r
+        "y": 1797.193115234375,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fb4c81c8.58ec08",\r
+        "id": "2aa5f521.f24e92",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 800.5666656494141,\r
-        "y": 1345.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 735.3333282470703,\r
+        "y": 1361.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             [\r
-                "68774cff.da4f7c",\r
-                "458e84.00aae97c"\r
+                "83814db5.2acc38",\r
+                "4cdc6ff0.28b37"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "458e84.00aae97c",\r
+        "id": "4cdc6ff0.28b37",\r
         "type": "set",\r
         "name": "unset tmp.aai.connectivity",\r
         "xml": "<set>\n<parameter name='tmp.aai.connectivity.' value='' />\n",\r
         "comments": "",\r
-        "x": 1020.5666656494141,\r
-        "y": 1293.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 955.3333282470703,\r
+        "y": 1309.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1f6be69e.efcee9",\r
+        "id": "aea8b329.30e9d",\r
         "type": "save",\r
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Modified' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1995.066665649414,\r
-        "y": 1728.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1929.8333282470703,\r
+        "y": 1744.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dca75bc1.9206a8",\r
+        "id": "4aaf718e.250ab8",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1922.066665649414,\r
-        "y": 1792.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1856.8333282470703,\r
+        "y": 1808.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ee7fd236.9ed9a8",\r
+        "id": "301a3cc6.e828c4",\r
         "type": "comment",\r
         "name": "The following two nodes are for PCE",\r
         "info": "",\r
         "comments": "",\r
-        "x": 2066.566665649414,\r
-        "y": 120.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 2001.3333282470703,\r
+        "y": 136.33334350585938,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": []\r
     },\r
     {\r
-        "id": "323fc4b1.60fe74",\r
+        "id": "ba577b94.b0dc8",\r
         "type": "get-resource",\r
         "name": "get-resource pnfs-list",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2026.566665649414,\r
-        "y": 164.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1961.3333282470703,\r
+        "y": 180.33334350585938,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8780743f.a296a",\r
+        "id": "efd37c2f.4ac7f",\r
         "type": "get-resource",\r
         "name": "get-resource logical-links",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2039.566665649414,\r
-        "y": 209.56666564941406,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 1974.3333282470703,\r
+        "y": 225.33334350585938,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "afd6fb79.f36b6",\r
+        "id": "8e0823d9.c3d5f",\r
         "type": "execute",\r
         "name": "execute printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4346.566665649414,\r
-        "y": 2326.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4281.33332824707,\r
+        "y": 2342.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "89a7842f.afd83",\r
+        "id": "8465e4fd.6de0a",\r
         "type": "save",\r
         "name": "save connectivity resource in AAI",\r
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5637.566665649414,\r
-        "y": 1163.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 5572.33332824707,\r
+        "y": 1179.3333435058594,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1a397526.128d93",\r
+        "id": "642b12a.3e870ec",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-find-maximum-used-tpn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4535.566665649414,\r
-        "y": 2398.566665649414,\r
-        "z": "25a21122.0e2cfe",\r
+        "x": 4470.333740234375,\r
+        "y": 2399.3333740234375,\r
+        "z": "1f8b432c.7b707d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "f34b01.8e0f75",\r
+        "type": "switchNode",\r
+        "name": "switch src and dst same domain?",\r
+        "xml": "<switch test=\"`$param-prefix-domainA[$param-prefix-domainA_length -9] == $param-prefix-domainB[$param-prefix-domainB_length -9]`\">\n    \n    `\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2923.666748046875,\r
+        "y": 2446.33349609375,\r
+        "z": "1f8b432c.7b707d",\r
+        "wires": [\r
+            [\r
+                "db4fc7e3.ebc94",\r
+                "5ec8edee.aa3afc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5ec8edee.aa3afc",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3137.6666870117188,\r
+        "y": 2459.3333740234375,\r
+        "z": "1f8b432c.7b707d",\r
+        "wires": [\r
+            [\r
+                "42219b91.01efdc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "db4fc7e3.ebc94",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3118.6666259765625,\r
+        "y": 2560.33349609375,\r
+        "z": "1f8b432c.7b707d",\r
+        "wires": [\r
+            [\r
+                "5c61900d.2cdc2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "42219b91.01efdc",\r
+        "type": "call",\r
+        "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3545.0001831054688,\r
+        "y": 2465.66650390625,\r
+        "z": "1f8b432c.7b707d",\r
+        "wires": [\r
+            [\r
+                "50b64f95.e5fb98"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5c61900d.2cdc2",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3269.0000610351562,\r
+        "y": 2560.66650390625,\r
+        "z": "1f8b432c.7b707d",\r
+        "wires": [\r
+            [\r
+                "f027aef7.634db8",\r
+                "7a63eedd.e32c3",\r
+                "2b5a38a.97b3448",\r
+                "7fefe031.312d88"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "50b64f95.e5fb98",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3971.3333129882812,\r
+        "y": 2465.33349609375,\r
+        "z": "1f8b432c.7b707d",\r
+        "wires": [\r
+            [\r
+                "e65eb704.1a5ee"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f027aef7.634db8",\r
+        "type": "execute",\r
+        "name": "execute UUID generator for vpn-binding $otnidx",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-samedomain-uuid\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3552.9999389648438,\r
+        "y": 2566.3333740234375,\r
+        "z": "1f8b432c.7b707d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "7a63eedd.e32c3",\r
+        "type": "set",\r
+        "name": "set attachment_param Same Domain",\r
+        "xml": "<set>\n<parameter name='tmp.sameDomain-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.sameDomain-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",\r
+        "comments": "",\r
+        "x": 3520.9999389648438,\r
+        "y": 2626.6663818359375,\r
+        "z": "1f8b432c.7b707d",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2b5a38a.97b3448",\r
+        "type": "save",\r
+        "name": "save vpn-binding same domain resource (aka. OTN) in AAI",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-samedomain-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-samedomain-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.sameDomain-src-access-node-id`' />\n<!--<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.sameDomain-dst-access-node-id`' />\n<!--<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />-->\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3586.3331909179688,\r
+        "y": 2682.6663818359375,\r
+        "z": "1f8b432c.7b707d",\r
+        "wires": [\r
+            [\r
+                "1b626686.9373e9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1b626686.9373e9",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3903.3331909179688,\r
+        "y": 2684.6663818359375,\r
+        "z": "1f8b432c.7b707d",\r
+        "wires": [\r
+            [\r
+                "de4818c6.968eb8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "de4818c6.968eb8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4066.8331909179688,\r
+        "y": 2683.9202880859375,\r
+        "z": "1f8b432c.7b707d",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "7fefe031.312d88",\r
+        "type": "save",\r
+        "name": "save connectivity-domainA relationship to vpn-binding-sameDomain, in AAI",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-samedomain-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3634.9995727539062,\r
+        "y": 2737.3331298828125,\r
+        "z": "1f8b432c.7b707d",\r
         "wires": [\r
             []\r
         ]\r
index dbf0692..936f88d 100755 (executable)
@@ -307,4 +307,5 @@ GENERIC-RESOURCE-API p2p-vnf-topology-operation-p2p-create ${project.version} sy
 GENERIC-RESOURCE-API p2p-vnf-topology-operation-p2p-activate ${project.version} sync
 GENERIC-RESOURCE-API p2p-vnf-topology-operation-p2p-deactivate ${project.version} sync
 GENERIC-RESOURCE-API p2p-vnf-topology-operation-p2p-delete ${project.version} sync
-GENERIC-RESOURCE-API p2p-vnf-topology-operation-p2p-modify ${project.version} sync
\ No newline at end of file
+GENERIC-RESOURCE-API p2p-vnf-topology-operation-p2p-modify ${project.version} sync
+GENERIC-RESOURCE-API p2p-vnf-topology-operation-p2p-callbackdg-notification 888 sync
\ No newline at end of file
index 7662ce8..2d3237a 100644 (file)
                                                                                                                     <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
                                                                                                                     <parameter name='orchestration-status' value='Activated' />\r
                                                                                                                 </update>\r
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-create-pm-data.templatefile`" />\r
+                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`" />\r
+                                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />\r
+                                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />\r
+                                                                                                                    <parameter name="format" value="json"/>\r
+                                                                                                                    <parameter name="httpMethod" value="patch"/>\r
+                                                                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
+                                                                                                                    <parameter name="responsePrefix" value="vpn-result"/>\r
+                                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                                                                                </execute>\r
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\r
+                                                                                                                    <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />\r
+                                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`" />\r
+                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />\r
+                                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />\r
+                                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />\r
+                                                                                                                    <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />\r
+                                                                                                                    <!--<parameter name="deviceIp" value="192.168.198.6" />-->\r
+                                                                                                                    <!--<parameter name="devicePort" value="18181" />-->\r
+                                                                                                                    <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />\r
+                                                                                                                    <parameter name="format" value="json" />\r
+                                                                                                                    <parameter name="httpMethod" value="post" />\r
+                                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                                                                                    <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />\r
+                                                                                                                    <parameter name="module" value="GENERIC-RESOURCE-API" />\r
+                                                                                                                    <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />\r
+                                                                                                                    <parameter name="version" value="777" />\r
+                                                                                                                    <parameter name="mode" value="sync" />\r
+                                                                                                                    <!--<parameter name="version" value="sync" />-->\r
+                                                                                                                    <!--<parameter name="mode" value="777" />-->\r
+                                                                                                                    <parameter name="responsePrefix" value="restapi-result"/>\r
+                                                                                                                </execute>\r
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\r
+                                                                                                                    <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />\r
+                                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`" />\r
+                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />\r
+                                                                                                                    <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />\r
+                                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />\r
+                                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />\r
+                                                                                                                    <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />\r
+                                                                                                                    <parameter name="format" value="json" />\r
+                                                                                                                    <parameter name="httpMethod" value="get" />\r
+                                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                                                                                    <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />\r
+                                                                                                                    <parameter name="module" value="GENERIC-RESOURCE-API" />\r
+                                                                                                                    <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />\r
+                                                                                                                    <parameter name="version" value="777" />\r
+                                                                                                                    <parameter name="mode" value="sync" />\r
+                                                                                                                    <!--<parameter name="version" value="sync" />-->\r
+                                                                                                                    <!--<parameter name="mode" value="777" />-->\r
+                                                                                                                    <parameter name="responsePrefix" value="notification-get-result"/>\r
+                                                                                                                </execute>\r
                                                                                                             </block>\r
                                                                                                         </outcome>\r
                                                                                                     </execute>\r
                                                                                                                     <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
                                                                                                                     <parameter name='orchestration-status' value='Activated' />\r
                                                                                                                 </update>\r
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-create-pm-data.templatefile`" />\r
+                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`" />\r
+                                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />\r
+                                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />\r
+                                                                                                                    <parameter name="format" value="json"/>\r
+                                                                                                                    <parameter name="httpMethod" value="patch"/>\r
+                                                                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
+                                                                                                                    <parameter name="responsePrefix" value="vpn-result"/>\r
+                                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                                                                                </execute>\r
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\r
+                                                                                                                    <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />\r
+                                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`" />\r
+                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />\r
+                                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />\r
+                                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />\r
+                                                                                                                    <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />\r
+                                                                                                                    <!--<parameter name="deviceIp" value="192.168.198.6" />-->\r
+                                                                                                                    <!--<parameter name="devicePort" value="18181" />-->\r
+                                                                                                                    <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />\r
+                                                                                                                    <parameter name="format" value="json" />\r
+                                                                                                                    <parameter name="httpMethod" value="post" />\r
+                                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                                                                                    <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />\r
+                                                                                                                    <parameter name="module" value="GENERIC-RESOURCE-API" />\r
+                                                                                                                    <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />\r
+                                                                                                                    <parameter name="version" value="777" />\r
+                                                                                                                    <parameter name="mode" value="sync" />\r
+                                                                                                                    <!--<parameter name="version" value="sync" />-->\r
+                                                                                                                    <!--<parameter name="mode" value="777" />-->\r
+                                                                                                                    <parameter name="responsePrefix" value="restapi-result"/>\r
+                                                                                                                </execute>\r
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\r
+                                                                                                                    <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />\r
+                                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`" />\r
+                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />\r
+                                                                                                                    <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />\r
+                                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />\r
+                                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />\r
+                                                                                                                    <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />\r
+                                                                                                                    <parameter name="format" value="json" />\r
+                                                                                                                    <parameter name="httpMethod" value="get" />\r
+                                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                                                                                    <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />\r
+                                                                                                                    <parameter name="module" value="GENERIC-RESOURCE-API" />\r
+                                                                                                                    <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />\r
+                                                                                                                    <parameter name="version" value="777" />\r
+                                                                                                                    <parameter name="mode" value="sync" />\r
+                                                                                                                    <!--<parameter name="version" value="sync" />-->\r
+                                                                                                                    <!--<parameter name="mode" value="777" />-->\r
+                                                                                                                    <parameter name="responsePrefix" value="notification-get-result"/>\r
+                                                                                                                </execute>\r
                                                                                                             </block>\r
                                                                                                         </outcome>\r
                                                                                                     </execute>\r
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
new file mode 100644 (file)
index 0000000..e3d1c93
--- /dev/null
@@ -0,0 +1,79 @@
+<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'>
+    <method rpc='p2p-vnf-topology-operation-p2p-callbackdg-notification' mode='sync'>
+        <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="CallBack DG For SSE CONNECTION is called"/>
+                <!--<parameter name="field2" value="`$rcvdNotif`"/>-->
+            </record>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <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"
+                              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
+ 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>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
index 3997add..5a45ed3 100644 (file)
@@ -1,7 +1,7 @@
 <service-logic\r
         xmlns='http://www.onap.org/sdnc/svclogic'\r
         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}'>\r
-    <method rpc='tsli-vnf-topology-operation-trans-slice-deactivate' mode='sync'>\r
+    <method rpc='p2p-vnf-topology-operation-p2p-deactivate' mode='sync'>\r
         <block atomic="true">\r
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
index 7c6e65f..78ec317 100644 (file)
-<service-logic\r
-        xmlns='http://www.onap.org/sdnc/svclogic'\r
-        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}'>\r
-    <method rpc='tsli-vnf-topology-operation-trans-slice-delete' mode='sync'>\r
-        <block atomic="true">\r
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
-                <parameter name='contextPrefix' value='prop' />\r
-            </execute>\r
-            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->\r
-            <!--       resource="service-instance"-->\r
-            <!--       key='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\r
-            <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\r
-            <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\r
-            <!--       local-only="false"-->\r
-            <!--       force="true" pfx="tmp.aai.service-instance">-->\r
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                          resource="service-instance"\r
-                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
-         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
-         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\r
-                          local-only="false"\r
-                          force="true" pfx="tmp.aai.service-instance">\r
-                <!--vnf-topology-operation-input.service-information.service-instance-id-->\r
-                <outcome value='success'>\r
-                    <for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\r
-                        <switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\r
-                            <outcome value='connectivity'>\r
-                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                                              resource="connectivity"\r
-                                              key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"\r
-                                              local-only="false"\r
-                                              pfx="tmp.aai.connectivity" >\r
-                                    <outcome value='success'>\r
-                                        <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\r
-                                            <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\r
-                                                <outcome value='vpn-binding'>\r
-                                                    <block atomic="true">\r
-                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                                                                      resource="vpn-binding"\r
-                                                                      key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"\r
-                                                                      local-only="false"\r
-                                                                      pfx="tmp.aai.vpn-binding" >\r
-                                                            <outcome value='success'>\r
-                                                                <block atomic="true">\r
-                                                                    <set>\r
-                                                                        <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +\r
-                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\r
-                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\r
-                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\r
-                                                   $tmp.aai.vpn-binding.src-access-node-id`" />\r
-                                                                    </set>\r
-                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                                                                                  resource="pnf"\r
-                                                                                  key="pnf.pnf-name = $tmp.domain.pnf-name"\r
-                                                                                  pfx='tmp.aai.source-pnf' local-only='false' >\r
-                                                                        <!--AND depth = '0'"-->\r
-                                                                        <outcome value='success'>\r
-                                                                            <block>\r
-                                                                                <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\r
-                                                                                    <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\r
-                                                                                        <outcome value='esr-thirdparty-sdnc'>\r
-                                                                                            <block atomic="true">\r
-                                                                                                <set>\r
-                                                                                                    <parameter name='tmp.domain.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />\r
-                                                                                                </set>\r
-                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                                                                                                              resource="esr-thirdparty-sdnc"\r
-                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND\r
-                    depth = '1'"\r
-                                                                                                              pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >\r
-                                                                                                    <outcome value='success'>\r
-                                                                                                        <block>\r
-                                                                                                            <set>\r
-                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
-                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
-                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
-                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\r
-                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->\r
-                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->\r
-                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->\r
-                                                                                                                <!--<parameter name="format" value="json"/>-->\r
-                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->\r
-                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->\r
-                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
-                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
-                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
-                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
-                                                                                                            </set>\r
-                                                                                                        </block>\r
-                                                                                                    </outcome>\r
-                                                                                                    <outcome value='not-found'>\r
-                                                                                                        <return status='failure'>\r
-                                                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                                                            <parameter name="error-code" value="500" />\r
-                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                                                        </return>\r
-                                                                                                    </outcome>\r
-                                                                                                    <outcome value='Other'>\r
-                                                                                                        <return status='failure'>\r
-                                                                                                            <parameter name='ack-final' value='Y'/>\r
-                                                                                                            <parameter name="error-code" value="500" />\r
-                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                                                        </return>\r
-                                                                                                    </outcome>\r
-                                                                                                </get-resource>\r
-                                                                                                <break/>\r
-                                                                                            </block>\r
-                                                                                        </outcome>\r
-                                                                                    </switch>\r
-                                                                                </for>\r
-                                                                            </block>\r
-                                                                        </outcome>\r
-                                                                        <outcome value='not-found'>\r
-                                                                            <return status='failure'>\r
-                                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                                <parameter name="error-code" value="500" />\r
-                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                            </return>\r
-                                                                        </outcome>\r
-                                                                        <outcome value='Other'>\r
-                                                                            <return status='failure'>\r
-                                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                                <parameter name="error-code" value="500" />\r
-                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                            </return>\r
-                                                                        </outcome>\r
-                                                                    </get-resource>\r
-                                                                    <set>\r
-                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                    </set>\r
-                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`" />\r
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url +  '/restconf/operations/ietf-optical-slice:deallocate-optical-slice'`" />\r
-                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />\r
-                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />\r
-                                                                        <parameter name="format" value="json"/>\r
-                                                                        <parameter name="httpMethod" value="post"/>\r
-                                                                        <parameter name="responsePrefix" value="otn-oof"/>\r
-                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                                                        <outcome value='failure'>\r
-                                                                            <return status='failure'>\r
-                                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                                <parameter name="error-code" value="500" />\r
-                                                                                <parameter name="error-message" value="Error executing deallocate transport slice rest api" />\r
-                                                                            </return>\r
-                                                                        </outcome>\r
-                                                                        <outcome value='success'>\r
-                                                                            <block atomic="true"></block>\r
-                                                                        </outcome>\r
-                                                                    </execute>\r
-                                                                    <switch test='`$tmp.aai.connectivity.etht-svc-name`'>\r
-                                                                        <outcome value='Other'>\r
-                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                                                <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />-->\r
-                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `" />\r
-                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />\r
-                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />\r
-                                                                                <parameter name="format" value="json"/>\r
-                                                                                <parameter name="httpMethod" value="delete"/>\r
-                                                                                <parameter name="responsePrefix" value="otn-oof"/>\r
-                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                                                <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                                                <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                                                                <outcome value='failure'>\r
-                                                                                    <return status='failure'>\r
-                                                                                        <parameter name='ack-final' value='Y'/>\r
-                                                                                        <parameter name="error-code" value="500" />\r
-                                                                                        <parameter name="error-message" value="Error executing decoloring UNI rest api" />\r
-                                                                                    </return>\r
-                                                                                </outcome>\r
-                                                                                <outcome value='success'>\r
-                                                                                    <block></block>\r
-                                                                                </outcome>\r
-                                                                            </execute>\r
-                                                                        </outcome>\r
-                                                                        <outcome value=''></outcome>\r
-                                                                    </switch>\r
-                                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
-                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>\r
-                                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
-                                                                            key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' ></delete>\r
-                                                                </block>\r
-                                                            </outcome>\r
-                                                            <outcome value='not-found'>\r
-                                                                <return status='failure'>\r
-                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                    <parameter name="error-code" value="500" />\r
-                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />\r
-                                                                </return>\r
-                                                            </outcome>\r
-                                                            <outcome value='failure'>\r
-                                                                <return status='failure'>\r
-                                                                    <parameter name='error-code' value='' />\r
-                                                                    <parameter name='error-message' value='' />\r
-                                                                </return>\r
-                                                            </outcome>\r
-                                                        </get-resource>\r
-                                                    </block>\r
-                                                </outcome>\r
-                                            </switch>\r
-                                        </for>\r
-                                    </outcome>\r
-                                    <outcome value='not-found'>\r
-                                        <return status='failure'>\r
-                                            <parameter name='ack-final' value='Y'/>\r
-                                            <parameter name="error-code" value="500" />\r
-                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />\r
-                                        </return>\r
-                                    </outcome>\r
-                                    <outcome value='failure'>\r
-                                        <return status='failure'>\r
-                                            <parameter name='error-code' value='' />\r
-                                            <parameter name='error-message' value='' />\r
-                                        </return>\r
-                                    </outcome>\r
-                                </get-resource>\r
-                            </outcome>\r
-                        </switch>\r
-                    </for>\r
-                </outcome>\r
-                <outcome value='not-found'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />\r
-                    </return>\r
-                </outcome>\r
-                <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='error-code' value='' />\r
-                        <parameter name='error-message' value='' />\r
-                    </return>\r
-                </outcome>\r
-            </get-resource>\r
-            <return status='success'>\r
-                <parameter name="ack-final-indicator" value="Y" />\r
-                <parameter name="error-code" value="200" />\r
-                <parameter name="error-message" value="`$error-message`" />\r
-            </return>\r
-        </block>\r
-    </method>\r
+<service-logic
+        xmlns='http://www.onap.org/sdnc/svclogic'
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='p2p-vnf-topology-operation-p2p-delete' mode='sync'>
+        <block atomic="true">
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+            <!--       resource="service-instance"-->
+            <!--       key='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->
+            <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->
+            <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->
+            <!--       local-only="false"-->
+            <!--       force="true" pfx="tmp.aai.service-instance">-->
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                          resource="service-instance"
+                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                          local-only="false"
+                          force="true" pfx="tmp.aai.service-instance">
+                <!--vnf-topology-operation-input.service-information.service-instance-id-->
+                <outcome value='success'>
+                    <for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >
+                        <switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>
+                            <outcome value='connectivity'>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="connectivity"
+                                              key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
+                                              local-only="false"
+                                              pfx="tmp.aai.connectivity" >
+                                    <outcome value='success'>
+                                        <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                            <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                <outcome value='vpn-binding'>
+                                                    <block atomic="true">
+                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                      resource="vpn-binding"
+                                                                      key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                      local-only="false"
+                                                                      pfx="tmp.aai.vpn-binding" >
+                                                            <outcome value='success'>
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.vpn-binding.src-access-node-id`" />
+                                                                    </set>
+                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                  resource="pnf"
+                                                                                  key="pnf.pnf-name = $tmp.domain.pnf-name"
+                                                                                  pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                        <!--AND depth = '0'"-->
+                                                                        <outcome value='success'>
+                                                                            <block>
+                                                                                <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                    <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                        <outcome value='esr-thirdparty-sdnc'>
+                                                                                            <block atomic="true">
+                                                                                                <set>
+                                                                                                    <parameter name='tmp.domain.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                </set>
+                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                              resource="esr-thirdparty-sdnc"
+                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND
+                    depth = '1'"
+                                                                                                              pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                    <outcome value='success'>
+                                                                                                        <block>
+                                                                                                            <set>
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                <!--<parameter name="format" value="json"/>-->
+                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                <!--<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"/>-->
+                                                                                                            </set>
+                                                                                                        </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.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='Other'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                </get-resource>
+                                                                                                <break/>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                </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.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='Other'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                    </get-resource>
+                                                                    <set>
+                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                    </set>
+                                                                    <switch test='`$tmp.aai.connectivity.etht-svc-name`'>
+                                                                        <outcome value='Other'>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />-->
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `" />
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                <parameter name="format" value="json"/>
+                                                                                <parameter name="httpMethod" value="delete"/>
+                                                                                <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                <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=' + $prop.sdncRestApi.token_id`" />
+                                                                                <outcome value='failure'>
+                                                                                    <return status='failure'>
+                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                        <parameter name="error-code" value="500" />
+                                                                                        <parameter name="error-message" value="Error executing decoloring UNI rest api" />
+                                                                                    </return>
+                                                                                </outcome>
+                                                                                <outcome value='success'>
+                                                                                    <block></block>
+                                                                                </outcome>
+                                                                            </execute>
+                                                                        </outcome>
+                                                                        <outcome value=''></outcome>
+                                                                    </switch>
+                                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>
+                                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                            key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' ></delete>
+                                                                </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>
+                                                    </block>
+                                                </outcome>
+                                            </switch>
+                                        </for>
+                                    </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>
+                            </outcome>
+                        </switch>
+                    </for>
+                </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>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
 </service-logic>
\ No newline at end of file
index bc0505d..f1c90ec 100644 (file)
@@ -1,7 +1,7 @@
 <service-logic\r
         xmlns='http://www.onap.org/sdnc/svclogic'\r
         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}'>\r
-    <method rpc='tsli-vnf-topology-operation-trans-slice-modify' mode='sync'>\r
+    <method rpc='p2p-vnf-topology-operation-p2p-modify' mode='sync'>\r
         <block atomic="true">\r
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
                                                                                                         <parameter name="filename" value="`$filenamemm`" />\r
                                                                                                     </execute>\r
                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-find-maximum-used-tpn' mode='sync' ></call>\r
-                                                                                                    <for index='otnidx' start='0' end='`$tmp.otninfo_length`' >\r
-                                                                                                        <block atomic='true'>\r
-                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
-                                                                                                                <parameter name="ctx-destination" value="prop.vpn-binding-otnidx-uuid"/>\r
-                                                                                                            </execute>\r
-                                                                                                            <switch test="`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`">\r
-                                                                                                                <outcome value='true'>\r
-                                                                                                                    <set>\r
-                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\r
-                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\r
-                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\r
-                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
-                                                                                                                    </set>\r
-                                                                                                                </outcome>\r
-                                                                                                                <outcome value='false'>\r
-                                                                                                                    <set>\r
-                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\r
-                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\r
-                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\r
-                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
-                                                                                                                    </set>\r
-                                                                                                                </outcome>\r
-                                                                                                            </switch>\r
-                                                                                                            <set>\r
-                                                                                                                <parameter name='tmp.srcdstpnf-name' value="`'networkId-providerId-' +\r
+                                                                                                    <switch test="`$param-prefix-domainA[$param-prefix-domainA_length -9] == $param-prefix-domainB[$param-prefix-domainB_length -9]`">\r
+\r
+                                                                                                        `\r
+\r
+\r
+                                                                                                        <outcome value='false'>\r
+                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\r
+                                                                                                                <block atomic='true'>\r
+                                                                                                                    <for index='otnidx' start='0' end='`$tmp.otninfo_length`' >\r
+                                                                                                                        <block atomic='true'>\r
+                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
+                                                                                                                                <parameter name="ctx-destination" value="prop.vpn-binding-otnidx-uuid"/>\r
+                                                                                                                            </execute>\r
+                                                                                                                            <switch test="`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`">\r
+                                                                                                                                <outcome value='true'>\r
+                                                                                                                                    <set>\r
+                                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\r
+                                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\r
+                                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\r
+                                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
+                                                                                                                                    </set>\r
+                                                                                                                                </outcome>\r
+                                                                                                                                <outcome value='false'>\r
+                                                                                                                                    <set>\r
+                                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\r
+                                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\r
+                                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\r
+                                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
+                                                                                                                                    </set>\r
+                                                                                                                                </outcome>\r
+                                                                                                                            </switch>\r
+                                                                                                                            <set>\r
+                                                                                                                                <parameter name='tmp.srcdstpnf-name' value="`'networkId-providerId-' +\r
                                              $tmp.access-provider-id + '-clientId-' +\r
                                              $tmp.access-client-id + '-topologyId-' +\r
                                              $tmp.access-topology-id + '-nodeId-' +\r
                                              $tmp.srcdstpnf-id`" />\r
-                                                                                                            </set>\r
-                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                                                                                                                          resource="pnf"\r
-                                                                                                                          key="pnf.pnf-name = $tmp.srcdstpnf-name"\r
-                                                                                                                          pfx='tmp.aai.srcdst-pnf' local-only='false' >\r
-                                                                                                                <!--AND depth = '0'"-->\r
-                                                                                                                <outcome value='success'>\r
-                                                                                                                    <block>\r
-                                                                                                                        <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\r
-                                                                                                                            <switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\r
-                                                                                                                                <outcome value='esr-thirdparty-sdnc'>\r
-                                                                                                                                    <block atomic="true">\r
+                                                                                                                            </set>\r
+                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                                                                                                                          resource="pnf"\r
+                                                                                                                                          key="pnf.pnf-name = $tmp.srcdstpnf-name"\r
+                                                                                                                                          pfx='tmp.aai.srcdst-pnf' local-only='false' >\r
+                                                                                                                                <!--AND depth = '0'"-->\r
+                                                                                                                                <outcome value='success'>\r
+                                                                                                                                    <block>\r
+                                                                                                                                        <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\r
+                                                                                                                                            <switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\r
+                                                                                                                                                <outcome value='esr-thirdparty-sdnc'>\r
+                                                                                                                                                    <block atomic="true">\r
+                                                                                                                                                        <set>\r
+                                                                                                                                                            <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />\r
+                                                                                                                                                        </set>\r
+                                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                                                                                                                                                      resource="esr-thirdparty-sdnc"\r
+                                                                                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND\r
+                    depth = '1'"\r
+                                                                                                                                                                      pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >\r
+                                                                                                                                                            <outcome value='success'>\r
+                                                                                                                                                                <block>\r
+                                                                                                                                                                    <set>\r
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
+                                                                                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\r
+                                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->\r
+                                                                                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->\r
+                                                                                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->\r
+                                                                                                                                                                        <!--<parameter name="format" value="json"/>-->\r
+                                                                                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->\r
+                                                                                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->\r
+                                                                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
+                                                                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
+                                                                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
+                                                                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
+                                                                                                                                                                    </set>\r
+                                                                                                                                                                </block>\r
+                                                                                                                                                            </outcome>\r
+                                                                                                                                                            <outcome value='not-found'>\r
+                                                                                                                                                                <return status='failure'>\r
+                                                                                                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                                                                </return>\r
+                                                                                                                                                            </outcome>\r
+                                                                                                                                                            <outcome value='Other'>\r
+                                                                                                                                                                <return status='failure'>\r
+                                                                                                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                                                                </return>\r
+                                                                                                                                                            </outcome>\r
+                                                                                                                                                        </get-resource>\r
+                                                                                                                                                    </block>\r
+                                                                                                                                                </outcome>\r
+                                                                                                                                            </switch>\r
+                                                                                                                                        </for>\r
+                                                                                                                                    </block>\r
+                                                                                                                                </outcome>\r
+                                                                                                                                <outcome value='not-found'>\r
+                                                                                                                                    <return status='failure'>\r
+                                                                                                                                        <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                        <parameter name="error-code" value="500" />\r
+                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                                    </return>\r
+                                                                                                                                </outcome>\r
+                                                                                                                                <outcome value='Other'>\r
+                                                                                                                                    <return status='failure'>\r
+                                                                                                                                        <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                        <parameter name="error-code" value="500" />\r
+                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                                    </return>\r
+                                                                                                                                </outcome>\r
+                                                                                                                            </get-resource>\r
+                                                                                                                            <switch test='`$otnidx == 0`'>\r
+                                                                                                                                <outcome value='true'>\r
+                                                                                                                                    <set>\r
+                                                                                                                                        <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\r
+                                                                                                                                        <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
+                                                                                                                                    </set>\r
+                                                                                                                                </outcome>\r
+                                                                                                                                <outcome value='false'>\r
+                                                                                                                                    <switch test='`$otnidx == $tmp.otninfo_length - 1`'>\r
+                                                                                                                                        <outcome value='true'>\r
+                                                                                                                                            <set>\r
+                                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
+                                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\r
+                                                                                                                                            </set>\r
+                                                                                                                                        </outcome>\r
+                                                                                                                                        <outcome value='false'>\r
+                                                                                                                                            <set>\r
+                                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
+                                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
+                                                                                                                                            </set>\r
+                                                                                                                                        </outcome>\r
+                                                                                                                                    </switch>\r
+                                                                                                                                </outcome>\r
+                                                                                                                            </switch>\r
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
+                                                                                                                                  key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\r
+                                                                                                                                <parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\r
+                                                                                                                                <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\r
+                                                                                                                                <!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\r
+                                                                                                                                <parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />\r
+                                                                                                                                <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\r
+                                                                                                                                <parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\r
+                                                                                                                                <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\r
+                                                                                                                                <parameter name='access-client-id' value='`$tmp.access-client-id`' />\r
+                                                                                                                                <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\r
+                                                                                                                                <parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\r
+                                                                                                                                <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
+                                                                                                                                <parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\r
+                                                                                                                                <parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\r
+                                                                                                                                <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\r
+                                                                                                                                <parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\r
+                                                                                                                                <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\r
+                                                                                                                                <parameter name='route-distinguisher' value='`$gfp`' />\r
+                                                                                                                                <parameter name='operational-status' value='Created' />\r
+                                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\r
+                                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\r
+                                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\r
+                                                                                                                                <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\r
+                                                                                                                                <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\r
+                                                                                                                                <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\r
+                                                                                                                                <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\r
+                                                                                                                                <parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                                                                <outcome value='success'>\r
+                                                                                                                                    <block></block>\r
+                                                                                                                                </outcome>\r
+                                                                                                                            </save>\r
+                                                                                                                            <switch test='`$otnidx == 0`'>\r
+                                                                                                                                <outcome value='true'>\r
+                                                                                                                                    <block>\r
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
+                                                                                                                                              key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'\r
+                                                                                                                                              force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />\r
+                                                                                                                                        </save>\r
                                                                                                                                         <set>\r
-                                                                                                                                            <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />\r
+                                                                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
                                                                                                                                         </set>\r
-                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                                                                                                                                                      resource="esr-thirdparty-sdnc"\r
-                                                                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND\r
-                    depth = '1'"\r
-                                                                                                                                                      pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >\r
-                                                                                                                                            <outcome value='success'>\r
+                                                                                                                                    </block>\r
+                                                                                                                                </outcome>\r
+                                                                                                                                <outcome value='false'>\r
+                                                                                                                                    <block>\r
+                                                                                                                                        <set>\r
+                                                                                                                                            <parameter name='testingvalue' value='$tmp.otninfo_length -1' />\r
+                                                                                                                                        </set>\r
+                                                                                                                                        <switch test='`$otnidx == $tmp.otninfo_length - 1`'>\r
+                                                                                                                                            <outcome value='true'>\r
                                                                                                                                                 <block>\r
+                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
+                                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'\r
+                                                                                                                                                          force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />\r
+                                                                                                                                                    </save>\r
                                                                                                                                                     <set>\r
-                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
-                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
-                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
-                                                                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\r
-                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->\r
-                                                                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->\r
-                                                                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->\r
-                                                                                                                                                        <!--<parameter name="format" value="json"/>-->\r
-                                                                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->\r
-                                                                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->\r
-                                                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
-                                                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
-                                                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
-                                                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
+                                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
                                                                                                                                                     </set>\r
                                                                                                                                                 </block>\r
                                                                                                                                             </outcome>\r
-                                                                                                                                            <outcome value='not-found'>\r
-                                                                                                                                                <return status='failure'>\r
-                                                                                                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                                                                                                    <parameter name="error-code" value="500" />\r
-                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                                                                                                </return>\r
-                                                                                                                                            </outcome>\r
-                                                                                                                                            <outcome value='Other'>\r
-                                                                                                                                                <return status='failure'>\r
-                                                                                                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                                                                                                    <parameter name="error-code" value="500" />\r
-                                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                                                                                                </return>\r
+                                                                                                                                            <outcome value='false'>\r
+                                                                                                                                                <block atomic='true'>\r
+                                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
+                                                                                                                                                        <parameter name="ctx-destination" value="uuid.connectivity-otnidx-uuid"/>\r
+                                                                                                                                                    </execute>\r
+                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
+                                                                                                                                                          key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\r
+                                                                                                                                                        <parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\r
+                                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\r
+                                                                                                                                                        <parameter name='operational-status' value='Created' />\r
+                                                                                                                                                        <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\r
+                                                                                                                                                        <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\r
+                                                                                                                                                        <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\r
+                                                                                                                                                        <!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
+                                                                                                                                                        <!--<parameter name='access-ltp-id' value='``' />-->\r
+                                                                                                                                                        <!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\r
+                                                                                                                                                        <parameter name='bandwidth-profile-name' value='`$gfp`' />\r
+                                                                                                                                                        <parameter name='vpn-type' value='dummy' />\r
+                                                                                                                                                        <parameter name='cir' value='`$gfp *1000000`' />\r
+                                                                                                                                                        <parameter name='eir' value='`$gfp *1000000`' />\r
+                                                                                                                                                        <!--<parameter name='CBS' value='`$prop.sotn.cbs`' />-->\r
+                                                                                                                                                        <!--<parameter name='EBS' value='`$prop.sotn.ebs`' />-->\r
+                                                                                                                                                        <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\r
+                                                                                                                                                        <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\r
+                                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\r
+                                                                                                                                                        <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\r
+                                                                                                                                                        <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\r
+                                                                                                                                                        <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\r
+                                                                                                                                                        <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />\r
+                                                                                                                                                    </save>\r
+                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
+                                                                                                                                                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\r
+                                                                                                                                                          force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />\r
+                                                                                                                                                        <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\r
+                                                                                                                                                        <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\r
+                                                                                                                                                        <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\r
+                                                                                                                                                        <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\r
+                                                                                                                                                        <!--      force="true" pfx="tmp.AnAI-data">-->\r
+                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->\r
+                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->\r
+                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->\r
+                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->\r
+                                                                                                                                                    </save>\r
+                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
+                                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'\r
+                                                                                                                                                          force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />\r
+                                                                                                                                                    </save>\r
+                                                                                                                                                    <set>\r
+                                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                                                                                    </set>\r
+                                                                                                                                                </block>\r
                                                                                                                                             </outcome>\r
-                                                                                                                                        </get-resource>\r
+                                                                                                                                        </switch>\r
                                                                                                                                     </block>\r
                                                                                                                                 </outcome>\r
                                                                                                                             </switch>\r
-                                                                                                                        </for>\r
-                                                                                                                    </block>\r
-                                                                                                                </outcome>\r
-                                                                                                                <outcome value='not-found'>\r
-                                                                                                                    <return status='failure'>\r
-                                                                                                                        <parameter name='ack-final' value='Y'/>\r
-                                                                                                                        <parameter name="error-code" value="500" />\r
-                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                                                                    </return>\r
-                                                                                                                </outcome>\r
-                                                                                                                <outcome value='Other'>\r
-                                                                                                                    <return status='failure'>\r
-                                                                                                                        <parameter name='ack-final' value='Y'/>\r
-                                                                                                                        <parameter name="error-code" value="500" />\r
-                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                                                                    </return>\r
-                                                                                                                </outcome>\r
-                                                                                                            </get-resource>\r
-                                                                                                            <switch test='`$otnidx == 0`'>\r
-                                                                                                                <outcome value='true'>\r
-                                                                                                                    <set>\r
-                                                                                                                        <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\r
-                                                                                                                        <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
-                                                                                                                    </set>\r
-                                                                                                                </outcome>\r
-                                                                                                                <outcome value='false'>\r
-                                                                                                                    <switch test='`$otnidx == $tmp.otninfo_length - 1`'>\r
-                                                                                                                        <outcome value='true'>\r
-                                                                                                                            <set>\r
-                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
-                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\r
-                                                                                                                            </set>\r
-                                                                                                                        </outcome>\r
-                                                                                                                        <outcome value='false'>\r
-                                                                                                                            <set>\r
-                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
-                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
-                                                                                                                            </set>\r
-                                                                                                                        </outcome>\r
-                                                                                                                    </switch>\r
-                                                                                                                </outcome>\r
-                                                                                                            </switch>\r
-                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
-                                                                                                                  key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\r
-                                                                                                                <parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\r
-                                                                                                                <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\r
-                                                                                                                <!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\r
-                                                                                                                <parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />\r
-                                                                                                                <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\r
-                                                                                                                <parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\r
-                                                                                                                <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\r
-                                                                                                                <parameter name='access-client-id' value='`$tmp.access-client-id`' />\r
-                                                                                                                <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\r
-                                                                                                                <parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\r
-                                                                                                                <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
-                                                                                                                <parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\r
-                                                                                                                <parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\r
-                                                                                                                <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\r
-                                                                                                                <parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\r
-                                                                                                                <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\r
-                                                                                                                <parameter name='route-distinguisher' value='`$gfp`' />\r
-                                                                                                                <parameter name='operational-status' value='Created' />\r
-                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\r
-                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\r
-                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\r
-                                                                                                                <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\r
-                                                                                                                <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\r
-                                                                                                                <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\r
-                                                                                                                <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\r
-                                                                                                                <parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                                                <outcome value='success'>\r
-                                                                                                                    <block></block>\r
-                                                                                                                </outcome>\r
-                                                                                                            </save>\r
-                                                                                                            <switch test='`$otnidx == 0`'>\r
-                                                                                                                <outcome value='true'>\r
-                                                                                                                    <block>\r
-                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
-                                                                                                                              key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'\r
-                                                                                                                              force="true" pfx="tmp.AnAI-data">\r
-                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
-                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />\r
-                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
-                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />\r
-                                                                                                                        </save>\r
-                                                                                                                        <set>\r
-                                                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                                                        </set>\r
-                                                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />\r
-                                                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `" />\r
-                                                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />\r
-                                                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />\r
-                                                                                                                            <parameter name="format" value="json"/>\r
-                                                                                                                            <parameter name="httpMethod" value="patch"/>\r
-                                                                                                                            <parameter name="responsePrefix" value="otn-oof"/>\r
-                                                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                                                                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                                                                                                            <outcome value='failure'>\r
-                                                                                                                                <return status='failure'>\r
-                                                                                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                                                                                    <parameter name="error-code" value="500" />\r
-                                                                                                                                    <parameter name="error-message" value="Error executing UNI Coloring for domain A" />\r
-                                                                                                                                </return>\r
-                                                                                                                            </outcome>\r
-                                                                                                                            <outcome value='success'>\r
-                                                                                                                                <block></block>\r
-                                                                                                                            </outcome>\r
-                                                                                                                        </execute>\r
-                                                                                                                    </block>\r
-                                                                                                                </outcome>\r
-                                                                                                                <outcome value='false'>\r
-                                                                                                                    <block>\r
-                                                                                                                        <set>\r
-                                                                                                                            <parameter name='testingvalue' value='$tmp.otninfo_length -1' />\r
-                                                                                                                        </set>\r
-                                                                                                                        <switch test='`$otnidx == $tmp.otninfo_length - 1`'>\r
-                                                                                                                            <outcome value='true'>\r
-                                                                                                                                <block>\r
-                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
-                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'\r
-                                                                                                                                          force="true" pfx="tmp.AnAI-data">\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />\r
-                                                                                                                                    </save>\r
-                                                                                                                                    <set>\r
-                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                                                                    </set>\r
-                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />\r
-                                                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `" />\r
-                                                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />\r
-                                                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />\r
-                                                                                                                                        <parameter name="format" value="json"/>\r
-                                                                                                                                        <parameter name="httpMethod" value="patch"/>\r
-                                                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>\r
-                                                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                                                                                                                        <outcome value='failure'>\r
-                                                                                                                                            <return status='failure'>\r
-                                                                                                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                                                                                                <parameter name="error-code" value="500" />\r
-                                                                                                                                                <parameter name="error-message" value="Error executing UNI coloring for domain B" />\r
-                                                                                                                                            </return>\r
-                                                                                                                                        </outcome>\r
-                                                                                                                                        <outcome value='success'>\r
-                                                                                                                                            <block></block>\r
-                                                                                                                                        </outcome>\r
-                                                                                                                                    </execute>\r
-                                                                                                                                </block>\r
-                                                                                                                            </outcome>\r
-                                                                                                                            <outcome value='false'>\r
-                                                                                                                                <block atomic='true'>\r
-                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
-                                                                                                                                        <parameter name="ctx-destination" value="uuid.connectivity-otnidx-uuid"/>\r
-                                                                                                                                    </execute>\r
-                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
-                                                                                                                                          key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\r
-                                                                                                                                        <parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\r
-                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\r
-                                                                                                                                        <parameter name='operational-status' value='Created' />\r
-                                                                                                                                        <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\r
-                                                                                                                                        <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\r
-                                                                                                                                        <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\r
-                                                                                                                                        <!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
-                                                                                                                                        <!--<parameter name='access-ltp-id' value='``' />-->\r
-                                                                                                                                        <!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\r
-                                                                                                                                        <parameter name='bandwidth-profile-name' value='`$gfp`' />\r
-                                                                                                                                        <parameter name='vpn-type' value='dummy' />\r
-                                                                                                                                        <parameter name='cir' value='`$gfp *1000000`' />\r
-                                                                                                                                        <parameter name='eir' value='`$gfp *1000000`' />\r
-                                                                                                                                        <!--<parameter name='CBS' value='`$prop.sotn.cbs`' />-->\r
-                                                                                                                                        <!--<parameter name='EBS' value='`$prop.sotn.ebs`' />-->\r
-                                                                                                                                        <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\r
-                                                                                                                                        <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\r
-                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\r
-                                                                                                                                        <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\r
-                                                                                                                                        <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\r
-                                                                                                                                        <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\r
-                                                                                                                                        <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />\r
-                                                                                                                                    </save>\r
-                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
-                                                                                                                                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
-         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
-         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\r
-                                                                                                                                          force="true" pfx="tmp.AnAI-data">\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />\r
-                                                                                                                                        <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\r
-                                                                                                                                        <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\r
-                                                                                                                                        <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\r
-                                                                                                                                        <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\r
-                                                                                                                                        <!--      force="true" pfx="tmp.AnAI-data">-->\r
-                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->\r
-                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->\r
-                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->\r
-                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->\r
-                                                                                                                                    </save>\r
-                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
-                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'\r
-                                                                                                                                          force="true" pfx="tmp.AnAI-data">\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />\r
-                                                                                                                                    </save>\r
-                                                                                                                                    <set>\r
-                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                                                                    </set>\r
-                                                                                                                                </block>\r
-                                                                                                                            </outcome>\r
-                                                                                                                        </switch>\r
-                                                                                                                    </block>\r
-                                                                                                                </outcome>\r
-                                                                                                            </switch>\r
-                                                                                                        </block>\r
-                                                                                                    </for>\r
+                                                                                                                        </block>\r
+                                                                                                                    </for>\r
+                                                                                                                </block>\r
+                                                                                                            </call>\r
+                                                                                                        </outcome>\r
+                                                                                                        <outcome value='true'>\r
+                                                                                                            <block>\r
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
+                                                                                                                    <parameter name="ctx-destination" value="prop.vpn-binding-samedomain-uuid"/>\r
+                                                                                                                </execute>\r
+                                                                                                                <set>\r
+                                                                                                                    <parameter name='tmp.sameDomain-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\r
+                                                                                                                    <parameter name='tmp.sameDomain-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\r
+                                                                                                                </set>\r
+                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
+                                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-samedomain-uuid' >\r
+                                                                                                                    <parameter name='vpn-id' value='`$prop.vpn-binding-samedomain-uuid`' />\r
+                                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\r
+                                                                                                                    <!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\r
+                                                                                                                    <parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />\r
+                                                                                                                    <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\r
+                                                                                                                    <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\r
+                                                                                                                    <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\r
+                                                                                                                    <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\r
+                                                                                                                    <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\r
+                                                                                                                    <parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\r
+                                                                                                                    <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
+                                                                                                                    <parameter name='src-access-node-id' value='`$tmp.sameDomain-src-access-node-id`' />\r
+                                                                                                                    <!--<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->\r
+                                                                                                                    <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\r
+                                                                                                                    <parameter name='dst-access-node-id' value='`$tmp.sameDomain-dst-access-node-id`' />\r
+                                                                                                                    <!--<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />-->\r
+                                                                                                                    <parameter name='route-distinguisher' value='`$gfp`' />\r
+                                                                                                                    <parameter name='operational-status' value='Created' />\r
+                                                                                                                    <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\r
+                                                                                                                    <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\r
+                                                                                                                    <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\r
+                                                                                                                    <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\r
+                                                                                                                    <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\r
+                                                                                                                    <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\r
+                                                                                                                    <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\r
+                                                                                                                    <parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                                                    <outcome value='success'>\r
+                                                                                                                        <block></block>\r
+                                                                                                                    </outcome>\r
+                                                                                                                </save>\r
+                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
+                                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-samedomain-uuid'\r
+                                                                                                                      force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />\r
+                                                                                                                </save>\r
+                                                                                                            </block>\r
+                                                                                                        </outcome>\r
+                                                                                                    </switch>\r
                                                                                                     <set>\r
                                                                                                         <parameter name='domain-A.tunnel-tp-id' value='' />\r
                                                                                                         <parameter name='domain-A.node-id' value='' />\r
                                         </outcome>\r
                                     </get-resource>\r
                                 </for>\r
-                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                                              resource="vpn-bindings"\r
-                                              key="selflink = 'https://aai.onap:8443/aai/v21/network/vpn-bindings"\r
-                                              local-only="false"\r
-                                              pfx="tmp.aai.all-vpn-bindings" >\r
-                                    <outcome value='success'>\r
-                                        <block atomic="true">\r
-                                            <for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\r
-                                                <block atomic='true'>\r
-                                                    <!--<switch test="`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `">-->\r
-                                                    <!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\r
-                                                    <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.aai.service-instance.service-instance-id `">\r
-                                                        <outcome value='true'>\r
-                                                            <block atomic='true'>\r
-                                                                <set>\r
-                                                                    <parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\r
-                                                                    <parameter name='found' value='false' />\r
-                                                                </set>\r
-                                                                <switch test='`$tmp.arr_length != 0`'>\r
-                                                                    <outcome value='true'>\r
-                                                                        <block atomic='true'>\r
-                                                                            <for index='arridx' start='0' end='`$tmp.arr_length`' >\r
-                                                                                <switch test='`$tmp.arr[$arridx] == $providerValue`'>\r
-                                                                                    <outcome value='true'>\r
-                                                                                        <block atomic='true'>\r
-                                                                                            <set>\r
-                                                                                                <parameter name='found' value='true' />\r
-                                                                                            </set>\r
-                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
-                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\r
-                                                                                                <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                                <parameter name='vpn-type' value='`$arridx`' />\r
-                                                                                            </update>\r
-                                                                                            <set>\r
-                                                                                                <parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\r
-                                                                                            </set>\r
-                                                                                            <set>\r
-                                                                                                <!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\r
-                                                                                                <!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value="`'0,' + $gfp`" />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\r
-                                                                                                <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\r
-                                                                                                <!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\r
-                                                                                            </set>\r
-                                                                                            <break/>\r
-                                                                                        </block>\r
-                                                                                    </outcome>\r
-                                                                                    <outcome value='false'>\r
-                                                                                        <block></block>\r
-                                                                                    </outcome>\r
-                                                                                </switch>\r
-                                                                            </for>\r
-                                                                            <switch test='`$found`'>\r
-                                                                                <outcome value='true'>\r
-                                                                                    <block></block>\r
-                                                                                </outcome>\r
-                                                                                <outcome value='false'>\r
-                                                                                    <block atomic='true'>\r
-                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
-                                                                                                key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\r
-                                                                                            <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                            <parameter name='vpn-type' value='`$arridx + 1`' />\r
-                                                                                        </update>\r
-                                                                                        <set>\r
-                                                                                            <parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\r
-                                                                                            <parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value="`'0,' + $gfp`" />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\r
-                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\r
-                                                                                            <parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\r
-                                                                                        </set>\r
-                                                                                    </block>\r
-                                                                                </outcome>\r
-                                                                            </switch>\r
-                                                                        </block>\r
-                                                                    </outcome>\r
-                                                                    <outcome value='false'>\r
-                                                                        <block atomic='true'>\r
-                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
-                                                                                    key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\r
-                                                                                <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                <parameter name='vpn-type' value='0' />\r
-                                                                            </update>\r
-                                                                            <set>\r
-                                                                                <parameter name='tmp.arr[0]' value='`$providerValue`' />\r
-                                                                                <parameter name='tmp.arr_length' value='1' />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value="`'0,' + $gfp`" />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\r
-                                                                                <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\r
-                                                                                <parameter name='otn-tunnel-slice_length' value='1' />\r
-                                                                                <parameter name='otn-tunnel-slice[0].list_length' value='1' />\r
-                                                                            </set>\r
-                                                                        </block>\r
-                                                                    </outcome>\r
-                                                                </switch>\r
-                                                            </block>\r
-                                                        </outcome>\r
-                                                        <outcome value='false'></outcome>\r
-                                                    </switch>\r
-                                                </block>\r
-                                            </for>\r
-                                        </block>\r
-                                    </outcome>\r
-                                    <outcome value='not-found'>\r
-                                        <return status='failure'>\r
-                                            <parameter name='ack-final' value='Y'/>\r
-                                            <parameter name="error-code" value="500" />\r
-                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />\r
-                                        </return>\r
-                                    </outcome>\r
-                                    <outcome value='failure'>\r
-                                        <return status='failure'>\r
-                                            <parameter name='error-code' value='' />\r
-                                            <parameter name='error-message' value='' />\r
-                                        </return>\r
-                                    </outcome>\r
-                                </get-resource>\r
-                                <for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\r
-                                    <block atomic='true'>\r
-                                        <for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >\r
-                                            <block atomic='true'>\r
-                                                <set>\r
-                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />\r
-                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\r
-                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\r
-                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`" />\r
-                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />\r
-                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />\r
-                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                    <parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />\r
-                                                    <parameter name="tmp.domainG.restapiUrl" value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`" />\r
-                                                    <parameter name="tmp.domainG.restapiUser" value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`" />\r
-                                                    <parameter name="tmp.domainG.restapiPassword" value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`" />\r
-                                                </set>\r
-                                            </block>\r
-                                        </for>\r
-                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`" />\r
-                                            <parameter name="restapiUrl" value="`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />\r
-                                            <parameter name="restapiUser" value="`$tmp.domainG.restapiUser`" />\r
-                                            <parameter name="restapiPassword" value="`tmp.domainG.restapiPassword`" />\r
-                                            <parameter name="format" value="json"/>\r
-                                            <parameter name="httpMethod" value="post"/>\r
-                                            <parameter name="responsePrefix" value="otn-oof"/>\r
-                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                            <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                            <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                            <outcome value='failure'>\r
-                                                <return status='failure'>\r
-                                                    <parameter name='ack-final' value='Y'/>\r
-                                                    <parameter name="error-code" value="500" />\r
-                                                    <parameter name="error-message" value="Error executing slice creation api for domain A" />\r
-                                                </return>\r
-                                            </outcome>\r
-                                            <outcome value='success'>\r
-                                                <block></block>\r
-                                            </outcome>\r
-                                        </execute>\r
-                                    </block>\r
-                                </for>\r
                             </block>\r
                         </outcome>\r
                     </switch>\r
diff --git a/platform-logic/restapi-templates/src/main/json/p2p-call-ves.json b/platform-logic/restapi-templates/src/main/json/p2p-call-ves.json
new file mode 100644 (file)
index 0000000..ac502c6
--- /dev/null
@@ -0,0 +1,34 @@
+{
+  "event": {
+    "commonEventHeader": {
+      "version": "4.0.1",
+      "vesEventListenerVersion": "7.0.1",
+      "domain": "notification",
+      "eventName": "ccvpnNotification_CloudLeaseLine_BandwidthChanged",
+      "eventId": ${eventIdUuid},
+      "lastEpochMicrosec": 8745745764578,
+      "priority": "Normal",
+      "reportingEntityName": "onap-sdnc",
+      "sequence": 0,
+      "sourceName": "onap-sdnc",
+      "startEpochMicrosec": 8745745764578,
+      "timeZoneOffset": "UTC-05.00"
+    },
+    "notificationFields": {
+      "changeIdentifier": "PM_BW_UPDATE",
+      "changeType": "BandwidthChanged",
+      "notificationFieldsVersion": "2.0",
+      "arrayOfNamedHashMap": [
+        {
+          "name": ${eventNameUuid},
+          "hashMap": {
+            "cllId": ${cclId},
+            "uniId": ${uniId},
+            "bandwidthValue": ${bandwidthValue},
+            "time": "2022-02-08T11:13:34.781-05:00"
+          }
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
index 101e9b9..5d5f30f 100644 (file)
@@ -3,15 +3,27 @@
     "service-pm": [
       {
         "service-name": ${eth-service-name},
-        "task-pm-enable": true,
-        "granularity": "ietf-service-pm:granularity-1min",
         "performance-data-config": [
           {
-            "parameter-name": "ietf-service-pm:ingress-bandwidth",
-            "measure-method": "ietf-service-pm:measure-at-ingress"
+            "parameter-name": "one-way-delay"
+          },
+          {
+            "parameter-name": "packet_loss_rate"
+          },
+          {
+            "parameter-name": "transmit-packets"
+          },
+          {
+            "parameter-name": "receive-packets"
+          },
+          {
+            "parameter-name": "delay_jitter"
+          },
+          {
+            "parameter-name": "two-way-delay"
           }
         ]
       }
     ]
   }
-}
+}
\ No newline at end of file
index 96052f8..6475b10 100644 (file)
@@ -1,18 +1,18 @@
 {
     "ietf-eth-tran-service:etht-svc-instances": [
         {
-            "etht-svc-name": "8f91fa46-e638-4ce7-8736-87abee900002",
+            "etht-svc-name": ${eth-service-name},
             "etht-svc-title": "actn-eoo-00044",
             "etht-svc-type": "ietf-eth-tran-types:p2p-svc",
             "te-topology-identifier": {
-                "provider-id": 5555,
-                "client-id": 6666,
-                "topology-id": "33"
+                "provider-id": ${provider-id},
+                "client-id": ${client-id},
+                "topology-id": ${topology-id}
             },
             "underlay": {
                 "otn-tunnels": [
                     {
-                        "name": "9f91fa46-e638-4ce7-8736-87abee900001",
+                        "name": ${otn-tunnel-name},
                         "encoding": "ietf-te-types:lsp-encoding-oduk",
                         "switching-type": "ietf-te-types:switching-otn"
                     }
             "admin-status": "ietf-te-types:tunnel-admin-state-up",
             "etht-svc-end-points": [
                 {
-                    "etht-svc-end-point-name": "0",
+                    "etht-svc-end-point-name": ${ethernet-end-point-name},
                     "etht-svc-access-points": [
                         {
-                            "access-point-id": "0",
-                            "access-node-id": "0.181.0.62",
-                            "access-ltp-id": 218038274
+                            "access-point-id": ${index-number},
+                            "access-node-id": ${eth-node-id},
+                            "access-ltp-id": ${eth-node-tp-id}
                         }
                     ],
                     "service-classification-type": "ietf-eth-tran-types:vlan-classification",
                     "outer-tag": {
                         "tag-type": "ietf-eth-tran-types:classify-c-vlan",
-                        "vlan-value": 1029
+                        "vlan-value": ${cvlan}
                     },
                     "ingress-egress-bandwidth-profile": {
                         "bandwidth-profile-type": "ietf-eth-tran-types:mef-10-bwp",
-                        "CIR": 1000,
-                        "EIR": 0
-                    }
-                },
-                {
-                    "etht-svc-end-point-name": "1",
-                    "etht-svc-access-points": [
-                        {
-                            "access-point-id": "0",
-                            "access-node-id": "0.181.0.61",
-                            "access-ltp-id": 218038274
-                        }
-                    ],
-                    "service-classification-type": "ietf-eth-tran-types:vlan-classification",
-                    "outer-tag": {
-                        "tag-type": "ietf-eth-tran-types:classify-c-vlan",
-                        "vlan-value": 1029
-                    },
-                    "ingress-egress-bandwidth-profile": {
-                        "bandwidth-profile-type": "ietf-eth-tran-types:mef-10-bwp",
-                        "CIR": 1000,
-                        "EIR": 0
+                        "CIR": ${CIR},
+                        "EIR": ${EIR}
                     }
                 }
             ]
index 3724158..74e6d89 100644 (file)
@@ -1,43 +1,43 @@
 {
   "ietf-te:tunnel": [
     {
-      "source": "0.181.0.62",
-      "destination": "0.181.0.61",
-      "encoding": "ietf-te-types:lsp-encoding-oduk",
-      "name": "9f91fa46-e638-4ce7-8736-87abee900001",
-      "restoration": {
-        "enable": "false",
-        "restoration-reversion-disable": "true",
-        "restoration-type": "ietf-te-types:lsp-restoration-restore-any",
-        "wait-to-revert": 0
-      },
-      "te-bandwidth": {
-        "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODU0"
-      },
-      "switching-type": "ietf-te-types:switching-otn",
-      "te-topology-identifier": {
-        "client-id": 6666,
-        "provider-id": 5555,
-        "topology-id": "11"
-      },
-      "p2p-primary-paths": {
-        "p2p-primary-path": [
-          {
-            "name": "primary-path",
-            "optimizations": {
-              "optimization-metric": [
-                {
-                  "metric-type": "ietf-te-types:path-metric-te",
-                  "weight": "1"
-                }
-              ]
-            }
+      "source": ${src-node-id},
+    "destination": ${dst-node-id},
+    "encoding": "ietf-te-types:lsp-encoding-oduk",
+    "name": ${otn-tunnel-name-src-domain},
+    "restoration": {
+      "enable": "false",
+      "restoration-reversion-disable": "true",
+      "restoration-type": "ietf-te-types:lsp-restoration-restore-any",
+      "wait-to-revert": 0
+    },
+    "te-bandwidth": {
+      "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODU0"
+    },
+    "switching-type": "ietf-te-types:switching-otn",
+    "te-topology-identifier": {
+      "client-id": ${client-id},
+    "provider-id": ${provider-id},
+    "topology-id": ${topology-id}
+  },
+    "p2p-primary-paths": {
+      "p2p-primary-path": [
+        {
+          "name": "primary-path",
+          "optimizations": {
+            "optimization-metric": [
+              {
+                "metric-type": "ietf-te-types:path-metric-te",
+                "weight": "1"
+              }
+            ]
           }
-        ]
-      },
-      "ietf-otn-tunnel:dst-tributary-slot-count": 0,
-      "ietf-otn-tunnel:src-tributary-slot-count": 0,
-      "provisioning-state": "ietf-te-types:tunnel-admin-state-down"
+        }
+      ]
+    },
+    "ietf-otn-tunnel:dst-tributary-slot-count": ${gfp-n},
+    "ietf-otn-tunnel:src-tributary-slot-count": ${gfp-n},
+    "provisioning-state": "ietf-te-types:tunnel-admin-state-down"
     }
   ]
 }
\ No newline at end of file
index 3724158..74e6d89 100644 (file)
@@ -1,43 +1,43 @@
 {
   "ietf-te:tunnel": [
     {
-      "source": "0.181.0.62",
-      "destination": "0.181.0.61",
-      "encoding": "ietf-te-types:lsp-encoding-oduk",
-      "name": "9f91fa46-e638-4ce7-8736-87abee900001",
-      "restoration": {
-        "enable": "false",
-        "restoration-reversion-disable": "true",
-        "restoration-type": "ietf-te-types:lsp-restoration-restore-any",
-        "wait-to-revert": 0
-      },
-      "te-bandwidth": {
-        "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODU0"
-      },
-      "switching-type": "ietf-te-types:switching-otn",
-      "te-topology-identifier": {
-        "client-id": 6666,
-        "provider-id": 5555,
-        "topology-id": "11"
-      },
-      "p2p-primary-paths": {
-        "p2p-primary-path": [
-          {
-            "name": "primary-path",
-            "optimizations": {
-              "optimization-metric": [
-                {
-                  "metric-type": "ietf-te-types:path-metric-te",
-                  "weight": "1"
-                }
-              ]
-            }
+      "source": ${src-node-id},
+    "destination": ${dst-node-id},
+    "encoding": "ietf-te-types:lsp-encoding-oduk",
+    "name": ${otn-tunnel-name-src-domain},
+    "restoration": {
+      "enable": "false",
+      "restoration-reversion-disable": "true",
+      "restoration-type": "ietf-te-types:lsp-restoration-restore-any",
+      "wait-to-revert": 0
+    },
+    "te-bandwidth": {
+      "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODU0"
+    },
+    "switching-type": "ietf-te-types:switching-otn",
+    "te-topology-identifier": {
+      "client-id": ${client-id},
+    "provider-id": ${provider-id},
+    "topology-id": ${topology-id}
+  },
+    "p2p-primary-paths": {
+      "p2p-primary-path": [
+        {
+          "name": "primary-path",
+          "optimizations": {
+            "optimization-metric": [
+              {
+                "metric-type": "ietf-te-types:path-metric-te",
+                "weight": "1"
+              }
+            ]
           }
-        ]
-      },
-      "ietf-otn-tunnel:dst-tributary-slot-count": 0,
-      "ietf-otn-tunnel:src-tributary-slot-count": 0,
-      "provisioning-state": "ietf-te-types:tunnel-admin-state-down"
+        }
+      ]
+    },
+    "ietf-otn-tunnel:dst-tributary-slot-count": ${gfp-n},
+    "ietf-otn-tunnel:src-tributary-slot-count": ${gfp-n},
+    "provisioning-state": "ietf-te-types:tunnel-admin-state-down"
     }
   ]
 }
\ No newline at end of file
index 3724158..e9d7cba 100644 (file)
@@ -1,10 +1,10 @@
 {
   "ietf-te:tunnel": [
     {
-      "source": "0.181.0.62",
-      "destination": "0.181.0.61",
+      "source": ${src-node-id},
+      "destination": ${dst-node-id},
       "encoding": "ietf-te-types:lsp-encoding-oduk",
-      "name": "9f91fa46-e638-4ce7-8736-87abee900001",
+      "name": ${otn-tunnel-name-src-domain},
       "restoration": {
         "enable": "false",
         "restoration-reversion-disable": "true",
@@ -16,9 +16,9 @@
       },
       "switching-type": "ietf-te-types:switching-otn",
       "te-topology-identifier": {
-        "client-id": 6666,
-        "provider-id": 5555,
-        "topology-id": "11"
+        "client-id": ${client-id},
+        "provider-id": ${provider-id},
+        "topology-id": ${topology-id}
       },
       "p2p-primary-paths": {
         "p2p-primary-path": [
@@ -35,8 +35,8 @@
           }
         ]
       },
-      "ietf-otn-tunnel:dst-tributary-slot-count": 0,
-      "ietf-otn-tunnel:src-tributary-slot-count": 0,
+      "ietf-otn-tunnel:dst-tributary-slot-count": ${gfp-n},
+      "ietf-otn-tunnel:src-tributary-slot-count": ${gfp-n},
       "provisioning-state": "ietf-te-types:tunnel-admin-state-down"
     }
   ]
index 02fd8a5..b6ea94b 100644 (file)
@@ -1 +1,22 @@
-{ "ietf-subscribed-notifications:input": { "encoding": "encode-json" } }
\ No newline at end of file
+{
+  "ietf-eth-service-oam:input": {
+    "oam-config-list": [
+      {
+        "service-name": ${eth-service-name},
+        "source": {
+          "meg-id": "12345678",
+          "meg-level": 4,
+          "mep-id": 3,
+          "remote-mep-id": 4
+        },
+        "destination": {
+          "meg-id": "12345678",
+          "meg-level": 4,
+          "mep-id": 4,
+          "remote-mep-id": 3
+        },
+        "cc-interval": "interval-1s"
+      }
+    ]
+  }
+}
\ No newline at end of file