diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
index 5d150f6..44b359b 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
@@ -313,7 +313,7 @@
         "id": "a96cdedb.06ef48",
         "type": "set",
         "name": "set sotn_value",
-        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n",
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",
         "comments": "",
         "x": 3796.5,
         "y": 694,
@@ -413,7 +413,7 @@
         "id": "2af71c81.1e5aec",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
-        "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-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",
+        "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",
         "comments": "",
         "outputs": 1,
         "x": 4788,
@@ -1602,7 +1602,7 @@
         "id": "96b5aedc.4196d",
         "type": "set",
         "name": "set sotn_value",
-        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n",
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",
         "comments": "",
         "x": 3770,
         "y": 1466,
@@ -1702,7 +1702,7 @@
         "id": "b54e7482.e242c8",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
         "x": 4771,
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
index e92f7b2..b9e4d5c 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
@@ -989,7 +989,7 @@
         "id": "5d25d92f.6f798",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "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='' />\n\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='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",
+        "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='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='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",
         "comments": "",
         "outputs": 1,
         "x": 3664,
@@ -1138,7 +1138,7 @@
         "id": "d3c0c42f.4b437",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "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='' />\n\n\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='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",
+        "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\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='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",
         "comments": "",
         "outputs": 1,
         "x": 3654,
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json
index 5684584..ff94831 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "5242e55f.2660bc",
+        "id": "9eb0ec9b.ca633",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 165,
-        "y": 89,
+        "x": 136,
+        "y": 74,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "a94d71b7.2c2048"
+                "a6f9d5f0.04d6"
             ]
         ]
     },
     {
-        "id": "a94d71b7.2c2048",
+        "id": "a6f9d5f0.04d6",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,976 +22,976 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 296.2856903076172,
-        "y": 138.23810863494873,
+        "x": 267.2856903076172,
+        "y": 123.23810863494873,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "aa153b53.66c418"
+                "3b0030c5.3e837"
             ]
         ]
     },
     {
-        "id": "aa153b53.66c418",
+        "id": "3b0030c5.3e837",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-deactivate",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-deactivate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 299.4286193847656,
-        "y": 223.00003242492676,
+        "x": 270.4286193847656,
+        "y": 208.00003242492676,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "76657765.41a798"
+                "4b63b8a8.77bb4"
             ]
         ]
     },
     {
-        "id": "76657765.41a798",
+        "id": "4b63b8a8.77bb4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 449.238037109375,
-        "y": 352.6666564941406,
+        "x": 420.238037109375,
+        "y": 337.6666564941406,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "72f9366e.3a99d8",
-                "680f29c8.59cd3",
-                "fc546f71.cb3e18"
+                "33834047.03c2f8",
+                "eaadc174.02e71",
+                "ce0777fc.b60f2"
             ]
         ]
     },
     {
-        "id": "72f9366e.3a99d8",
+        "id": "33834047.03c2f8",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 723.5716552734375,
-        "y": 619.59716796875,
+        "x": 694.5716552734375,
+        "y": 604.59716796875,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "af064a7b.44da3",
+        "id": "39c1d7dd.5e2018",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 755,
-        "y": 294,
+        "x": 726,
+        "y": 279,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "680f29c8.59cd3",
+        "id": "eaadc174.02e71",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 775,
-        "y": 390,
+        "x": 746,
+        "y": 375,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "ea580b2d.a2b9d",
-                "677c974e.f259e8",
-                "13083344.02e945"
+                "def73660.f1599",
+                "7ca16f67.a19498",
+                "6d28513b.423be8"
             ]
         ]
     },
     {
-        "id": "ea580b2d.a2b9d",
+        "id": "def73660.f1599",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 994,
-        "y": 328,
+        "x": 965,
+        "y": 313,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "a02387a9.ce5868"
+                "5c5bc497.c1130c"
             ]
         ]
     },
     {
-        "id": "677c974e.f259e8",
+        "id": "7ca16f67.a19498",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1003.490966796875,
-        "y": 370.57403564453125,
+        "x": 974.490966796875,
+        "y": 355.57403564453125,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "620a8e19.7969b8"
+                "3202281d.474eb8"
             ]
         ]
     },
     {
-        "id": "13083344.02e945",
+        "id": "6d28513b.423be8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 992,
-        "y": 417,
+        "x": 963,
+        "y": 402,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "ee25c1ac.70f318"
+                "a1d5aff9.d75b68"
             ]
         ]
     },
     {
-        "id": "620a8e19.7969b8",
+        "id": "3202281d.474eb8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1157.0623779296875,
-        "y": 373.8597717285156,
+        "x": 1128.0623779296875,
+        "y": 358.8597717285156,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "ee25c1ac.70f318",
+        "id": "a1d5aff9.d75b68",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1161,
-        "y": 418,
+        "x": 1132,
+        "y": 403,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "a02387a9.ce5868",
+        "id": "5c5bc497.c1130c",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1191,
-        "y": 324,
+        "x": 1162,
+        "y": 309,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "17bf0063.d6585"
+                "b3c4b504.2321f"
             ]
         ]
     },
     {
-        "id": "17bf0063.d6585",
+        "id": "b3c4b504.2321f",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1414.33349609375,
-        "y": 323.99993896484375,
+        "x": 1385.33349609375,
+        "y": 308.99993896484375,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "c3612b80.a84938"
+                "2c61dbe.2d462a4"
             ]
         ]
     },
     {
-        "id": "c3612b80.a84938",
+        "id": "2c61dbe.2d462a4",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1615.0001335144043,
-        "y": 325.00002098083496,
+        "x": 1586.0001335144043,
+        "y": 310.00002098083496,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "7884e617.49647"
+                "8cb99e8e.6d2cc"
             ]
         ]
     },
     {
-        "id": "fc546f71.cb3e18",
+        "id": "ce0777fc.b60f2",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 741,
-        "y": 338,
+        "x": 712,
+        "y": 323,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7884e617.49647",
+        "id": "8cb99e8e.6d2cc",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1853,
-        "y": 327,
+        "x": 1824,
+        "y": 312,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "d6ce182b.31b988",
-                "aa98166f.4a5d48",
-                "6c3ef06d.2c8af8"
+                "e48909d7.1167",
+                "9d9cf2b9.138cc",
+                "c57bdede.c607a8"
             ]
         ]
     },
     {
-        "id": "d6ce182b.31b988",
+        "id": "e48909d7.1167",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2061,
-        "y": 291,
+        "x": 2032,
+        "y": 276,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "f5ad0f9a.63e04"
+                "7447d3b7.3d9674"
             ]
         ]
     },
     {
-        "id": "aa98166f.4a5d48",
+        "id": "9d9cf2b9.138cc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2061.490966796875,
-        "y": 336.57403564453125,
+        "x": 2032.490966796875,
+        "y": 321.57403564453125,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "8c465bb9.ef2cc8"
+                "c3f91382.355d78"
             ]
         ]
     },
     {
-        "id": "6c3ef06d.2c8af8",
+        "id": "c57bdede.c607a8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2059,
-        "y": 380,
+        "x": 2030,
+        "y": 365,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "63631469.f6833c"
+                "8f45128e.10469"
             ]
         ]
     },
     {
-        "id": "8c465bb9.ef2cc8",
+        "id": "c3f91382.355d78",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2224.0623779296875,
-        "y": 336.8597717285156,
+        "x": 2195.0623779296875,
+        "y": 321.8597717285156,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "63631469.f6833c",
+        "id": "8f45128e.10469",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2228,
-        "y": 381,
+        "x": 2199,
+        "y": 366,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "b3f0264f.4b3ab",
+        "id": "eaa455f.69afea8",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2534,
-        "y": 380,
+        "x": 2505,
+        "y": 365,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "b834bb7a.d792e",
-                "1e7aae42.a3c8e2",
-                "2a5354ed.3760dc"
+                "754a3f5.4e5d3c",
+                "563654a8.f8269c",
+                "49966192.933e3"
             ]
         ]
     },
     {
-        "id": "86694c65.1bab48",
+        "id": "44a58adf.5965ac",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2918,
-        "y": 380,
+        "x": 2889,
+        "y": 365,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "a6c81dc0.f9e978",
-                "23f1ef20.aa22c8",
-                "d80ddf6.5239ba",
-                "a14e9d29.27087"
+                "c9dc240e.1f5cf8",
+                "2f80a99a.2436ee",
+                "eb52e479.fabdf8",
+                "e64ba97a.ab16f8"
             ]
         ]
     },
     {
-        "id": "b834bb7a.d792e",
+        "id": "754a3f5.4e5d3c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2745,
-        "y": 382,
+        "x": 2716,
+        "y": 367,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "86694c65.1bab48"
+                "44a58adf.5965ac"
             ]
         ]
     },
     {
-        "id": "1e7aae42.a3c8e2",
+        "id": "563654a8.f8269c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2745.490966796875,
-        "y": 427.57403564453125,
+        "x": 2716.490966796875,
+        "y": 412.57403564453125,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "6a176f0f.10d98"
+                "8ffd54c7.1ceb58"
             ]
         ]
     },
     {
-        "id": "2a5354ed.3760dc",
+        "id": "49966192.933e3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2743,
-        "y": 471,
+        "x": 2714,
+        "y": 456,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "2cad2870.f6f2f"
+                "1dfb3bfc.f80f24"
             ]
         ]
     },
     {
-        "id": "2cad2870.f6f2f",
+        "id": "1dfb3bfc.f80f24",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2910,
-        "y": 470,
+        "x": 2881,
+        "y": 455,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "6a176f0f.10d98",
+        "id": "8ffd54c7.1ceb58",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2908.0623779296875,
-        "y": 427.8597717285156,
+        "x": 2879.0623779296875,
+        "y": 412.8597717285156,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "f5ad0f9a.63e04",
+        "id": "7447d3b7.3d9674",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2262,
-        "y": 286,
+        "x": 2233,
+        "y": 271,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "1569ccc.fe523b3"
+                "80b48506.a5c978"
             ]
         ]
     },
     {
-        "id": "1569ccc.fe523b3",
+        "id": "80b48506.a5c978",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2467,
-        "y": 286,
+        "x": 2438,
+        "y": 271,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "419949a6.57988"
+                "36fdb5a2.702cb2"
             ]
         ]
     },
     {
-        "id": "419949a6.57988",
+        "id": "36fdb5a2.702cb2",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2633,
-        "y": 286,
+        "x": 2604,
+        "y": 271,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "da248b6f.863148"
+                "32e2ef12.2d28f8"
             ]
         ]
     },
     {
-        "id": "da248b6f.863148",
+        "id": "32e2ef12.2d28f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2796,
-        "y": 286,
+        "x": 2767,
+        "y": 271,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "b3f0264f.4b3ab"
+                "eaa455f.69afea8"
             ]
         ]
     },
     {
-        "id": "a6c81dc0.f9e978",
+        "id": "c9dc240e.1f5cf8",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 3133,
-        "y": 90,
+        "x": 3104,
+        "y": 75,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "23f1ef20.aa22c8",
+        "id": "2f80a99a.2436ee",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3159,
-        "y": 207,
+        "x": 3130,
+        "y": 192,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "de4bc6aa.088c5",
-                "2b53e15d.dd21ae",
-                "ae35d78c.86b8"
+                "5dad328f.715b34",
+                "e3a6748e.a712d",
+                "e35e866f.df6d4"
             ]
         ]
     },
     {
-        "id": "de4bc6aa.088c5",
+        "id": "5dad328f.715b34",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3354.5001220703125,
-        "y": 159,
+        "x": 3325.5001220703125,
+        "y": 144,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "9db55161.c57488"
+                "4d0c253f.a81e74"
             ]
         ]
     },
     {
-        "id": "2b53e15d.dd21ae",
+        "id": "e3a6748e.a712d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3346.5001220703125,
-        "y": 214,
+        "x": 3317.5001220703125,
+        "y": 199,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "577df12f.4d35a8"
+                "b2cddf9.b286da"
             ]
         ]
     },
     {
-        "id": "9db55161.c57488",
+        "id": "4d0c253f.a81e74",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3498.8824462890625,
-        "y": 158.65567016601562,
+        "x": 3469.8824462890625,
+        "y": 143.65567016601562,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "5d329fe.f531fe"
+                "1f908e24.7ffb6a"
             ]
         ]
     },
     {
-        "id": "5d329fe.f531fe",
+        "id": "1f908e24.7ffb6a",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3683,
-        "y": 157,
+        "x": 3654,
+        "y": 142,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "b71d5fcd.e9cea"
+                "731e3134.cae0e8"
             ]
         ]
     },
     {
-        "id": "b71d5fcd.e9cea",
+        "id": "731e3134.cae0e8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3878,
-        "y": 157,
+        "x": 3849,
+        "y": 142,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "e408bf35.72655"
+                "924b0e47.33623"
             ]
         ]
     },
     {
-        "id": "ae35d78c.86b8",
+        "id": "e35e866f.df6d4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3351.5001220703125,
-        "y": 271,
+        "x": 3322.5001220703125,
+        "y": 256,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "ee316bbc.ab53b8"
+                "96d892fb.bdb65"
             ]
         ]
     },
     {
-        "id": "ee316bbc.ab53b8",
+        "id": "96d892fb.bdb65",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3503.5001220703125,
-        "y": 272,
+        "x": 3474.5001220703125,
+        "y": 257,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "577df12f.4d35a8",
+        "id": "b2cddf9.b286da",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3514.5001220703125,
-        "y": 215,
+        "x": 3485.5001220703125,
+        "y": 200,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "c9c3e28f.63609",
+        "id": "f5b1ba3f.53f16",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4466,
-        "y": 174,
+        "x": 4437,
+        "y": 159,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "3dd076cd.5c231a",
-                "c9f64ae8.35669",
-                "7381c16f.b370e"
+                "24a03be4.6f22dc",
+                "9afded7b.e0fd88",
+                "473aa7de.af209"
             ]
         ]
     },
     {
-        "id": "e8fac782.8b4fb",
+        "id": "e5beadfa.65d4b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4260,
-        "y": 161,
+        "x": 4231,
+        "y": 146,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "66c06218.223abc",
-                "c9c3e28f.63609",
-                "8fb6a8ce.c9f538"
+                "c8e5909.1b608f",
+                "f5b1ba3f.53f16",
+                "f37bd9fd.aaa8a8"
             ]
         ]
     },
     {
-        "id": "66c06218.223abc",
+        "id": "c8e5909.1b608f",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4496,
-        "y": 122,
+        "x": 4467,
+        "y": 107,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "3dd076cd.5c231a",
+        "id": "24a03be4.6f22dc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4676,
-        "y": 165,
+        "x": 4647,
+        "y": 150,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "ffc56656.084b18"
+                "d0a9d6e9.c56f4"
             ]
         ]
     },
     {
-        "id": "c9f64ae8.35669",
+        "id": "9afded7b.e0fd88",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4668,
-        "y": 220,
+        "x": 4639,
+        "y": 205,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "df0df27a.a48ca"
+                "27cca76b.e2c508"
             ]
         ]
     },
     {
-        "id": "7381c16f.b370e",
+        "id": "473aa7de.af209",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4673,
-        "y": 277,
+        "x": 4644,
+        "y": 262,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "1cc1a486.bc1f73"
+                "61a0060a.f22c2"
             ]
         ]
     },
     {
-        "id": "1cc1a486.bc1f73",
+        "id": "61a0060a.f22c2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4825,
-        "y": 278,
+        "x": 4796,
+        "y": 263,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "df0df27a.a48ca",
+        "id": "27cca76b.e2c508",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4836,
-        "y": 223,
+        "x": 4807,
+        "y": 208,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "ffc56656.084b18",
+        "id": "d0a9d6e9.c56f4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4820.38232421875,
-        "y": 162.65567016601562,
+        "x": 4791.38232421875,
+        "y": 147.65567016601562,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "f9ba3b0e.b3dbd8"
+                "67daf343.f6ee2c"
             ]
         ]
     },
     {
-        "id": "e408bf35.72655",
+        "id": "924b0e47.33623",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4081,
-        "y": 161,
+        "x": 4052,
+        "y": 146,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "e8fac782.8b4fb"
+                "e5beadfa.65d4b"
             ]
         ]
     },
     {
-        "id": "f9ba3b0e.b3dbd8",
+        "id": "67daf343.f6ee2c",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5035,
-        "y": 159,
+        "x": 5006,
+        "y": 144,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "8fb6a8ce.c9f538",
+        "id": "f37bd9fd.aaa8a8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4416,
-        "y": 238,
+        "x": 4387,
+        "y": 223,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "d80ddf6.5239ba",
+        "id": "eb52e479.fabdf8",
         "type": "execute",
         "name": "execute RestApiCallNode Delete ethernet Service without token",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.connectivity-id`\" />\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",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3289,
-        "y": 602,
+        "x": 3260,
+        "y": 587,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "56ef2c2f.bde334",
-                "20356ae6.118a76"
+                "f7e1f7cd.472128",
+                "cd5ebb71.771178"
             ]
         ]
     },
     {
-        "id": "56ef2c2f.bde334",
+        "id": "f7e1f7cd.472128",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3635.5,
-        "y": 595,
+        "x": 3606.5,
+        "y": 580,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "45e55581.afe784"
+                "e8c999cc.b2fcc"
             ]
         ]
     },
     {
-        "id": "20356ae6.118a76",
+        "id": "cd5ebb71.771178",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3639.5,
-        "y": 635,
+        "x": 3610.5,
+        "y": 620,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "b4e6443a.f1c248"
+                "fe0f592f.73096"
             ]
         ]
     },
     {
-        "id": "b4e6443a.f1c248",
+        "id": "fe0f592f.73096",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3797,
-        "y": 635,
+        "x": 3768,
+        "y": 620,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "f2316450.62431",
-                "6c3e1e17.47ccd8"
+                "a35fbdc3.ba44d8",
+                "25ddb449.839c14"
             ]
         ]
     },
     {
-        "id": "45e55581.afe784",
+        "id": "e8c999cc.b2fcc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
-        "x": 3793.5,
-        "y": 595,
+        "x": 3764.5,
+        "y": 580,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "f2316450.62431",
+        "id": "a35fbdc3.ba44d8",
         "type": "save",
-        "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
-        "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-id`' />\n\n<parameter name='operational-status' value='Deactivated' />\n",
+        "name": "update vpn-binding resource (aka. OTN domainA) in AAI",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 4125.5,
-        "y": 635,
+        "x": 4096.5,
+        "y": 620,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "6c3e1e17.47ccd8",
+        "id": "25ddb449.839c14",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 4052.5,
-        "y": 681,
+        "x": 4023.5,
+        "y": 666,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a14e9d29.27087",
+        "id": "e64ba97a.ab16f8",
         "type": "execute",
         "name": "execute RestApiCallNode Delete OTN tunnel with token",
-        "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-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`\" />",
+        "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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3262,
-        "y": 474,
+        "x": 3233,
+        "y": 459,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "692cf34e.ccecdc",
-                "64e95b5b.03211c"
+                "e39876fb.5fed98",
+                "bba7f7ba.20df2"
             ]
         ]
     },
     {
-        "id": "692cf34e.ccecdc",
+        "id": "e39876fb.5fed98",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3594.5,
-        "y": 444,
+        "x": 3565.5,
+        "y": 429,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "8f4d555e.2bf24"
+                "577f2ccc.95a23c"
             ]
         ]
     },
     {
-        "id": "64e95b5b.03211c",
+        "id": "bba7f7ba.20df2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3599.5,
-        "y": 509,
+        "x": 3570.5,
+        "y": 494,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             [
-                "deb2a97d.a041c8"
+                "f956764e.d59e5"
             ]
         ]
     },
     {
-        "id": "8f4d555e.2bf24",
+        "id": "577f2ccc.95a23c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 3770.5,
-        "y": 444,
+        "x": 3741.5,
+        "y": 429,
         "z": "b39eb7ec.28f1a8",
         "wires": []
     },
     {
-        "id": "deb2a97d.a041c8",
+        "id": "f956764e.d59e5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3766,
-        "y": 509,
+        "x": 3737,
+        "y": 494,
         "z": "b39eb7ec.28f1a8",
         "wires": [
             []
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json
index 6690c0c..58ab642 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "bf5e551e.2a4d68",
+        "id": "2b0ca809.8b9448",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 150,
-        "y": 61,
+        "x": 190,
+        "y": 84,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "536d861a.099138"
+                "d6cca48a.4b98c"
             ]
         ]
     },
     {
-        "id": "536d861a.099138",
+        "id": "d6cca48a.4b98c",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,987 +22,987 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 281.2856903076172,
-        "y": 110.23810863494873,
+        "x": 321.2856903076172,
+        "y": 133.23810863494873,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "6541c50d.7a4ee4"
+                "d504a218.d5b0f"
             ]
         ]
     },
     {
-        "id": "6541c50d.7a4ee4",
+        "id": "d504a218.d5b0f",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-delete",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 284.4286193847656,
-        "y": 195.00003242492676,
+        "x": 324.4286193847656,
+        "y": 218.00003242492676,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "b890e0d.be3caa"
+                "6927f12e.f495a8"
             ]
         ]
     },
     {
-        "id": "b890e0d.be3caa",
+        "id": "6927f12e.f495a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 434.238037109375,
-        "y": 324.6666564941406,
+        "x": 474.238037109375,
+        "y": 347.6666564941406,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "2c42b5ac.a1886a",
-                "a9ded91f.36ccb8",
-                "783cf92b.26682"
+                "a03a6652.95082",
+                "5448151c.b0ab3c",
+                "926eb1f8.ec5de8"
             ]
         ]
     },
     {
-        "id": "2c42b5ac.a1886a",
+        "id": "a03a6652.95082",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 730.5716552734375,
-        "y": 601.59716796875,
+        "x": 770.5716552734375,
+        "y": 624.59716796875,
         "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "231b56c7.bc5152",
+        "id": "de37ea5b.6e73f8",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 762,
-        "y": 276,
+        "x": 802,
+        "y": 299,
         "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "a9ded91f.36ccb8",
+        "id": "5448151c.b0ab3c",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n    \n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 782,
-        "y": 372,
+        "x": 822,
+        "y": 395,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "ebd2852a.6b8948",
-                "6eeb6239.832acc",
-                "accd90f7.832538"
+                "84d63f33.5d595",
+                "bc6def6f.91b498",
+                "9f25bb22.1bcb28"
             ]
         ]
     },
     {
-        "id": "ebd2852a.6b8948",
+        "id": "84d63f33.5d595",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1001,
-        "y": 310,
+        "x": 1041,
+        "y": 333,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "cd7dc6c0.b4fb9"
+                "454b8601.544a2"
             ]
         ]
     },
     {
-        "id": "6eeb6239.832acc",
+        "id": "bc6def6f.91b498",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1010.490966796875,
-        "y": 352.57403564453125,
+        "x": 1050.490966796875,
+        "y": 375.57403564453125,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "63941e02.5fb4"
+                "6ae2b2ea.c01e64"
             ]
         ]
     },
     {
-        "id": "accd90f7.832538",
+        "id": "9f25bb22.1bcb28",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 999,
-        "y": 399,
+        "x": 1039,
+        "y": 422,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "331acfad.087d3"
+                "5abda4b4.ada70c"
             ]
         ]
     },
     {
-        "id": "63941e02.5fb4",
+        "id": "6ae2b2ea.c01e64",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1164.0623779296875,
-        "y": 355.8597717285156,
+        "x": 1204.0623779296875,
+        "y": 378.8597717285156,
         "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "331acfad.087d3",
+        "id": "5abda4b4.ada70c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1168,
-        "y": 400,
+        "x": 1208,
+        "y": 423,
         "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "cd7dc6c0.b4fb9",
+        "id": "454b8601.544a2",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1198,
-        "y": 306,
+        "x": 1238,
+        "y": 329,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "71a5e1a5.fba1e8"
+                "126fb5a4.b7562a"
             ]
         ]
     },
     {
-        "id": "71a5e1a5.fba1e8",
+        "id": "126fb5a4.b7562a",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1421.33349609375,
-        "y": 305.99993896484375,
+        "x": 1461.33349609375,
+        "y": 328.99993896484375,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "45ab176d.29b28"
+                "ceb59f97.b5ebc"
             ]
         ]
     },
     {
-        "id": "45ab176d.29b28",
+        "id": "ceb59f97.b5ebc",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1622.0001335144043,
-        "y": 307.00002098083496,
+        "x": 1662.0001335144043,
+        "y": 330.00002098083496,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "8b30afaa.f156f"
+                "7a55fd6d.840e7c"
             ]
         ]
     },
     {
-        "id": "783cf92b.26682",
+        "id": "926eb1f8.ec5de8",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 748,
-        "y": 320,
+        "x": 788,
+        "y": 343,
         "z": "e001b214.9c4f88",
         "wires": [
             []
         ]
     },
     {
-        "id": "8b30afaa.f156f",
+        "id": "7a55fd6d.840e7c",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1860,
-        "y": 309,
+        "x": 1900,
+        "y": 332,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "a8a15026.50a8d",
-                "c9ce2298.2cf6b",
-                "be682b6.40831d8"
+                "ffc75917.89fb6",
+                "cc16da88.4c197",
+                "59e9aa76.56f554"
             ]
         ]
     },
     {
-        "id": "a8a15026.50a8d",
+        "id": "ffc75917.89fb6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2068,
-        "y": 273,
+        "x": 2108,
+        "y": 296,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "d739426f.d36bb8"
+                "f17f297f.55ca2"
             ]
         ]
     },
     {
-        "id": "c9ce2298.2cf6b",
+        "id": "cc16da88.4c197",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2068.490966796875,
-        "y": 318.57403564453125,
+        "x": 2108.490966796875,
+        "y": 341.57403564453125,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "21e5c859.ccd51"
+                "43ce3007.4fa548"
             ]
         ]
     },
     {
-        "id": "be682b6.40831d8",
+        "id": "59e9aa76.56f554",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2066,
-        "y": 362,
+        "x": 2106,
+        "y": 385,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "fbd36b9c.f4a15"
+                "24973dde.e7929a"
             ]
         ]
     },
     {
-        "id": "21e5c859.ccd51",
+        "id": "43ce3007.4fa548",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2231.0623779296875,
-        "y": 318.8597717285156,
+        "x": 2271.0623779296875,
+        "y": 341.8597717285156,
         "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "fbd36b9c.f4a15",
+        "id": "24973dde.e7929a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2235,
-        "y": 363,
+        "x": 2275,
+        "y": 386,
         "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "a46cc38.98dbb4",
+        "id": "e4afb06c.970a38",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2541,
-        "y": 362,
+        "x": 2581,
+        "y": 385,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "9e895711.9515a",
-                "45b51772.60fd7",
-                "90f1dd00.339a68"
+                "70a3d3e9.7bf864",
+                "4cd17047.fe16a",
+                "c79d571c.0d07f8"
             ]
         ]
     },
     {
-        "id": "41605fb3.ac785",
+        "id": "8e239cd5.1b82f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2925,
-        "y": 362,
+        "x": 2965,
+        "y": 385,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "315634a1.892b34",
-                "34cfba69.4d51e6",
-                "58dd3cb5.26ee4c",
-                "e4194069.37887",
-                "e5415b2a.1b069",
-                "af105f82.f24",
-                "bfb53be2.1d7798"
+                "4fff45e1.354a6c",
+                "7b5f3a76.40dbac",
+                "daa0af8a.c7da5",
+                "1aa21051.71e3e8",
+                "3724be1f.92f8ea",
+                "f7cc948a.349f48",
+                "41f2a122.089c2"
             ]
         ]
     },
     {
-        "id": "9e895711.9515a",
+        "id": "70a3d3e9.7bf864",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2752,
-        "y": 364,
+        "x": 2792,
+        "y": 387,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "41605fb3.ac785"
+                "8e239cd5.1b82f8"
             ]
         ]
     },
     {
-        "id": "45b51772.60fd7",
+        "id": "4cd17047.fe16a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2752.490966796875,
-        "y": 409.57403564453125,
+        "x": 2792.490966796875,
+        "y": 432.57403564453125,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "80ebbe87.b5f13"
+                "cc11f54d.5be868"
             ]
         ]
     },
     {
-        "id": "90f1dd00.339a68",
+        "id": "c79d571c.0d07f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2750,
-        "y": 453,
+        "x": 2790,
+        "y": 476,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "928e602f.f7958"
+                "24a1d14c.bade0e"
             ]
         ]
     },
     {
-        "id": "928e602f.f7958",
+        "id": "24a1d14c.bade0e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2917,
-        "y": 452,
+        "x": 2957,
+        "y": 475,
         "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "80ebbe87.b5f13",
+        "id": "cc11f54d.5be868",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2915.0623779296875,
-        "y": 409.8597717285156,
+        "x": 2955.0623779296875,
+        "y": 432.8597717285156,
         "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "d739426f.d36bb8",
+        "id": "f17f297f.55ca2",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2269,
-        "y": 268,
+        "x": 2309,
+        "y": 291,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "953eda1a.4d542"
+                "9cf4adfb.1d5c9"
             ]
         ]
     },
     {
-        "id": "953eda1a.4d542",
+        "id": "9cf4adfb.1d5c9",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2474,
-        "y": 268,
+        "x": 2514,
+        "y": 291,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "75a62157.0a968"
+                "6e0c0661.962a2"
             ]
         ]
     },
     {
-        "id": "75a62157.0a968",
+        "id": "6e0c0661.962a2",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2640,
-        "y": 268,
+        "x": 2680,
+        "y": 291,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "d166d1d9.165cd8"
+                "cbe3f419.c9636"
             ]
         ]
     },
     {
-        "id": "d166d1d9.165cd8",
+        "id": "cbe3f419.c9636",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2803,
-        "y": 268,
+        "x": 2843,
+        "y": 291,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "a46cc38.98dbb4"
+                "e4afb06c.970a38"
             ]
         ]
     },
     {
-        "id": "315634a1.892b34",
+        "id": "4fff45e1.354a6c",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 3140,
-        "y": 72,
+        "x": 3180,
+        "y": 95,
         "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "34cfba69.4d51e6",
+        "id": "7b5f3a76.40dbac",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3166,
-        "y": 189,
+        "x": 3206,
+        "y": 212,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "b3f1fbc8.de108",
-                "b343cfff.aa8d4",
-                "284e02e7.51cff6"
+                "38e8f6ad.20b942",
+                "30508f3.2b24cf",
+                "db6a4b33.6458e"
             ]
         ]
     },
     {
-        "id": "b3f1fbc8.de108",
+        "id": "38e8f6ad.20b942",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3361.5001220703125,
-        "y": 141,
+        "x": 3401.5001220703125,
+        "y": 164,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "81f23c52.9a8b3"
+                "740719b1.df8a7"
             ]
         ]
     },
     {
-        "id": "b343cfff.aa8d4",
+        "id": "30508f3.2b24cf",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3353.5001220703125,
-        "y": 196,
+        "x": 3393.5001220703125,
+        "y": 219,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "f8c3b27d.bb7ca8"
+                "dcbcbf80.f3d53"
             ]
         ]
     },
     {
-        "id": "81f23c52.9a8b3",
+        "id": "740719b1.df8a7",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3505.8824462890625,
-        "y": 140.65567016601562,
+        "x": 3545.8824462890625,
+        "y": 163.65567016601562,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "cf4fab4f.ff26f8"
+                "1c636e54.f15ca2"
             ]
         ]
     },
     {
-        "id": "cf4fab4f.ff26f8",
+        "id": "1c636e54.f15ca2",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3690,
-        "y": 139,
+        "x": 3730,
+        "y": 162,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "e5bf62b8.3c949"
+                "5fbdc63d.dd85c8"
             ]
         ]
     },
     {
-        "id": "e5bf62b8.3c949",
+        "id": "5fbdc63d.dd85c8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3885,
-        "y": 139,
+        "x": 3925,
+        "y": 162,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "8f16d6f1.620958"
+                "ea1a11a0.595418"
             ]
         ]
     },
     {
-        "id": "284e02e7.51cff6",
+        "id": "db6a4b33.6458e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3358.5001220703125,
-        "y": 253,
+        "x": 3398.5001220703125,
+        "y": 276,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "a632f8eb.4977a"
+                "1b105dc6.7eab4a"
             ]
         ]
     },
     {
-        "id": "a632f8eb.4977a",
+        "id": "1b105dc6.7eab4a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3510.5001220703125,
-        "y": 254,
+        "x": 3550.5001220703125,
+        "y": 277,
         "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "f8c3b27d.bb7ca8",
+        "id": "dcbcbf80.f3d53",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3521.5001220703125,
-        "y": 197,
-        "z": "e001b214.9c4f88",
-        "wires": []
-    },
-    {
-        "id": "c808ab3d.c57d7",
-        "type": "execute",
-        "name": "get esr-thirdparty-sdnc",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 4473,
-        "y": 156,
-        "z": "e001b214.9c4f88",
-        "wires": [
-            [
-                "2713e757.2f3d8",
-                "638dc84.73ac0b8",
-                "4816e676.e50758"
-            ]
-        ]
-    },
-    {
-        "id": "c8c24e1.d1c68b",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 4267,
-        "y": 143,
-        "z": "e001b214.9c4f88",
-        "wires": [
-            [
-                "e331349b.029ff",
-                "c808ab3d.c57d7",
-                "3516a6c6.78d90a"
-            ]
-        ]
-    },
-    {
-        "id": "e331349b.029ff",
-        "type": "set",
-        "name": "set esr-thirdparty-sdnc domain id",
-        "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
-        "comments": "",
-        "x": 4503,
-        "y": 104,
-        "z": "e001b214.9c4f88",
-        "wires": []
-    },
-    {
-        "id": "2713e757.2f3d8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4683,
-        "y": 147,
-        "z": "e001b214.9c4f88",
-        "wires": [
-            [
-                "f914c736.a35ec"
-            ]
-        ]
-    },
-    {
-        "id": "638dc84.73ac0b8",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4675,
-        "y": 202,
-        "z": "e001b214.9c4f88",
-        "wires": [
-            [
-                "ff1a96b1.1ab44"
-            ]
-        ]
-    },
-    {
-        "id": "4816e676.e50758",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4680,
-        "y": 259,
-        "z": "e001b214.9c4f88",
-        "wires": [
-            [
-                "81b24b13.ecc93"
-            ]
-        ]
-    },
-    {
-        "id": "81b24b13.ecc93",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
-        "comments": "",
-        "x": 4832,
-        "y": 260,
-        "z": "e001b214.9c4f88",
-        "wires": []
-    },
-    {
-        "id": "ff1a96b1.1ab44",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
-        "comments": "",
-        "x": 4843,
-        "y": 205,
-        "z": "e001b214.9c4f88",
-        "wires": []
-    },
-    {
-        "id": "f914c736.a35ec",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 4827.38232421875,
-        "y": 144.65567016601562,
-        "z": "e001b214.9c4f88",
-        "wires": [
-            [
-                "3dce9a6f.ca54ee"
-            ]
-        ]
-    },
-    {
-        "id": "8f16d6f1.620958",
-        "type": "outcome",
-        "name": "esr-thirdparty-sdnc",
-        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4088,
-        "y": 143,
-        "z": "e001b214.9c4f88",
-        "wires": [
-            [
-                "c8c24e1.d1c68b"
-            ]
-        ]
-    },
-    {
-        "id": "3dce9a6f.ca54ee",
-        "type": "set",
-        "name": "set controller domain data",
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
-        "comments": "",
-        "x": 5042,
-        "y": 141,
-        "z": "e001b214.9c4f88",
-        "wires": []
-    },
-    {
-        "id": "3516a6c6.78d90a",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 4423,
+        "x": 3561.5001220703125,
         "y": 220,
         "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "af105f82.f24",
+        "id": "96600252.0c8c48",
         "type": "execute",
-        "name": "execute RestApiCallNode Delete transport slice without token",
-        "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",
+        "name": "get esr-thirdparty-sdnc",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 3290,
-        "y": 487,
+        "x": 4513,
+        "y": 179,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "58523c50.a8358c",
-                "666e388c.437238"
+                "a696df4c.ceae58",
+                "fe810a19.c34a78",
+                "bbf2a8b1.f6a27"
             ]
         ]
     },
     {
-        "id": "58523c50.a8358c",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3633.5,
-        "y": 482,
-        "z": "e001b214.9c4f88",
-        "wires": [
-            [
-                "3480dc80.ce39a4"
-            ]
-        ]
-    },
-    {
-        "id": "666e388c.437238",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3637.5,
-        "y": 522,
-        "z": "e001b214.9c4f88",
-        "wires": [
-            [
-                "f77842b2.9897b"
-            ]
-        ]
-    },
-    {
-        "id": "f77842b2.9897b",
+        "id": "792a96dd.b5714",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
-        "comments": "",
         "outputs": 1,
-        "x": 3795,
-        "y": 522,
+        "x": 4307,
+        "y": 166,
         "z": "e001b214.9c4f88",
         "wires": [
-            []
+            [
+                "ae074209.8ac108",
+                "96600252.0c8c48",
+                "17402644.74336a"
+            ]
         ]
     },
     {
-        "id": "3480dc80.ce39a4",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing deallocate transport slice rest api\" />\n",
-        "comments": "",
-        "x": 3791.5,
-        "y": 482,
-        "z": "e001b214.9c4f88",
-        "wires": []
-    },
-    {
-        "id": "58dd3cb5.26ee4c",
+        "id": "ae074209.8ac108",
         "type": "set",
-        "name": "set attachment_param for TN NSSSI deleteion in PNC",
-        "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
+        "name": "set esr-thirdparty-sdnc domain id",
+        "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 3266,
-        "y": 362,
+        "x": 4543,
+        "y": 127,
         "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "e4194069.37887",
-        "type": "save",
-        "name": "delete connectivity resource in AAI",
-        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3196,
-        "y": 797,
-        "z": "e001b214.9c4f88",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e5415b2a.1b069",
-        "type": "save",
-        "name": "delete vpn-binding resource in AAI",
-        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3192,
-        "y": 841,
-        "z": "e001b214.9c4f88",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "bfb53be2.1d7798",
-        "type": "execute",
-        "name": "execute RestApiCallNode domain UNI deColoring",
-        "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",
-        "comments": "",
-        "outputs": 1,
-        "x": 3253,
-        "y": 660,
-        "z": "e001b214.9c4f88",
-        "wires": [
-            [
-                "9751ec98.3e8be8",
-                "4652cbec.507204"
-            ]
-        ]
-    },
-    {
-        "id": "4652cbec.507204",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3519,
-        "y": 640,
-        "z": "e001b214.9c4f88",
-        "wires": [
-            [
-                "45199d8e.7e5fdc"
-            ]
-        ]
-    },
-    {
-        "id": "9751ec98.3e8be8",
+        "id": "a696df4c.ceae58",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3520.000213623047,
-        "y": 690.9999094009399,
+        "x": 4723,
+        "y": 170,
         "z": "e001b214.9c4f88",
         "wires": [
             [
-                "ebd36513.cafc88"
+                "b9171802.93433"
             ]
         ]
     },
     {
-        "id": "45199d8e.7e5fdc",
+        "id": "fe810a19.c34a78",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4715,
+        "y": 225,
+        "z": "e001b214.9c4f88",
+        "wires": [
+            [
+                "4798e972.a0e21"
+            ]
+        ]
+    },
+    {
+        "id": "bbf2a8b1.f6a27",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4720,
+        "y": 282,
+        "z": "e001b214.9c4f88",
+        "wires": [
+            [
+                "c94f16ac.1ba968"
+            ]
+        ]
+    },
+    {
+        "id": "c94f16ac.1ba968",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing decoloring UNI rest api\" />\n",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3659.0002479553223,
-        "y": 640.0000009536743,
+        "x": 4872,
+        "y": 283,
         "z": "e001b214.9c4f88",
         "wires": []
     },
     {
-        "id": "ebd36513.cafc88",
+        "id": "4798e972.a0e21",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 4883,
+        "y": 228,
+        "z": "e001b214.9c4f88",
+        "wires": []
+    },
+    {
+        "id": "b9171802.93433",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3665.02725982666,
-        "y": 688.7453947067261,
+        "x": 4867.38232421875,
+        "y": 167.65567016601562,
+        "z": "e001b214.9c4f88",
+        "wires": [
+            [
+                "300135e0.73329a"
+            ]
+        ]
+    },
+    {
+        "id": "ea1a11a0.595418",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4128,
+        "y": 166,
+        "z": "e001b214.9c4f88",
+        "wires": [
+            [
+                "792a96dd.b5714"
+            ]
+        ]
+    },
+    {
+        "id": "300135e0.73329a",
+        "type": "set",
+        "name": "set controller domain data",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
+        "comments": "",
+        "x": 5082,
+        "y": 164,
+        "z": "e001b214.9c4f88",
+        "wires": []
+    },
+    {
+        "id": "17402644.74336a",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4463,
+        "y": 243,
+        "z": "e001b214.9c4f88",
+        "wires": []
+    },
+    {
+        "id": "f7cc948a.349f48",
+        "type": "execute",
+        "name": "execute RestApiCallNode Delete transport slice without token",
+        "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",
+        "comments": "",
+        "outputs": 1,
+        "x": 3330,
+        "y": 510,
+        "z": "e001b214.9c4f88",
+        "wires": [
+            [
+                "c1188623.deee1",
+                "470e64d.379031c"
+            ]
+        ]
+    },
+    {
+        "id": "c1188623.deee1",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3673.5,
+        "y": 505,
+        "z": "e001b214.9c4f88",
+        "wires": [
+            [
+                "d4cf9dc2.d5afd8"
+            ]
+        ]
+    },
+    {
+        "id": "470e64d.379031c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3677.5,
+        "y": 545,
+        "z": "e001b214.9c4f88",
+        "wires": [
+            [
+                "3364bc79.06d9e4"
+            ]
+        ]
+    },
+    {
+        "id": "3364bc79.06d9e4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 3835,
+        "y": 545,
+        "z": "e001b214.9c4f88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d4cf9dc2.d5afd8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing deallocate transport slice rest api\" />\n",
+        "comments": "",
+        "x": 3831.5,
+        "y": 505,
+        "z": "e001b214.9c4f88",
+        "wires": []
+    },
+    {
+        "id": "daa0af8a.c7da5",
+        "type": "set",
+        "name": "set attachment_param for TN NSSSI deleteion in PNC",
+        "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
+        "comments": "",
+        "x": 3306,
+        "y": 385,
+        "z": "e001b214.9c4f88",
+        "wires": []
+    },
+    {
+        "id": "1aa21051.71e3e8",
+        "type": "save",
+        "name": "delete connectivity resource in AAI",
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3236,
+        "y": 820,
+        "z": "e001b214.9c4f88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3724be1f.92f8ea",
+        "type": "save",
+        "name": "delete vpn-binding resource in AAI",
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3232,
+        "y": 864,
+        "z": "e001b214.9c4f88",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "41f2a122.089c2",
+        "type": "execute",
+        "name": "execute RestApiCallNode domain UNI deColoring",
+        "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",
+        "comments": "",
+        "outputs": 1,
+        "x": 3293,
+        "y": 683,
+        "z": "e001b214.9c4f88",
+        "wires": [
+            [
+                "293d42c2.e74426",
+                "f9376496.43cea8"
+            ]
+        ]
+    },
+    {
+        "id": "f9376496.43cea8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3559,
+        "y": 663,
+        "z": "e001b214.9c4f88",
+        "wires": [
+            [
+                "7b775591.92e164"
+            ]
+        ]
+    },
+    {
+        "id": "293d42c2.e74426",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3560.000213623047,
+        "y": 713.9999094009399,
+        "z": "e001b214.9c4f88",
+        "wires": [
+            [
+                "f17d1b1f.2fc66"
+            ]
+        ]
+    },
+    {
+        "id": "7b775591.92e164",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing decoloring UNI rest api\" />\n",
+        "comments": "",
+        "x": 3699.0002479553223,
+        "y": 663.0000009536743,
+        "z": "e001b214.9c4f88",
+        "wires": []
+    },
+    {
+        "id": "f17d1b1f.2fc66",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3705.02725982666,
+        "y": 711.7453947067261,
         "z": "e001b214.9c4f88",
         "wires": [
             []
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
index b94ac02..e9766c5 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
@@ -187,6 +187,7 @@
                                                                                     <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />
                                                                                     <parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
                                                                                     <parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
+                                                                                    <parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />
                                                                                 </set>
                                                                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                                     <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
@@ -214,7 +215,7 @@
                                                                                             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
                                                                                                     key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >
                                                                                                 <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
-                                                                                                <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
+                                                                                                <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
                                                                                                 <parameter name='operational-status' value='Activated' />
                                                                                             </update>
                                                                                             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
@@ -366,6 +367,7 @@
                                                                                             <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />
                                                                                             <parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />
                                                                                             <parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />
+                                                                                            <parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />
                                                                                         </set>
                                                                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                                             <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
@@ -393,7 +395,7 @@
                                                                                                     <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
                                                                                                             key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >
                                                                                                         <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />
-                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-id`' />
+                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
                                                                                                         <parameter name='operational-status' value='Activated' />
                                                                                                     </update>
                                                                                                     <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
index ff23866..4c6b84b 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
@@ -352,7 +352,7 @@
                                                                                                                             <parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
                                                                                                                             <parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
                                                                                                                             <parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
-                                                                                                                            <parameter name='cvlan' value='' />
+                                                                                                                            <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
                                                                                                                             <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
                                                                                                                             <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
                                                                                                                             <parameter name='CIR' value='`$prop.sotn.cir`' />
@@ -608,7 +608,7 @@
                                                                                                                             <parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
                                                                                                                             <parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
                                                                                                                             <parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
-                                                                                                                            <parameter name='cvlan' value='' />
+                                                                                                                            <parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />
                                                                                                                             <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
                                                                                                                             <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
                                                                                                                             <parameter name='CIR' value='`$prop.sotn.cir`' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
index 3fe3802..214debf 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
@@ -128,7 +128,7 @@
                                                                     </get-resource>
                                                                     <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                         <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-id`" />
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`" />
                                                                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
                                                                         <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
                                                                         <parameter name="format" value="json"/>
@@ -151,7 +151,7 @@
                                                                         </outcome>
                                                                     </execute>
                                                                     <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.connectivity-id`" />
+                                                                        <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`" />
                                                                         <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
                                                                         <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
                                                                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
@@ -176,7 +176,7 @@
                                                                                 <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
                                                                                         key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
                                                                                     <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
-                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
                                                                                     <parameter name='operational-status' value='Deactivated' />
                                                                                 </update>
                                                                                 <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
diff --git a/platform-logic/restapi-templates/src/main/json/ts-ethernet-service.json b/platform-logic/restapi-templates/src/main/json/ts-ethernet-service.json
index 5842e0b..dc1a0c3 100644
--- a/platform-logic/restapi-templates/src/main/json/ts-ethernet-service.json
+++ b/platform-logic/restapi-templates/src/main/json/ts-ethernet-service.json
@@ -38,7 +38,7 @@
                         ],
                         "outer-tag":{
                             "tag-type":"ietf-eth-tran-types:classify-c-vlan",
-                            "vlan-value":1
+                            "vlan-value":${cvlan}
                         },
                         "service-classification-type":"ietf-eth-tran-types:vlan-classification",
                         "ingress-egress-bandwidth-profile":{