Passing a correct OTN tunnel ID and a correct Ethernet Service ID for deletion.

Reading VLAN id from northbound.

Issue-ID: SDNC-1431
Change-Id: Ic89481230fc91ad45fcc8b0d9f14932575ba9b9a
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Former-commit-id: 9889bd77c51dcabea7b564df80b5a22d9b34839e

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 (file)
--- 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",\r
         "type": "set",\r
         "name": "set sotn_value",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "x": 3796.5,\r
         "y": 694,\r
@@ -413,7 +413,7 @@
         "id": "2af71c81.1e5aec",\r
         "type": "save",\r
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-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",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4788,\r
@@ -1602,7 +1602,7 @@
         "id": "96b5aedc.4196d",\r
         "type": "set",\r
         "name": "set sotn_value",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "x": 3770,\r
         "y": 1466,\r
@@ -1702,7 +1702,7 @@
         "id": "b54e7482.e242c8",\r
         "type": "save",\r
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4771,\r

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 (file)
--- 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",\r
         "type": "save",\r
         "name": "save connectivity resource in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='' />\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",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3664,\r
@@ -1138,7 +1138,7 @@
         "id": "d3c0c42f.4b437",\r
         "type": "save",\r
         "name": "save connectivity resource in AAI",\r
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='' />\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",\r
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3654,\r

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 (file)
--- 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 @@
 [\r
     {\r
-        "id": "5242e55f.2660bc",\r
+        "id": "9eb0ec9b.ca633",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 165,\r
-        "y": 89,\r
+        "x": 136,\r
+        "y": 74,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "a94d71b7.2c2048"\r
+                "a6f9d5f0.04d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a94d71b7.2c2048",\r
+        "id": "a6f9d5f0.04d6",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,976 +22,976 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 296.2856903076172,\r
-        "y": 138.23810863494873,\r
+        "x": 267.2856903076172,\r
+        "y": 123.23810863494873,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "aa153b53.66c418"\r
+                "3b0030c5.3e837"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa153b53.66c418",\r
+        "id": "3b0030c5.3e837",\r
         "type": "method",\r
         "name": "method tsli-vnf-topology-operation-trans-slice-deactivate",\r
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-deactivate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 299.4286193847656,\r
-        "y": 223.00003242492676,\r
+        "x": 270.4286193847656,\r
+        "y": 208.00003242492676,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "76657765.41a798"\r
+                "4b63b8a8.77bb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76657765.41a798",\r
+        "id": "4b63b8a8.77bb4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 449.238037109375,\r
-        "y": 352.6666564941406,\r
+        "x": 420.238037109375,\r
+        "y": 337.6666564941406,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "72f9366e.3a99d8",\r
-                "680f29c8.59cd3",\r
-                "fc546f71.cb3e18"\r
+                "33834047.03c2f8",\r
+                "eaadc174.02e71",\r
+                "ce0777fc.b60f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72f9366e.3a99d8",\r
+        "id": "33834047.03c2f8",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 723.5716552734375,\r
-        "y": 619.59716796875,\r
+        "x": 694.5716552734375,\r
+        "y": 604.59716796875,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "af064a7b.44da3",\r
+        "id": "39c1d7dd.5e2018",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 755,\r
-        "y": 294,\r
+        "x": 726,\r
+        "y": 279,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "680f29c8.59cd3",\r
+        "id": "eaadc174.02e71",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--vnf-topology-operation-input.service-information.service-instance-id-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 775,\r
-        "y": 390,\r
+        "x": 746,\r
+        "y": 375,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "ea580b2d.a2b9d",\r
-                "677c974e.f259e8",\r
-                "13083344.02e945"\r
+                "def73660.f1599",\r
+                "7ca16f67.a19498",\r
+                "6d28513b.423be8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea580b2d.a2b9d",\r
+        "id": "def73660.f1599",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 994,\r
-        "y": 328,\r
+        "x": 965,\r
+        "y": 313,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "a02387a9.ce5868"\r
+                "5c5bc497.c1130c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "677c974e.f259e8",\r
+        "id": "7ca16f67.a19498",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1003.490966796875,\r
-        "y": 370.57403564453125,\r
+        "x": 974.490966796875,\r
+        "y": 355.57403564453125,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "620a8e19.7969b8"\r
+                "3202281d.474eb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13083344.02e945",\r
+        "id": "6d28513b.423be8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 992,\r
-        "y": 417,\r
+        "x": 963,\r
+        "y": 402,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "ee25c1ac.70f318"\r
+                "a1d5aff9.d75b68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "620a8e19.7969b8",\r
+        "id": "3202281d.474eb8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1157.0623779296875,\r
-        "y": 373.8597717285156,\r
+        "x": 1128.0623779296875,\r
+        "y": 358.8597717285156,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ee25c1ac.70f318",\r
+        "id": "a1d5aff9.d75b68",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1161,\r
-        "y": 418,\r
+        "x": 1132,\r
+        "y": 403,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a02387a9.ce5868",\r
+        "id": "5c5bc497.c1130c",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1191,\r
-        "y": 324,\r
+        "x": 1162,\r
+        "y": 309,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "17bf0063.d6585"\r
+                "b3c4b504.2321f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17bf0063.d6585",\r
+        "id": "b3c4b504.2321f",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1414.33349609375,\r
-        "y": 323.99993896484375,\r
+        "x": 1385.33349609375,\r
+        "y": 308.99993896484375,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "c3612b80.a84938"\r
+                "2c61dbe.2d462a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3612b80.a84938",\r
+        "id": "2c61dbe.2d462a4",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1615.0001335144043,\r
-        "y": 325.00002098083496,\r
+        "x": 1586.0001335144043,\r
+        "y": 310.00002098083496,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "7884e617.49647"\r
+                "8cb99e8e.6d2cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc546f71.cb3e18",\r
+        "id": "ce0777fc.b60f2",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 741,\r
-        "y": 338,\r
+        "x": 712,\r
+        "y": 323,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7884e617.49647",\r
+        "id": "8cb99e8e.6d2cc",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1853,\r
-        "y": 327,\r
+        "x": 1824,\r
+        "y": 312,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "d6ce182b.31b988",\r
-                "aa98166f.4a5d48",\r
-                "6c3ef06d.2c8af8"\r
+                "e48909d7.1167",\r
+                "9d9cf2b9.138cc",\r
+                "c57bdede.c607a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6ce182b.31b988",\r
+        "id": "e48909d7.1167",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2061,\r
-        "y": 291,\r
+        "x": 2032,\r
+        "y": 276,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "f5ad0f9a.63e04"\r
+                "7447d3b7.3d9674"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa98166f.4a5d48",\r
+        "id": "9d9cf2b9.138cc",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2061.490966796875,\r
-        "y": 336.57403564453125,\r
+        "x": 2032.490966796875,\r
+        "y": 321.57403564453125,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "8c465bb9.ef2cc8"\r
+                "c3f91382.355d78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c3ef06d.2c8af8",\r
+        "id": "c57bdede.c607a8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2059,\r
-        "y": 380,\r
+        "x": 2030,\r
+        "y": 365,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "63631469.f6833c"\r
+                "8f45128e.10469"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c465bb9.ef2cc8",\r
+        "id": "c3f91382.355d78",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2224.0623779296875,\r
-        "y": 336.8597717285156,\r
+        "x": 2195.0623779296875,\r
+        "y": 321.8597717285156,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "63631469.f6833c",\r
+        "id": "8f45128e.10469",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2228,\r
-        "y": 381,\r
+        "x": 2199,\r
+        "y": 366,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b3f0264f.4b3ab",\r
+        "id": "eaa455f.69afea8",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2534,\r
-        "y": 380,\r
+        "x": 2505,\r
+        "y": 365,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "b834bb7a.d792e",\r
-                "1e7aae42.a3c8e2",\r
-                "2a5354ed.3760dc"\r
+                "754a3f5.4e5d3c",\r
+                "563654a8.f8269c",\r
+                "49966192.933e3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "86694c65.1bab48",\r
+        "id": "44a58adf.5965ac",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2918,\r
-        "y": 380,\r
+        "x": 2889,\r
+        "y": 365,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "a6c81dc0.f9e978",\r
-                "23f1ef20.aa22c8",\r
-                "d80ddf6.5239ba",\r
-                "a14e9d29.27087"\r
+                "c9dc240e.1f5cf8",\r
+                "2f80a99a.2436ee",\r
+                "eb52e479.fabdf8",\r
+                "e64ba97a.ab16f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b834bb7a.d792e",\r
+        "id": "754a3f5.4e5d3c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2745,\r
-        "y": 382,\r
+        "x": 2716,\r
+        "y": 367,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "86694c65.1bab48"\r
+                "44a58adf.5965ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e7aae42.a3c8e2",\r
+        "id": "563654a8.f8269c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2745.490966796875,\r
-        "y": 427.57403564453125,\r
+        "x": 2716.490966796875,\r
+        "y": 412.57403564453125,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "6a176f0f.10d98"\r
+                "8ffd54c7.1ceb58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a5354ed.3760dc",\r
+        "id": "49966192.933e3",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2743,\r
-        "y": 471,\r
+        "x": 2714,\r
+        "y": 456,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "2cad2870.f6f2f"\r
+                "1dfb3bfc.f80f24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2cad2870.f6f2f",\r
+        "id": "1dfb3bfc.f80f24",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2910,\r
-        "y": 470,\r
+        "x": 2881,\r
+        "y": 455,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6a176f0f.10d98",\r
+        "id": "8ffd54c7.1ceb58",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2908.0623779296875,\r
-        "y": 427.8597717285156,\r
+        "x": 2879.0623779296875,\r
+        "y": 412.8597717285156,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5ad0f9a.63e04",\r
+        "id": "7447d3b7.3d9674",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2262,\r
-        "y": 286,\r
+        "x": 2233,\r
+        "y": 271,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "1569ccc.fe523b3"\r
+                "80b48506.a5c978"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1569ccc.fe523b3",\r
+        "id": "80b48506.a5c978",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2467,\r
-        "y": 286,\r
+        "x": 2438,\r
+        "y": 271,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "419949a6.57988"\r
+                "36fdb5a2.702cb2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "419949a6.57988",\r
+        "id": "36fdb5a2.702cb2",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2633,\r
-        "y": 286,\r
+        "x": 2604,\r
+        "y": 271,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "da248b6f.863148"\r
+                "32e2ef12.2d28f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da248b6f.863148",\r
+        "id": "32e2ef12.2d28f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2796,\r
-        "y": 286,\r
+        "x": 2767,\r
+        "y": 271,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "b3f0264f.4b3ab"\r
+                "eaa455f.69afea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6c81dc0.f9e978",\r
+        "id": "c9dc240e.1f5cf8",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 3133,\r
-        "y": 90,\r
+        "x": 3104,\r
+        "y": 75,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "23f1ef20.aa22c8",\r
+        "id": "2f80a99a.2436ee",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3159,\r
-        "y": 207,\r
+        "x": 3130,\r
+        "y": 192,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "de4bc6aa.088c5",\r
-                "2b53e15d.dd21ae",\r
-                "ae35d78c.86b8"\r
+                "5dad328f.715b34",\r
+                "e3a6748e.a712d",\r
+                "e35e866f.df6d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de4bc6aa.088c5",\r
+        "id": "5dad328f.715b34",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3354.5001220703125,\r
-        "y": 159,\r
+        "x": 3325.5001220703125,\r
+        "y": 144,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "9db55161.c57488"\r
+                "4d0c253f.a81e74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b53e15d.dd21ae",\r
+        "id": "e3a6748e.a712d",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3346.5001220703125,\r
-        "y": 214,\r
+        "x": 3317.5001220703125,\r
+        "y": 199,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "577df12f.4d35a8"\r
+                "b2cddf9.b286da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9db55161.c57488",\r
+        "id": "4d0c253f.a81e74",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3498.8824462890625,\r
-        "y": 158.65567016601562,\r
+        "x": 3469.8824462890625,\r
+        "y": 143.65567016601562,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "5d329fe.f531fe"\r
+                "1f908e24.7ffb6a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d329fe.f531fe",\r
+        "id": "1f908e24.7ffb6a",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3683,\r
-        "y": 157,\r
+        "x": 3654,\r
+        "y": 142,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "b71d5fcd.e9cea"\r
+                "731e3134.cae0e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b71d5fcd.e9cea",\r
+        "id": "731e3134.cae0e8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3878,\r
-        "y": 157,\r
+        "x": 3849,\r
+        "y": 142,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "e408bf35.72655"\r
+                "924b0e47.33623"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae35d78c.86b8",\r
+        "id": "e35e866f.df6d4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3351.5001220703125,\r
-        "y": 271,\r
+        "x": 3322.5001220703125,\r
+        "y": 256,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "ee316bbc.ab53b8"\r
+                "96d892fb.bdb65"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee316bbc.ab53b8",\r
+        "id": "96d892fb.bdb65",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3503.5001220703125,\r
-        "y": 272,\r
+        "x": 3474.5001220703125,\r
+        "y": 257,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "577df12f.4d35a8",\r
+        "id": "b2cddf9.b286da",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3514.5001220703125,\r
-        "y": 215,\r
+        "x": 3485.5001220703125,\r
+        "y": 200,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9c3e28f.63609",\r
+        "id": "f5b1ba3f.53f16",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4466,\r
-        "y": 174,\r
+        "x": 4437,\r
+        "y": 159,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "3dd076cd.5c231a",\r
-                "c9f64ae8.35669",\r
-                "7381c16f.b370e"\r
+                "24a03be4.6f22dc",\r
+                "9afded7b.e0fd88",\r
+                "473aa7de.af209"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8fac782.8b4fb",\r
+        "id": "e5beadfa.65d4b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4260,\r
-        "y": 161,\r
+        "x": 4231,\r
+        "y": 146,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "66c06218.223abc",\r
-                "c9c3e28f.63609",\r
-                "8fb6a8ce.c9f538"\r
+                "c8e5909.1b608f",\r
+                "f5b1ba3f.53f16",\r
+                "f37bd9fd.aaa8a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66c06218.223abc",\r
+        "id": "c8e5909.1b608f",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 4496,\r
-        "y": 122,\r
+        "x": 4467,\r
+        "y": 107,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3dd076cd.5c231a",\r
+        "id": "24a03be4.6f22dc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4676,\r
-        "y": 165,\r
+        "x": 4647,\r
+        "y": 150,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "ffc56656.084b18"\r
+                "d0a9d6e9.c56f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9f64ae8.35669",\r
+        "id": "9afded7b.e0fd88",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4668,\r
-        "y": 220,\r
+        "x": 4639,\r
+        "y": 205,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "df0df27a.a48ca"\r
+                "27cca76b.e2c508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7381c16f.b370e",\r
+        "id": "473aa7de.af209",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4673,\r
-        "y": 277,\r
+        "x": 4644,\r
+        "y": 262,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "1cc1a486.bc1f73"\r
+                "61a0060a.f22c2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1cc1a486.bc1f73",\r
+        "id": "61a0060a.f22c2",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4825,\r
-        "y": 278,\r
+        "x": 4796,\r
+        "y": 263,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "df0df27a.a48ca",\r
+        "id": "27cca76b.e2c508",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4836,\r
-        "y": 223,\r
+        "x": 4807,\r
+        "y": 208,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ffc56656.084b18",\r
+        "id": "d0a9d6e9.c56f4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4820.38232421875,\r
-        "y": 162.65567016601562,\r
+        "x": 4791.38232421875,\r
+        "y": 147.65567016601562,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "f9ba3b0e.b3dbd8"\r
+                "67daf343.f6ee2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e408bf35.72655",\r
+        "id": "924b0e47.33623",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4081,\r
-        "y": 161,\r
+        "x": 4052,\r
+        "y": 146,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "e8fac782.8b4fb"\r
+                "e5beadfa.65d4b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9ba3b0e.b3dbd8",\r
+        "id": "67daf343.f6ee2c",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 5035,\r
-        "y": 159,\r
+        "x": 5006,\r
+        "y": 144,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8fb6a8ce.c9f538",\r
+        "id": "f37bd9fd.aaa8a8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4416,\r
-        "y": 238,\r
+        "x": 4387,\r
+        "y": 223,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d80ddf6.5239ba",\r
+        "id": "eb52e479.fabdf8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete ethernet Service without token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.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",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3289,\r
-        "y": 602,\r
+        "x": 3260,\r
+        "y": 587,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "56ef2c2f.bde334",\r
-                "20356ae6.118a76"\r
+                "f7e1f7cd.472128",\r
+                "cd5ebb71.771178"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56ef2c2f.bde334",\r
+        "id": "f7e1f7cd.472128",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3635.5,\r
-        "y": 595,\r
+        "x": 3606.5,\r
+        "y": 580,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "45e55581.afe784"\r
+                "e8c999cc.b2fcc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20356ae6.118a76",\r
+        "id": "cd5ebb71.771178",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3639.5,\r
-        "y": 635,\r
+        "x": 3610.5,\r
+        "y": 620,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "b4e6443a.f1c248"\r
+                "fe0f592f.73096"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4e6443a.f1c248",\r
+        "id": "fe0f592f.73096",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3797,\r
-        "y": 635,\r
+        "x": 3768,\r
+        "y": 620,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "f2316450.62431",\r
-                "6c3e1e17.47ccd8"\r
+                "a35fbdc3.ba44d8",\r
+                "25ddb449.839c14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45e55581.afe784",\r
+        "id": "e8c999cc.b2fcc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
         "comments": "",\r
-        "x": 3793.5,\r
-        "y": 595,\r
+        "x": 3764.5,\r
+        "y": 580,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f2316450.62431",\r
+        "id": "a35fbdc3.ba44d8",\r
         "type": "save",\r
-        "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-id`' />\n\n<parameter name='operational-status' value='Deactivated' />\n",\r
+        "name": "update vpn-binding resource (aka. OTN domainA) in AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Deactivated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4125.5,\r
-        "y": 635,\r
+        "x": 4096.5,\r
+        "y": 620,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6c3e1e17.47ccd8",\r
+        "id": "25ddb449.839c14",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Deactivated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4052.5,\r
-        "y": 681,\r
+        "x": 4023.5,\r
+        "y": 666,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a14e9d29.27087",\r
+        "id": "e64ba97a.ab16f8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete OTN tunnel with token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-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`\" />",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3262,\r
-        "y": 474,\r
+        "x": 3233,\r
+        "y": 459,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "692cf34e.ccecdc",\r
-                "64e95b5b.03211c"\r
+                "e39876fb.5fed98",\r
+                "bba7f7ba.20df2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "692cf34e.ccecdc",\r
+        "id": "e39876fb.5fed98",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3594.5,\r
-        "y": 444,\r
+        "x": 3565.5,\r
+        "y": 429,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "8f4d555e.2bf24"\r
+                "577f2ccc.95a23c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64e95b5b.03211c",\r
+        "id": "bba7f7ba.20df2",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3599.5,\r
-        "y": 509,\r
+        "x": 3570.5,\r
+        "y": 494,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "deb2a97d.a041c8"\r
+                "f956764e.d59e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f4d555e.2bf24",\r
+        "id": "577f2ccc.95a23c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 3770.5,\r
-        "y": 444,\r
+        "x": 3741.5,\r
+        "y": 429,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "deb2a97d.a041c8",\r
+        "id": "f956764e.d59e5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3766,\r
-        "y": 509,\r
+        "x": 3737,\r
+        "y": 494,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             []\r

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 (file)
--- 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 @@
 [\r
     {\r
-        "id": "bf5e551e.2a4d68",\r
+        "id": "2b0ca809.8b9448",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 150,\r
-        "y": 61,\r
+        "x": 190,\r
+        "y": 84,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "536d861a.099138"\r
+                "d6cca48a.4b98c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "536d861a.099138",\r
+        "id": "d6cca48a.4b98c",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,987 +22,987 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 281.2856903076172,\r
-        "y": 110.23810863494873,\r
+        "x": 321.2856903076172,\r
+        "y": 133.23810863494873,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "6541c50d.7a4ee4"\r
+                "d504a218.d5b0f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6541c50d.7a4ee4",\r
+        "id": "d504a218.d5b0f",\r
         "type": "method",\r
         "name": "method tsli-vnf-topology-operation-trans-slice-delete",\r
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-delete' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 284.4286193847656,\r
-        "y": 195.00003242492676,\r
+        "x": 324.4286193847656,\r
+        "y": 218.00003242492676,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "b890e0d.be3caa"\r
+                "6927f12e.f495a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b890e0d.be3caa",\r
+        "id": "6927f12e.f495a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 434.238037109375,\r
-        "y": 324.6666564941406,\r
+        "x": 474.238037109375,\r
+        "y": 347.6666564941406,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "2c42b5ac.a1886a",\r
-                "a9ded91f.36ccb8",\r
-                "783cf92b.26682"\r
+                "a03a6652.95082",\r
+                "5448151c.b0ab3c",\r
+                "926eb1f8.ec5de8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c42b5ac.a1886a",\r
+        "id": "a03a6652.95082",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 730.5716552734375,\r
-        "y": 601.59716796875,\r
+        "x": 770.5716552734375,\r
+        "y": 624.59716796875,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "231b56c7.bc5152",\r
+        "id": "de37ea5b.6e73f8",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 762,\r
-        "y": 276,\r
+        "x": 802,\r
+        "y": 299,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a9ded91f.36ccb8",\r
+        "id": "5448151c.b0ab3c",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n    \n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--vnf-topology-operation-input.service-information.service-instance-id-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 782,\r
-        "y": 372,\r
+        "x": 822,\r
+        "y": 395,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "ebd2852a.6b8948",\r
-                "6eeb6239.832acc",\r
-                "accd90f7.832538"\r
+                "84d63f33.5d595",\r
+                "bc6def6f.91b498",\r
+                "9f25bb22.1bcb28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ebd2852a.6b8948",\r
+        "id": "84d63f33.5d595",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1001,\r
-        "y": 310,\r
+        "x": 1041,\r
+        "y": 333,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "cd7dc6c0.b4fb9"\r
+                "454b8601.544a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6eeb6239.832acc",\r
+        "id": "bc6def6f.91b498",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1010.490966796875,\r
-        "y": 352.57403564453125,\r
+        "x": 1050.490966796875,\r
+        "y": 375.57403564453125,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "63941e02.5fb4"\r
+                "6ae2b2ea.c01e64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "accd90f7.832538",\r
+        "id": "9f25bb22.1bcb28",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 999,\r
-        "y": 399,\r
+        "x": 1039,\r
+        "y": 422,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "331acfad.087d3"\r
+                "5abda4b4.ada70c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63941e02.5fb4",\r
+        "id": "6ae2b2ea.c01e64",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1164.0623779296875,\r
-        "y": 355.8597717285156,\r
+        "x": 1204.0623779296875,\r
+        "y": 378.8597717285156,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "331acfad.087d3",\r
+        "id": "5abda4b4.ada70c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1168,\r
-        "y": 400,\r
+        "x": 1208,\r
+        "y": 423,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cd7dc6c0.b4fb9",\r
+        "id": "454b8601.544a2",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1198,\r
-        "y": 306,\r
+        "x": 1238,\r
+        "y": 329,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "71a5e1a5.fba1e8"\r
+                "126fb5a4.b7562a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "71a5e1a5.fba1e8",\r
+        "id": "126fb5a4.b7562a",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1421.33349609375,\r
-        "y": 305.99993896484375,\r
+        "x": 1461.33349609375,\r
+        "y": 328.99993896484375,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "45ab176d.29b28"\r
+                "ceb59f97.b5ebc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45ab176d.29b28",\r
+        "id": "ceb59f97.b5ebc",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1622.0001335144043,\r
-        "y": 307.00002098083496,\r
+        "x": 1662.0001335144043,\r
+        "y": 330.00002098083496,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "8b30afaa.f156f"\r
+                "7a55fd6d.840e7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "783cf92b.26682",\r
+        "id": "926eb1f8.ec5de8",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 748,\r
-        "y": 320,\r
+        "x": 788,\r
+        "y": 343,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8b30afaa.f156f",\r
+        "id": "7a55fd6d.840e7c",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1860,\r
-        "y": 309,\r
+        "x": 1900,\r
+        "y": 332,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "a8a15026.50a8d",\r
-                "c9ce2298.2cf6b",\r
-                "be682b6.40831d8"\r
+                "ffc75917.89fb6",\r
+                "cc16da88.4c197",\r
+                "59e9aa76.56f554"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8a15026.50a8d",\r
+        "id": "ffc75917.89fb6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2068,\r
-        "y": 273,\r
+        "x": 2108,\r
+        "y": 296,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "d739426f.d36bb8"\r
+                "f17f297f.55ca2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9ce2298.2cf6b",\r
+        "id": "cc16da88.4c197",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2068.490966796875,\r
-        "y": 318.57403564453125,\r
+        "x": 2108.490966796875,\r
+        "y": 341.57403564453125,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "21e5c859.ccd51"\r
+                "43ce3007.4fa548"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "be682b6.40831d8",\r
+        "id": "59e9aa76.56f554",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2066,\r
-        "y": 362,\r
+        "x": 2106,\r
+        "y": 385,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "fbd36b9c.f4a15"\r
+                "24973dde.e7929a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21e5c859.ccd51",\r
+        "id": "43ce3007.4fa548",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2231.0623779296875,\r
-        "y": 318.8597717285156,\r
+        "x": 2271.0623779296875,\r
+        "y": 341.8597717285156,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fbd36b9c.f4a15",\r
+        "id": "24973dde.e7929a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2235,\r
-        "y": 363,\r
+        "x": 2275,\r
+        "y": 386,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a46cc38.98dbb4",\r
+        "id": "e4afb06c.970a38",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2541,\r
-        "y": 362,\r
+        "x": 2581,\r
+        "y": 385,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "9e895711.9515a",\r
-                "45b51772.60fd7",\r
-                "90f1dd00.339a68"\r
+                "70a3d3e9.7bf864",\r
+                "4cd17047.fe16a",\r
+                "c79d571c.0d07f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41605fb3.ac785",\r
+        "id": "8e239cd5.1b82f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2925,\r
-        "y": 362,\r
+        "x": 2965,\r
+        "y": 385,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "315634a1.892b34",\r
-                "34cfba69.4d51e6",\r
-                "58dd3cb5.26ee4c",\r
-                "e4194069.37887",\r
-                "e5415b2a.1b069",\r
-                "af105f82.f24",\r
-                "bfb53be2.1d7798"\r
+                "4fff45e1.354a6c",\r
+                "7b5f3a76.40dbac",\r
+                "daa0af8a.c7da5",\r
+                "1aa21051.71e3e8",\r
+                "3724be1f.92f8ea",\r
+                "f7cc948a.349f48",\r
+                "41f2a122.089c2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e895711.9515a",\r
+        "id": "70a3d3e9.7bf864",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2752,\r
-        "y": 364,\r
+        "x": 2792,\r
+        "y": 387,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "41605fb3.ac785"\r
+                "8e239cd5.1b82f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45b51772.60fd7",\r
+        "id": "4cd17047.fe16a",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2752.490966796875,\r
-        "y": 409.57403564453125,\r
+        "x": 2792.490966796875,\r
+        "y": 432.57403564453125,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "80ebbe87.b5f13"\r
+                "cc11f54d.5be868"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90f1dd00.339a68",\r
+        "id": "c79d571c.0d07f8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2750,\r
-        "y": 453,\r
+        "x": 2790,\r
+        "y": 476,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "928e602f.f7958"\r
+                "24a1d14c.bade0e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "928e602f.f7958",\r
+        "id": "24a1d14c.bade0e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2917,\r
-        "y": 452,\r
+        "x": 2957,\r
+        "y": 475,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "80ebbe87.b5f13",\r
+        "id": "cc11f54d.5be868",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2915.0623779296875,\r
-        "y": 409.8597717285156,\r
+        "x": 2955.0623779296875,\r
+        "y": 432.8597717285156,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d739426f.d36bb8",\r
+        "id": "f17f297f.55ca2",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2269,\r
-        "y": 268,\r
+        "x": 2309,\r
+        "y": 291,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "953eda1a.4d542"\r
+                "9cf4adfb.1d5c9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "953eda1a.4d542",\r
+        "id": "9cf4adfb.1d5c9",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2474,\r
-        "y": 268,\r
+        "x": 2514,\r
+        "y": 291,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "75a62157.0a968"\r
+                "6e0c0661.962a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "75a62157.0a968",\r
+        "id": "6e0c0661.962a2",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2640,\r
-        "y": 268,\r
+        "x": 2680,\r
+        "y": 291,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "d166d1d9.165cd8"\r
+                "cbe3f419.c9636"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d166d1d9.165cd8",\r
+        "id": "cbe3f419.c9636",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2803,\r
-        "y": 268,\r
+        "x": 2843,\r
+        "y": 291,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "a46cc38.98dbb4"\r
+                "e4afb06c.970a38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "315634a1.892b34",\r
+        "id": "4fff45e1.354a6c",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 3140,\r
-        "y": 72,\r
+        "x": 3180,\r
+        "y": 95,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "34cfba69.4d51e6",\r
+        "id": "7b5f3a76.40dbac",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3166,\r
-        "y": 189,\r
+        "x": 3206,\r
+        "y": 212,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "b3f1fbc8.de108",\r
-                "b343cfff.aa8d4",\r
-                "284e02e7.51cff6"\r
+                "38e8f6ad.20b942",\r
+                "30508f3.2b24cf",\r
+                "db6a4b33.6458e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3f1fbc8.de108",\r
+        "id": "38e8f6ad.20b942",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3361.5001220703125,\r
-        "y": 141,\r
+        "x": 3401.5001220703125,\r
+        "y": 164,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "81f23c52.9a8b3"\r
+                "740719b1.df8a7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b343cfff.aa8d4",\r
+        "id": "30508f3.2b24cf",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3353.5001220703125,\r
-        "y": 196,\r
+        "x": 3393.5001220703125,\r
+        "y": 219,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "f8c3b27d.bb7ca8"\r
+                "dcbcbf80.f3d53"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81f23c52.9a8b3",\r
+        "id": "740719b1.df8a7",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3505.8824462890625,\r
-        "y": 140.65567016601562,\r
+        "x": 3545.8824462890625,\r
+        "y": 163.65567016601562,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "cf4fab4f.ff26f8"\r
+                "1c636e54.f15ca2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf4fab4f.ff26f8",\r
+        "id": "1c636e54.f15ca2",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3690,\r
-        "y": 139,\r
+        "x": 3730,\r
+        "y": 162,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "e5bf62b8.3c949"\r
+                "5fbdc63d.dd85c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5bf62b8.3c949",\r
+        "id": "5fbdc63d.dd85c8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3885,\r
-        "y": 139,\r
+        "x": 3925,\r
+        "y": 162,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "8f16d6f1.620958"\r
+                "ea1a11a0.595418"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "284e02e7.51cff6",\r
+        "id": "db6a4b33.6458e",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3358.5001220703125,\r
-        "y": 253,\r
+        "x": 3398.5001220703125,\r
+        "y": 276,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "a632f8eb.4977a"\r
+                "1b105dc6.7eab4a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a632f8eb.4977a",\r
+        "id": "1b105dc6.7eab4a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3510.5001220703125,\r
-        "y": 254,\r
+        "x": 3550.5001220703125,\r
+        "y": 277,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f8c3b27d.bb7ca8",\r
+        "id": "dcbcbf80.f3d53",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3521.5001220703125,\r
-        "y": 197,\r
+        "x": 3561.5001220703125,\r
+        "y": 220,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c808ab3d.c57d7",\r
+        "id": "96600252.0c8c48",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4473,\r
-        "y": 156,\r
+        "x": 4513,\r
+        "y": 179,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "2713e757.2f3d8",\r
-                "638dc84.73ac0b8",\r
-                "4816e676.e50758"\r
+                "a696df4c.ceae58",\r
+                "fe810a19.c34a78",\r
+                "bbf2a8b1.f6a27"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8c24e1.d1c68b",\r
+        "id": "792a96dd.b5714",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4267,\r
-        "y": 143,\r
+        "x": 4307,\r
+        "y": 166,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "e331349b.029ff",\r
-                "c808ab3d.c57d7",\r
-                "3516a6c6.78d90a"\r
+                "ae074209.8ac108",\r
+                "96600252.0c8c48",\r
+                "17402644.74336a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e331349b.029ff",\r
+        "id": "ae074209.8ac108",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 4503,\r
-        "y": 104,\r
+        "x": 4543,\r
+        "y": 127,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2713e757.2f3d8",\r
+        "id": "a696df4c.ceae58",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4683,\r
-        "y": 147,\r
+        "x": 4723,\r
+        "y": 170,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "f914c736.a35ec"\r
+                "b9171802.93433"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "638dc84.73ac0b8",\r
+        "id": "fe810a19.c34a78",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4675,\r
-        "y": 202,\r
+        "x": 4715,\r
+        "y": 225,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "ff1a96b1.1ab44"\r
+                "4798e972.a0e21"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4816e676.e50758",\r
+        "id": "bbf2a8b1.f6a27",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4680,\r
-        "y": 259,\r
+        "x": 4720,\r
+        "y": 282,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "81b24b13.ecc93"\r
+                "c94f16ac.1ba968"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81b24b13.ecc93",\r
+        "id": "c94f16ac.1ba968",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4832,\r
-        "y": 260,\r
+        "x": 4872,\r
+        "y": 283,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ff1a96b1.1ab44",\r
+        "id": "4798e972.a0e21",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4843,\r
-        "y": 205,\r
+        "x": 4883,\r
+        "y": 228,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f914c736.a35ec",\r
+        "id": "b9171802.93433",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4827.38232421875,\r
-        "y": 144.65567016601562,\r
+        "x": 4867.38232421875,\r
+        "y": 167.65567016601562,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "3dce9a6f.ca54ee"\r
+                "300135e0.73329a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f16d6f1.620958",\r
+        "id": "ea1a11a0.595418",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4088,\r
-        "y": 143,\r
+        "x": 4128,\r
+        "y": 166,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "c8c24e1.d1c68b"\r
+                "792a96dd.b5714"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3dce9a6f.ca54ee",\r
+        "id": "300135e0.73329a",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 5042,\r
-        "y": 141,\r
+        "x": 5082,\r
+        "y": 164,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3516a6c6.78d90a",\r
+        "id": "17402644.74336a",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4423,\r
-        "y": 220,\r
+        "x": 4463,\r
+        "y": 243,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "af105f82.f24",\r
+        "id": "f7cc948a.349f48",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete transport slice without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url +  '/restconf/operations/ietf-optical-slice:deallocate-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3290,\r
-        "y": 487,\r
+        "x": 3330,\r
+        "y": 510,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "58523c50.a8358c",\r
-                "666e388c.437238"\r
+                "c1188623.deee1",\r
+                "470e64d.379031c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58523c50.a8358c",\r
+        "id": "c1188623.deee1",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3633.5,\r
-        "y": 482,\r
+        "x": 3673.5,\r
+        "y": 505,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "3480dc80.ce39a4"\r
+                "d4cf9dc2.d5afd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "666e388c.437238",\r
+        "id": "470e64d.379031c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3637.5,\r
-        "y": 522,\r
+        "x": 3677.5,\r
+        "y": 545,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "f77842b2.9897b"\r
+                "3364bc79.06d9e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f77842b2.9897b",\r
+        "id": "3364bc79.06d9e4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3795,\r
-        "y": 522,\r
+        "x": 3835,\r
+        "y": 545,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "3480dc80.ce39a4",\r
+        "id": "d4cf9dc2.d5afd8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing deallocate transport slice rest api\" />\n",\r
         "comments": "",\r
-        "x": 3791.5,\r
-        "y": 482,\r
+        "x": 3831.5,\r
+        "y": 505,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "58dd3cb5.26ee4c",\r
+        "id": "daa0af8a.c7da5",\r
         "type": "set",\r
         "name": "set attachment_param for TN NSSSI deleteion in PNC",\r
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",\r
         "comments": "",\r
-        "x": 3266,\r
-        "y": 362,\r
+        "x": 3306,\r
+        "y": 385,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e4194069.37887",\r
+        "id": "1aa21051.71e3e8",\r
         "type": "save",\r
         "name": "delete connectivity resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3196,\r
-        "y": 797,\r
+        "x": 3236,\r
+        "y": 820,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e5415b2a.1b069",\r
+        "id": "3724be1f.92f8ea",\r
         "type": "save",\r
         "name": "delete vpn-binding resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3192,\r
-        "y": 841,\r
+        "x": 3232,\r
+        "y": 864,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bfb53be2.1d7798",\r
+        "id": "41f2a122.089c2",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode domain UNI deColoring",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3253,\r
-        "y": 660,\r
+        "x": 3293,\r
+        "y": 683,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "9751ec98.3e8be8",\r
-                "4652cbec.507204"\r
+                "293d42c2.e74426",\r
+                "f9376496.43cea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4652cbec.507204",\r
+        "id": "f9376496.43cea8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3519,\r
-        "y": 640,\r
+        "x": 3559,\r
+        "y": 663,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "45199d8e.7e5fdc"\r
+                "7b775591.92e164"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9751ec98.3e8be8",\r
+        "id": "293d42c2.e74426",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3520.000213623047,\r
-        "y": 690.9999094009399,\r
+        "x": 3560.000213623047,\r
+        "y": 713.9999094009399,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             [\r
-                "ebd36513.cafc88"\r
+                "f17d1b1f.2fc66"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45199d8e.7e5fdc",\r
+        "id": "7b775591.92e164",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing decoloring UNI rest api\" />\n",\r
         "comments": "",\r
-        "x": 3659.0002479553223,\r
-        "y": 640.0000009536743,\r
+        "x": 3699.0002479553223,\r
+        "y": 663.0000009536743,\r
         "z": "e001b214.9c4f88",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ebd36513.cafc88",\r
+        "id": "f17d1b1f.2fc66",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3665.02725982666,\r
-        "y": 688.7453947067261,\r
+        "x": 3705.02725982666,\r
+        "y": 711.7453947067261,\r
         "z": "e001b214.9c4f88",\r
         "wires": [\r
             []\r

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 (file)
--- 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`' />\r
                                                                                     <parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\r
                                                                                     <parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\r
+                                                                                    <parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\r
                                                                                 </set>\r
                                                                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                                                     <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />\r
@@ -214,7 +215,7 @@
                                                                                             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
                                                                                                     key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\r
                                                                                                 <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\r
-                                                                                                <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\r
+                                                                                                <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\r
                                                                                                 <parameter name='operational-status' value='Activated' />\r
                                                                                             </update>\r
                                                                                             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
@@ -366,6 +367,7 @@
                                                                                             <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\r
                                                                                             <parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\r
                                                                                             <parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\r
+                                                                                            <parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\r
                                                                                         </set>\r
                                                                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                                                             <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />\r
@@ -393,7 +395,7 @@
                                                                                                     <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
                                                                                                             key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\r
                                                                                                         <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\r
-                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\r
+                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\r
                                                                                                         <parameter name='operational-status' value='Activated' />\r
                                                                                                     </update>\r
                                                                                                     <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r

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 (file)
--- 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]`' />\r
                                                                                                                             <parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\r
                                                                                                                             <parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\r
-                                                                                                                            <parameter name='cvlan' value='' />\r
+                                                                                                                            <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\r
                                                                                                                             <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\r
                                                                                                                             <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\r
                                                                                                                             <parameter name='CIR' value='`$prop.sotn.cir`' />\r
@@ -608,7 +608,7 @@
                                                                                                                             <parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\r
                                                                                                                             <parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\r
                                                                                                                             <parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\r
-                                                                                                                            <parameter name='cvlan' value='' />\r
+                                                                                                                            <parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\r
                                                                                                                             <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\r
                                                                                                                             <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\r
                                                                                                                             <parameter name='CIR' value='`$prop.sotn.cir`' />\r

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 (file)
--- 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>\r
                                                                     <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                                         <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->\r
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-id`" />\r
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`" />\r
                                                                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />\r
                                                                         <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />\r
                                                                         <parameter name="format" value="json"/>\r
@@ -151,7 +151,7 @@
                                                                         </outcome>\r
                                                                     </execute>\r
                                                                     <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                                        <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`" />\r
+                                                                        <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`" />\r
                                                                         <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->\r
                                                                         <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->\r
                                                                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />\r
@@ -176,7 +176,7 @@
                                                                                 <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
                                                                                         key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\r
                                                                                     <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\r
-                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-id`' />\r
+                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\r
                                                                                     <parameter name='operational-status' value='Deactivated' />\r
                                                                                 </update>\r
                                                                                 <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r

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 (file)
--- 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":{