1 files changed, 335 insertions, 199 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json
index 547ed010..876668fa 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "2cfde233.a1cf6e",
+    "id": "fd56c256.6611d",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 103.00390625,
-    "y": 35.003907203674316,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 102,
+    "y": 37,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "3b2e232c.fd060c"
+        "e8a2c571.7151d8"
       ]
     ]
   },
   {
-    "id": "3b2e232c.fd060c",
+    "id": "e8a2c571.7151d8",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,562 +22,698 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 265.00391006469727,
-    "y": 107.0039234161377,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 264.00000381469727,
+    "y": 109.00001621246338,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "a53b2fce.2a65f"
+        "501691b7.b8579"
       ]
     ]
   },
   {
-    "id": "a53b2fce.2a65f",
+    "id": "501691b7.b8579",
     "type": "method",
     "name": "method sdwan-network-topology-operation-deactivate",
     "xml": "<method rpc='sdwan-network-topology-operation-deactivate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 253.0040283203125,
-    "y": 195.00390625,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 252.0001220703125,
+    "y": 196.99999904632568,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "663d77f7.214e28"
+        "f268dab.9a2e128"
       ]
     ]
   },
   {
-    "id": "663d77f7.214e28",
+    "id": "f268dab.9a2e128",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 427.00392150878906,
-    "y": 303.0039653778076,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 426.00001525878906,
+    "y": 305.0000581741333,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "b928d5a5.e0ad38",
-        "4e2c1ff0.9578e",
-        "f4a9e349.c682f",
-        "23c4ff52.00447",
-        "77ecaa70.6d0df4",
-        "2ea7cfac.fbbe5",
-        "15a8b2bc.455b8d",
-        "b657cd65.d8e7b",
-        "e4693af9.dc3458",
-        "c69b48c1.cce2a8",
-        "992bd0be.f4511",
-        "565518bc.dd3838",
-        "5cca3c72.23bd74"
+        "b31f4e4c.0f578",
+        "34c8ec0.c180514",
+        "613a4de8.024144",
+        "5f55a204.78493c",
+        "b7c0b37c.27c35",
+        "f96046b8.ac5b48",
+        "f78b989e.79da48",
+        "76b3c50a.02876c",
+        "ad00b85d.5bef68",
+        "b370ae59.4bce9",
+        "2ec15.4c1aa3ebc",
+        "988eea5f.5a0298",
+        "2cf3fcb4.da9384",
+        "9a8305f1.e08cb8"
       ]
     ]
   },
   {
-    "id": "b928d5a5.e0ad38",
+    "id": "b31f4e4c.0f578",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-sdwan-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 885.3928070068359,
-    "y": 52.00390625,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 884.3889007568359,
+    "y": 53.999999046325684,
+    "z": "88e745dd.c19a68",
     "wires": [
       []
     ]
   },
   {
-    "id": "4e2c1ff0.9578e",
+    "id": "34c8ec0.c180514",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sdwan-network-topology-operation-deactivate\"/>\n<parameter name=\"field3\" value=\"SDWAN-Deactivate\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 685.5595054626465,
-    "y": 105.78175926208496,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 684.5555992126465,
+    "y": 107.77785205841064,
+    "z": "88e745dd.c19a68",
     "wires": [
       []
     ]
   },
   {
-    "id": "f4a9e349.c682f",
+    "id": "613a4de8.024144",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $network-topology-operation-input.network-information.network-id  + '/network-data/'` \" />",
     "comments": "",
-    "x": 777.5597496032715,
-    "y": 732.3173627853394,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 786.5558738708496,
+    "y": 849.3134832382202,
+    "z": "88e745dd.c19a68",
     "wires": []
   },
   {
-    "id": "23c4ff52.00447",
+    "id": "5f55a204.78493c",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 699.3375511169434,
-    "y": 921.8727827072144,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 708.3336753845215,
+    "y": 1038.8689031600952,
+    "z": "88e745dd.c19a68",
     "wires": []
   },
   {
-    "id": "77ecaa70.6d0df4",
+    "id": "b7c0b37c.27c35",
     "type": "set",
     "name": "set network-level-oper-status",
     "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='PendingDelete' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
     "comments": "",
-    "x": 744.4486656188965,
-    "y": 793.5395374298096,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 753.4447898864746,
+    "y": 910.5356578826904,
+    "z": "88e745dd.c19a68",
     "wires": []
   },
   {
-    "id": "2ea7cfac.fbbe5",
+    "id": "f96046b8.ac5b48",
     "type": "execute",
     "name": "execute Properties",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 717.8616104125977,
-    "y": 158.78179550170898,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 716.8577041625977,
+    "y": 160.77788829803467,
+    "z": "88e745dd.c19a68",
     "wires": [
       []
     ]
   },
   {
-    "id": "15a8b2bc.455b8d",
+    "id": "f78b989e.79da48",
     "type": "set",
     "name": "set network in service-data",
     "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />",
     "comments": "",
-    "x": 738.004280090332,
-    "y": 679.095196723938,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 747.0004043579102,
+    "y": 796.0913171768188,
+    "z": "88e745dd.c19a68",
     "wires": []
   },
   {
-    "id": "b657cd65.d8e7b",
+    "id": "76b3c50a.02876c",
     "type": "for",
     "name": "for each network-input-parameters",
     "xml": "<for index='idx' start='0' end='`$ctx.network-data.network-request-input.network-input-parameters.param_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 770.00390625,
-    "y": 229.00781378149986,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 769,
+    "y": 231.00390657782555,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "630ca78d.27ae88"
+        "1c6b88c6.f49ce7"
       ]
     ]
   },
   {
-    "id": "630ca78d.27ae88",
+    "id": "1c6b88c6.f49ce7",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1026.8373374938965,
-    "y": 163.34116491675377,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1025.8334312438965,
+    "y": 165.33725771307945,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "3612556b.bbed1a",
-        "c60af583.51da48",
-        "a8faff93.c15f9",
-        "3a3baf52.54ed7"
+        "903569b7.4e2578",
+        "653d2c3c.262b14",
+        "c5910d9a.730a3",
+        "5b432d19.74fce4"
       ]
     ]
   },
   {
-    "id": "3612556b.bbed1a",
+    "id": "903569b7.4e2578",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1248.837417602539,
-    "y": 53.34119987487793,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1247.833511352539,
+    "y": 55.33729267120361,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "8c14fd7b.27081"
+        "138e36c7.964e29"
       ]
     ]
   },
   {
-    "id": "8c14fd7b.27081",
+    "id": "138e36c7.964e29",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1422.8375434875488,
-    "y": 53.341203689575195,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1421.8336372375488,
+    "y": 55.33729648590088,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "f4242145.e0099"
+        "cd7bebad.986118"
       ]
     ]
   },
   {
-    "id": "f4242145.e0099",
+    "id": "cd7bebad.986118",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.name' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1585.8374290466309,
-    "y": 52.94119834899902,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1584.8335227966309,
+    "y": 54.93729114532471,
+    "z": "88e745dd.c19a68",
     "wires": []
   },
   {
-    "id": "e4693af9.dc3458",
+    "id": "ad00b85d.5bef68",
     "type": "get-resource",
     "name": "get-resource esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 764.00390625,
-    "y": 338.00781378149986,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 763,
+    "y": 340.00390657782555,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "fdb52017.6dec1",
-        "5ded5567.77825c",
-        "2c94536.83be9ac"
+        "2b0c648a.f8433c",
+        "f2e86cdd.3128a",
+        "918162b5.31748"
       ]
     ]
   },
   {
-    "id": "fdb52017.6dec1",
+    "id": "2b0c648a.f8433c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1009.00390625,
-    "y": 284.00781378149986,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1008,
+    "y": 286.00390657782555,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "2b35b6e5.d07f8a"
+        "a06faa05.f76618"
       ]
     ]
   },
   {
-    "id": "5ded5567.77825c",
+    "id": "f2e86cdd.3128a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1012.494873046875,
-    "y": 331.5818494260311,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1011.490966796875,
+    "y": 333.5779422223568,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "8424b2a8.48b9d"
+        "37a1f73b.b96e68"
       ]
     ]
   },
   {
-    "id": "2c94536.83be9ac",
+    "id": "918162b5.31748",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1007.827880859375,
-    "y": 372.91516241431236,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1006.823974609375,
+    "y": 374.91125521063805,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "ab7ddb5c.582b78"
+        "4f66c6a.4583438"
       ]
     ]
   },
   {
-    "id": "2b35b6e5.d07f8a",
+    "id": "a06faa05.f76618",
     "type": "set",
     "name": "set controller data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
     "comments": "",
-    "x": 1206.5039672851562,
-    "y": 272.00781378149986,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1205.5000610351562,
+    "y": 274.00390657782555,
+    "z": "88e745dd.c19a68",
     "wires": []
   },
   {
-    "id": "8424b2a8.48b9d",
+    "id": "37a1f73b.b96e68",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1189.0662841796875,
-    "y": 319.8675855100155,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1188.0623779296875,
+    "y": 321.86367830634117,
+    "z": "88e745dd.c19a68",
     "wires": []
   },
   {
-    "id": "ab7ddb5c.582b78",
+    "id": "4f66c6a.4583438",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1195.6004371643066,
-    "y": 368.354355186224,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1194.5965309143066,
+    "y": 370.35044798254967,
+    "z": "88e745dd.c19a68",
     "wires": []
   },
   {
-    "id": "c69b48c1.cce2a8",
+    "id": "b370ae59.4bce9",
     "type": "execute",
     "name": "execute RestApiCallNode Get token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 772.00390625,
-    "y": 449.00781378149986,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 771,
+    "y": 451.00390657782555,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "ce7c1b67.661578",
-        "8a934505.8ec3a8"
+        "61a5287d.5d14f8",
+        "99df3ba8.a50248"
       ]
     ]
   },
   {
-    "id": "ce7c1b67.661578",
+    "id": "61a5287d.5d14f8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1007.00390625,
-    "y": 427.00781378149986,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1006,
+    "y": 429.00390657782555,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "aa6da81f.8e3f18"
+        "951e43bb.f165"
       ]
     ]
   },
   {
-    "id": "8a934505.8ec3a8",
+    "id": "99df3ba8.a50248",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 999.25390625,
-    "y": 480.6506970822811,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 998.25,
+    "y": 482.6467898786068,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "928c6b17.a04a28"
+        "f26ec62f.ef46a8"
       ]
     ]
   },
   {
-    "id": "aa6da81f.8e3f18",
+    "id": "951e43bb.f165",
     "type": "set",
     "name": "set token-id",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
     "comments": "",
-    "x": 1161.00390625,
-    "y": 428.00781378149986,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1160,
+    "y": 430.00390657782555,
+    "z": "88e745dd.c19a68",
     "wires": []
   },
   {
-    "id": "928c6b17.a04a28",
+    "id": "f26ec62f.ef46a8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
     "comments": "",
-    "x": 1152.00390625,
-    "y": 480.40075811743736,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1151,
+    "y": 482.39685091376305,
+    "z": "88e745dd.c19a68",
     "wires": []
   },
   {
-    "id": "c60af583.51da48",
+    "id": "653d2c3c.262b14",
     "type": "switchNode",
     "name": "switch topology",
     "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'topology'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1254.253890991211,
-    "y": 96.00781416893005,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1253.249984741211,
+    "y": 98.00390696525574,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "6ea0ea88.c5d044"
+        "42e996e4.f57c78"
       ]
     ]
   },
   {
-    "id": "6ea0ea88.c5d044",
+    "id": "42e996e4.f57c78",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1428.2540168762207,
-    "y": 96.00781798362732,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1427.2501106262207,
+    "y": 98.003910779953,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "230bc0ec.589fb"
+        "36533d51.327db2"
       ]
     ]
   },
   {
-    "id": "230bc0ec.589fb",
+    "id": "36533d51.327db2",
     "type": "set",
     "name": "set topology",
     "xml": "<set>\n<parameter name='prop.topology' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1591.2539024353027,
-    "y": 95.60781264305115,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1590.2499961853027,
+    "y": 97.60390543937683,
+    "z": "88e745dd.c19a68",
     "wires": []
   },
   {
-    "id": "992bd0be.f4511",
+    "id": "2ec15.4c1aa3ebc",
     "type": "execute",
     "name": "execute RestApiCallNode delete vpn",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-delete.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn/action/batch-delete'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 770.7539825439453,
-    "y": 616.0080223083496,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 779.7501068115234,
+    "y": 733.0041427612305,
+    "z": "88e745dd.c19a68",
     "wires": [
       []
     ]
   },
   {
-    "id": "565518bc.dd3838",
+    "id": "988eea5f.5a0298",
     "type": "execute",
     "name": "execute RestApiCallNode delete vpn topology",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 800.2539978027344,
-    "y": 549.0079069137573,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 809.2501220703125,
+    "y": 666.0040273666382,
+    "z": "88e745dd.c19a68",
     "wires": [
       []
     ]
   },
   {
-    "id": "a8faff93.c15f9",
+    "id": "c5910d9a.730a3",
     "type": "switchNode",
     "name": "switch vpn-id",
     "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'vpn-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1248.5039691925049,
-    "y": 179.00390815734863,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1247.5000629425049,
+    "y": 181.00000095367432,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "ae3a63c3.3c738"
+        "648a246c.73b5ec"
       ]
     ]
   },
   {
-    "id": "ae3a63c3.3c738",
+    "id": "648a246c.73b5ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1430.5040016174316,
-    "y": 179.00390696525574,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1429.5000953674316,
+    "y": 180.99999976158142,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "4d67f5b4.fc8eec"
+        "701a4c1a.83d604"
       ]
     ]
   },
   {
-    "id": "4d67f5b4.fc8eec",
+    "id": "701a4c1a.83d604",
     "type": "set",
     "name": "set prop.vpn-id",
     "xml": "<set>\n<parameter name='prop.vpn-id' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1593.5038871765137,
-    "y": 178.60390162467957,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1592.4999809265137,
+    "y": 180.59999442100525,
+    "z": "88e745dd.c19a68",
     "wires": []
   },
   {
-    "id": "3a3baf52.54ed7",
+    "id": "5b432d19.74fce4",
     "type": "switchNode",
     "name": "switch tenant-id",
     "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'tenant-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1254.25390625,
-    "y": 222.00390625,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1253.25,
+    "y": 223.99999904632568,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "1a8e58aa.aa1b17"
+        "f053b806.9e46f8"
       ]
     ]
   },
   {
-    "id": "1a8e58aa.aa1b17",
+    "id": "f053b806.9e46f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1428.2540321350098,
-    "y": 222.00391006469727,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1427.2501258850098,
+    "y": 224.00000286102295,
+    "z": "88e745dd.c19a68",
     "wires": [
       [
-        "3b8512ac.291e5e"
+        "7fc67227.287a4c"
       ]
     ]
   },
   {
-    "id": "3b8512ac.291e5e",
+    "id": "7fc67227.287a4c",
     "type": "set",
     "name": "set prop.tenant-id",
     "xml": "<set>\n<parameter name='prop.tenant-id' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1591.2539176940918,
-    "y": 221.6039047241211,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 1590.2500114440918,
+    "y": 223.59999752044678,
+    "z": "88e745dd.c19a68",
     "wires": []
   },
   {
-    "id": "5cca3c72.23bd74",
+    "id": "2cf3fcb4.da9384",
     "type": "update",
     "name": "update SDWAN VPN status to AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.sdwan-vpn-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='sdwan-vpn-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='PendingDelete' />",
     "comments": "",
     "outputs": 1,
-    "x": 758.0039443969727,
-    "y": 860.5039930343628,
-    "z": "57d2d3d6.9aa6fc",
+    "x": 767.0000686645508,
+    "y": 977.5001134872437,
+    "z": "88e745dd.c19a68",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9a8305f1.e08cb8",
+    "type": "get-resource",
+    "name": "get-resource service-subscription",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n        key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type \n        AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'\n      force=\"true\" pfx=\"tmp.AnAI-data\">\n      \n",
+    "comments": "",
+    "outputs": 1,
+    "x": 758.0038909912109,
+    "y": 533.0038976669312,
+    "z": "88e745dd.c19a68",
+    "wires": [
+      [
+        "6497125a.d4efec",
+        "61153347.107bfc"
+      ]
+    ]
+  },
+  {
+    "id": "61153347.107bfc",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 973.1824684143066,
+    "y": 584.9642953872681,
+    "z": "88e745dd.c19a68",
+    "wires": [
+      [
+        "2a04bd37.e27582"
+      ]
+    ]
+  },
+  {
+    "id": "6497125a.d4efec",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 979.5038795471191,
+    "y": 532.7499837875366,
+    "z": "88e745dd.c19a68",
+    "wires": [
+      [
+        "954bff66.85de8"
+      ]
+    ]
+  },
+  {
+    "id": "2a04bd37.e27582",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
+    "comments": "",
+    "x": 1125.9324684143066,
+    "y": 584.7143564224243,
+    "z": "88e745dd.c19a68",
+    "wires": []
+  },
+  {
+    "id": "954bff66.85de8",
+    "type": "switchNode",
+    "name": "switch temp-ub-sub-account-id",
+    "xml": "<switch test='`$tmp.AnAI-data.temp-ub-sub-account-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1181.004108428955,
+    "y": 524.7540063858032,
+    "z": "88e745dd.c19a68",
+    "wires": [
+      [
+        "81f571ba.fc753"
+      ]
+    ]
+  },
+  {
+    "id": "81f571ba.fc753",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1374.0041236877441,
+    "y": 553.7540102005005,
+    "z": "88e745dd.c19a68",
+    "wires": [
+      [
+        "d50c5253.93df5"
+      ]
+    ]
+  },
+  {
+    "id": "d50c5253.93df5",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1432.6548805236816,
+    "y": 636.9010019302368,
+    "z": "88e745dd.c19a68",
+    "wires": [
+      [
+        "5e8c6620.18c828",
+        "29548e46.007002"
+      ]
+    ]
+  },
+  {
+    "id": "5e8c6620.18c828",
+    "type": "set",
+    "name": "set prop.tenant-id",
+    "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data.temp-ub-sub-account-id`' />\n",
+    "comments": "",
+    "x": 1621.432716369629,
+    "y": 638.8968105316162,
+    "z": "88e745dd.c19a68",
+    "wires": []
+  },
+  {
+    "id": "29548e46.007002",
+    "type": "execute",
+    "name": "execute RestApiCallNode Create tenant auth",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1704.0834770202637,
+    "y": 685.4724044799805,
+    "z": "88e745dd.c19a68",
     "wires": [
       []
     ]