X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2FGENERIC-RESOURCE-API_network-topology-operation-delete.json;h=3c8257f1c33f850e963b7197c54ced057a0b8dfd;hb=25a1cca7cd218378aac254e2d87ae2ec89fbca49;hp=fd3f15cc8434842f7939b137b092baf37257c9a7;hpb=a8e7d59abcc55950e76f36cf4c2d280f55a38381;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json
index fd3f15cc..3c8257f1 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "827d7697.e161a8",
+    "id": "1bc16ce.3c28013",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 93,
-    "y": 84,
-    "z": "2b9e11cc.456d3e",
+    "x": 87,
+    "y": 114.11099243164062,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "6fb89758.08cae8"
+        "97da490c.021388"
       ]
     ]
   },
   {
-    "id": "6fb89758.08cae8",
+    "id": "97da490c.021388",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,600 +22,892 @@
     "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": 305.00000381469727,
-    "y": 156.0000171661377,
-    "z": "2b9e11cc.456d3e",
+    "x": 299.00000381469727,
+    "y": 186.11100959777832,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "c0e8cad3.da0c8"
+        "3dca7f57.a19ca8"
       ]
     ]
   },
   {
-    "id": "c0e8cad3.da0c8",
+    "id": "3dca7f57.a19ca8",
     "type": "method",
     "name": "method network-topology-operation-delete",
     "xml": "<method rpc='network-topology-operation-delete' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 293.0001220703125,
-    "y": 244,
-    "z": "2b9e11cc.456d3e",
+    "x": 287.0001220703125,
+    "y": 274.1109924316406,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "a6f45139.fa877"
+        "2917b139.6003be"
       ]
     ]
   },
   {
-    "id": "a6f45139.fa877",
+    "id": "2917b139.6003be",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 569.0000305175781,
-    "y": 252.00001335144043,
-    "z": "2b9e11cc.456d3e",
+    "x": 563.0000305175781,
+    "y": 282.11100578308105,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "30175b96.175abc",
-        "ecfd60c5.b2e578",
-        "cfff2d7f.0d80f8",
-        "dc355ee1.94a83",
-        "6101a41d.088144",
-        "d633fa40.e632f",
-        "c7fcf65d.3267e",
-        "a8af32f0.52f9a"
+        "93de9a8e.85cd28",
+        "8a99a44.0aea6d8",
+        "b9e067fb.af43c8",
+        "8f63fe5a.ce23c",
+        "6e9a7fc8.6e80c8",
+        "4f853de5.1d70d4",
+        "80aa2c3b.44b74",
+        "c6199aa8.b4cf08",
+        "cd746090.90a5a",
+        "e9b167f.6457618"
       ]
     ]
   },
   {
-    "id": "30175b96.175abc",
+    "id": "93de9a8e.85cd28",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 890,
-    "y": 35,
-    "z": "2b9e11cc.456d3e",
+    "x": 884,
+    "y": 65.11099243164062,
+    "z": "e87b72fe.07c73",
     "wires": [
       []
     ]
   },
   {
-    "id": "ecfd60c5.b2e578",
+    "id": "8a99a44.0aea6d8",
     "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 = $tmp.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 847,
-    "y": 378,
-    "z": "2b9e11cc.456d3e",
+    "x": 828,
+    "y": 510.1109619140625,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "f7a8fca4.b3ad",
-        "aa0ec94f.00fa6",
-        "1ecf0d2.4909473"
+        "3ab5ee96.e1d5ea",
+        "5289c8c7.4bcd4",
+        "756a44de.032acc"
       ]
     ]
   },
   {
-    "id": "f7a8fca4.b3ad",
+    "id": "3ab5ee96.e1d5ea",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1163,
-    "y": 322,
-    "z": "2b9e11cc.456d3e",
+    "x": 1066,
+    "y": 466.1109924316406,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "f83a9763.b4b58"
+        "e5229a2a.d65d6"
       ]
     ]
   },
   {
-    "id": "aa0ec94f.00fa6",
+    "id": "5289c8c7.4bcd4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1166.490966796875,
-    "y": 369.57403564453125,
-    "z": "2b9e11cc.456d3e",
+    "x": 1070.490966796875,
+    "y": 507.68505859375,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "b04696c4.58fe88"
+        "84a50f20.350108"
       ]
     ]
   },
   {
-    "id": "1ecf0d2.4909473",
+    "id": "756a44de.032acc",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1161.823974609375,
-    "y": 410.9073486328125,
-    "z": "2b9e11cc.456d3e",
+    "x": 1063.823974609375,
+    "y": 559.018310546875,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "479ab3c0.7b5764"
+        "ad52005e.b9cf1"
       ]
     ]
   },
   {
-    "id": "b04696c4.58fe88",
+    "id": "84a50f20.350108",
     "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=\"Network model is_bound_to_vpn=true but no vpn_binding is present\" />\n\n",
     "comments": "",
-    "x": 1343.0623779296875,
-    "y": 357.8597717285156,
-    "z": "2b9e11cc.456d3e",
+    "x": 1246.0623779296875,
+    "y": 505.97076416015625,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "479ab3c0.7b5764",
+    "id": "ad52005e.b9cf1",
     "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 retrieving vpn binding\" />\n\n",
     "comments": "",
-    "x": 1349.5965309143066,
-    "y": 406.3465414047241,
-    "z": "2b9e11cc.456d3e",
+    "x": 1224.5965576171875,
+    "y": 557.45751953125,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "f83a9763.b4b58",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 1341.205322265625,
-    "y": 314.57403564453125,
-    "z": "2b9e11cc.456d3e",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "cfff2d7f.0d80f8",
+    "id": "b9e067fb.af43c8",
     "type": "for",
     "name": "for each network-input-parameters",
     "xml": "<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 852,
-    "y": 213,
-    "z": "2b9e11cc.456d3e",
+    "x": 846,
+    "y": 243.11099243164062,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "8482cde8.2496f8"
+        "dba902b2.65b6e"
       ]
     ]
   },
   {
-    "id": "8482cde8.2496f8",
+    "id": "dba902b2.65b6e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1133.8333740234375,
-    "y": 191.33334350585938,
-    "z": "2b9e11cc.456d3e",
+    "x": 1127.8333740234375,
+    "y": 221.4443359375,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "f44089bc.f2b86",
-        "bd431753.a4c8f"
+        "6dbc1962.e67808",
+        "a7f93024.722988",
+        "84a77140.b8364"
       ]
     ]
   },
   {
-    "id": "f44089bc.f2b86",
+    "id": "6dbc1962.e67808",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1342,
-    "y": 152,
-    "z": "2b9e11cc.456d3e",
+    "x": 1336,
+    "y": 182.11099243164062,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "a1e5b819.cd782"
+        "5945c6d2.51585"
       ]
     ]
   },
   {
-    "id": "a1e5b819.cd782",
+    "id": "5945c6d2.51585",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1529,
-    "y": 152,
-    "z": "2b9e11cc.456d3e",
+    "x": 1523,
+    "y": 182.11099243164062,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "8d993f14.d7c67"
+        "7ba84df2.2f3aec"
       ]
     ]
   },
   {
-    "id": "8d993f14.d7c67",
+    "id": "7ba84df2.2f3aec",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.l3vpn.name' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1697,
-    "y": 152.60000610351562,
-    "z": "2b9e11cc.456d3e",
+    "x": 1691,
+    "y": 182.71099853515625,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "bd431753.a4c8f",
+    "id": "a7f93024.722988",
     "type": "switchNode",
     "name": "switch service-type",
-    "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`\">\n",
+    "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'serviceType'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1345.9999389648438,
-    "y": 213.5999755859375,
-    "z": "2b9e11cc.456d3e",
+    "x": 1341,
+    "y": 236.71096801757812,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "264d1797.9d01f8"
+        "24243087.264e7"
       ]
     ]
   },
   {
-    "id": "264d1797.9d01f8",
+    "id": "24243087.264e7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1530.9999389648438,
-    "y": 211.5999755859375,
-    "z": "2b9e11cc.456d3e",
+    "x": 1524.9999389648438,
+    "y": 241.71096801757812,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "b160eb3c.cbb848"
+        "4b08822f.ede664"
       ]
     ]
   },
   {
-    "id": "b160eb3c.cbb848",
+    "id": "4b08822f.ede664",
     "type": "set",
     "name": "set service-type",
     "xml": "<set>\n<parameter name='prop.l3vpn.service-type' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1699.9999389648438,
-    "y": 209.5999755859375,
-    "z": "2b9e11cc.456d3e",
+    "x": 1693.9999389648438,
+    "y": 239.71096801757812,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "dc355ee1.94a83",
+    "id": "e5229a2a.d65d6",
     "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[0].esr-system-info.serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`\" />\n",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].serviceUrl`\" />\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": 812,
-    "y": 489,
-    "z": "2b9e11cc.456d3e",
+    "x": 1252,
+    "y": 463.1109619140625,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "cb586993.f0a33",
+    "id": "8892b470.2ab318",
     "type": "execute",
     "name": "execute REST DELETE VPN",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l3smvpntemplate.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services/vpnservice='+$prop.l3vpn.name'\"/>\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=\"restapi-result\"/>",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir +'/l3smvpntemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services/vpnservice=' + $prop.l3vpn.name`\" />\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=\"restapi-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1323,
-    "y": 566,
-    "z": "2b9e11cc.456d3e",
+    "x": 1574,
+    "y": 678.110969543457,
+    "z": "e87b72fe.07c73",
     "wires": [
-      []
+      [
+        "6ace128e.38bbf4",
+        "e03ea1f6.8ae24"
+      ]
     ]
   },
   {
-    "id": "6101a41d.088144",
+    "id": "8f63fe5a.ce23c",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$prop.l3vpn.service-type`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 793,
-    "y": 584,
-    "z": "2b9e11cc.456d3e",
+    "x": 787,
+    "y": 614.1109924316406,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "4afcdb87.e97234"
+        "cf2b0eea.34d2e"
       ]
     ]
   },
   {
-    "id": "4afcdb87.e97234",
+    "id": "cf2b0eea.34d2e",
     "type": "outcomeTrue",
     "name": "l3vpn-ipwan",
     "xml": "<outcome value='l3vpn-ipwan'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1043,
-    "y": 568,
-    "z": "2b9e11cc.456d3e",
+    "x": 1044,
+    "y": 615.110969543457,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "cb586993.f0a33"
+        "46db16ed.796608"
       ]
     ]
   },
   {
-    "id": "d633fa40.e632f",
+    "id": "6e9a7fc8.6e80c8",
     "type": "switchNode",
     "name": "switch service-data.networks.network_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 832,
-    "y": 108,
-    "z": "2b9e11cc.456d3e",
+    "x": 826,
+    "y": 138.11099243164062,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "cd115f81.9765",
-        "8c843586.ed486"
+        "53ed314.a330f5",
+        "eeed55fd.c22298"
       ]
     ]
   },
   {
-    "id": "cd115f81.9765",
+    "id": "53ed314.a330f5",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1277,
-    "y": 34.00006103515625,
-    "z": "2b9e11cc.456d3e",
+    "x": 1271,
+    "y": 64.11105346679688,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "9468f013.3839a8"
+        "7b50ad9a.577e8c"
       ]
     ]
   },
   {
-    "id": "9468f013.3839a8",
+    "id": "7b50ad9a.577e8c",
     "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=\"network-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
     "comments": "",
-    "x": 1467.7774658203125,
-    "y": 20.889007568359375,
-    "z": "2b9e11cc.456d3e",
+    "x": 1461.7774658203125,
+    "y": 51,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "8c843586.ed486",
+    "id": "eeed55fd.c22298",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1161.0003662109375,
-    "y": 99.00007629394531,
-    "z": "2b9e11cc.456d3e",
+    "x": 1155.0003662109375,
+    "y": 129.11106872558594,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "c38355cb.b91f58"
+        "29041a71.02b546"
       ]
     ]
   },
   {
-    "id": "c38355cb.b91f58",
+    "id": "29041a71.02b546",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1332.2698974609375,
-    "y": 82.55461120605469,
-    "z": "2b9e11cc.456d3e",
+    "x": 1326.2698974609375,
+    "y": 112.66560363769531,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "da8d2eef.9ecfc8",
-        "2abc9e2a.3b6932"
+        "3af5398b.f7aa0e",
+        "4821e95f.09e458"
       ]
     ]
   },
   {
-    "id": "da8d2eef.9ecfc8",
+    "id": "3af5398b.f7aa0e",
     "type": "for",
     "name": "for nidx..service-data.networks.network[]",
     "xml": "<for index='nidx' start='0' end='`$service-data.networks.network_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1630.285888671875,
-    "y": 63.428619384765625,
-    "z": "2b9e11cc.456d3e",
+    "x": 1624.285888671875,
+    "y": 93.53961181640625,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "788ddd9c.802654"
+        "21827fa6.3c3c7"
       ]
     ]
   },
   {
-    "id": "2abc9e2a.3b6932",
+    "id": "4821e95f.09e458",
     "type": "switchNode",
     "name": "switch tmp.nidx ",
     "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1551.5872802734375,
-    "y": 106.41180419921875,
-    "z": "2b9e11cc.456d3e",
+    "x": 1545.5872802734375,
+    "y": 136.52279663085938,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "d0a99363.1c30e"
+        "4af90ffc.0818b"
       ]
     ]
   },
   {
-    "id": "d0a99363.1c30e",
+    "id": "4af90ffc.0818b",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1752.015869140625,
-    "y": 111.98321533203125,
-    "z": "2b9e11cc.456d3e",
+    "x": 1746.015869140625,
+    "y": 142.09420776367188,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "ea14dde0.93393"
+        "98ba5173.0d34e"
       ]
     ]
   },
   {
-    "id": "788ddd9c.802654",
+    "id": "21827fa6.3c3c7",
     "type": "switchNode",
     "name": "switch networkid found",
     "xml": "<switch test=\"`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1940.7144775390625,
-    "y": 61.6787109375,
-    "z": "2b9e11cc.456d3e",
+    "x": 1934.7144775390625,
+    "y": 91.78970336914062,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "c02919ae.22f7c"
+        "22099867.c65e3"
       ]
     ]
   },
   {
-    "id": "ea14dde0.93393",
+    "id": "98ba5173.0d34e",
     "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=\"network-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
     "comments": "",
-    "x": 1923.4443359375,
-    "y": 112.12606811523438,
-    "z": "2b9e11cc.456d3e",
+    "x": 1917.4443359375,
+    "y": 142.237060546875,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "c02919ae.22f7c",
+    "id": "22099867.c65e3",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2146.666748046875,
-    "y": 60.571441650390625,
-    "z": "2b9e11cc.456d3e",
+    "x": 2140.666748046875,
+    "y": 90.68243408203125,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "64769a39.b95ddc"
+        "44687f12.3eae5"
       ]
     ]
   },
   {
-    "id": "64769a39.b95ddc",
+    "id": "44687f12.3eae5",
     "type": "set",
     "name": "set tmp.nidx and ctx.network-data",
     "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].`' />\n",
     "comments": "",
-    "x": 2385.198486328125,
-    "y": 56.321441650390625,
-    "z": "2b9e11cc.456d3e",
+    "x": 2379.198486328125,
+    "y": 86.43243408203125,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "c7fcf65d.3267e",
+    "id": "4f853de5.1d70d4",
     "type": "block",
     "name": "block : saveNetworkData",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 811,
-    "y": 674,
-    "z": "2b9e11cc.456d3e",
+    "x": 805,
+    "y": 704.1109924316406,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "90f2187a.a0ed98",
-        "d97a2187.fc0188",
-        "8edd5656.7d422",
-        "8bc5ebfa.1b543"
+        "191edb15.f0a32d",
+        "7bfb16ed.b031d8",
+        "3a334836.fa7ed",
+        "cc07591b.5791f"
       ]
     ]
   },
   {
-    "id": "a8af32f0.52f9a",
+    "id": "80aa2c3b.44b74",
     "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": 771.6665802001953,
-    "y": 807.3332815170288,
-    "z": "2b9e11cc.456d3e",
+    "x": 757.6665649414062,
+    "y": 922.4442749023438,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "8edd5656.7d422",
+    "id": "3a334836.fa7ed",
     "type": "set",
     "name": "copy input to 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",
     "comments": "",
-    "x": 1104.0000076293945,
-    "y": 654.3333120346069,
-    "z": "2b9e11cc.456d3e",
+    "x": 1098.0000076293945,
+    "y": 684.4443044662476,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "90f2187a.a0ed98",
+    "id": "191edb15.f0a32d",
     "type": "set",
     "name": "set networkId",
     "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
     "comments": "",
-    "x": 1068.2895622253418,
-    "y": 698.0511589050293,
-    "z": "2b9e11cc.456d3e",
+    "x": 1062.2895622253418,
+    "y": 728.1621513366699,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "d97a2187.fc0188",
+    "id": "7bfb16ed.b031d8",
     "type": "set",
     "name": "set object-path",
     "xml": "<set>\n<parameter name='network-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/'\n + $networkId\n + '/network-data/'` \" />\n \n",
     "comments": "",
-    "x": 1074.0039291381836,
-    "y": 735.1940507888794,
-    "z": "2b9e11cc.456d3e",
+    "x": 1068.0039291381836,
+    "y": 765.30504322052,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "8bc5ebfa.1b543",
+    "id": "cc07591b.5791f",
     "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='Deleted' />\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`' />\n",
     "comments": "",
-    "x": 1117.9999389648438,
-    "y": 782.333270072937,
-    "z": "2b9e11cc.456d3e",
+    "x": 1111.9999389648438,
+    "y": 812.4442625045776,
+    "z": "e87b72fe.07c73",
+    "wires": []
+  },
+  {
+    "id": "c6199aa8.b4cf08",
+    "type": "get-resource",
+    "name": "get-resource pnf",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $prop.l3vpn.pe1_id AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 784,
+    "y": 388,
+    "z": "e87b72fe.07c73",
+    "wires": [
+      [
+        "eb78427.8aeffc",
+        "9468b1f6.acd4a8",
+        "8869b2de.4cd318"
+      ]
+    ]
+  },
+  {
+    "id": "eb78427.8aeffc",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 978,
+    "y": 326,
+    "z": "e87b72fe.07c73",
+    "wires": [
+      [
+        "68cda5fa.8580d4"
+      ]
+    ]
+  },
+  {
+    "id": "9468b1f6.acd4a8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 987.490966796875,
+    "y": 368.57403564453125,
+    "z": "e87b72fe.07c73",
+    "wires": [
+      [
+        "f68a2741.7b13e"
+      ]
+    ]
+  },
+  {
+    "id": "8869b2de.4cd318",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 980.823974609375,
+    "y": 416.9073486328125,
+    "z": "e87b72fe.07c73",
+    "wires": [
+      [
+        "ff173828.c81cc"
+      ]
+    ]
+  },
+  {
+    "id": "f68a2741.7b13e",
+    "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": 1173.0623779296875,
+    "y": 369.8597717285156,
+    "z": "e87b72fe.07c73",
+    "wires": []
+  },
+  {
+    "id": "ff173828.c81cc",
+    "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": 1169.5965576171875,
+    "y": 420.3465270996094,
+    "z": "e87b72fe.07c73",
+    "wires": []
+  },
+  {
+    "id": "68cda5fa.8580d4",
+    "type": "set",
+    "name": "set tmp.thirdparty-sdnc-id",
+    "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 1192,
+    "y": 322,
+    "z": "e87b72fe.07c73",
     "wires": []
+  },
+  {
+    "id": "84a77140.b8364",
+    "type": "switchNode",
+    "name": "switch pe1_id",
+    "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'pe1_id'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1343,
+    "y": 283,
+    "z": "e87b72fe.07c73",
+    "wires": [
+      [
+        "16fa329d.f3dce5"
+      ]
+    ]
+  },
+  {
+    "id": "16fa329d.f3dce5",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1529,
+    "y": 292,
+    "z": "e87b72fe.07c73",
+    "wires": [
+      [
+        "b53db17c.0ef078"
+      ]
+    ]
+  },
+  {
+    "id": "b53db17c.0ef078",
+    "type": "set",
+    "name": "set pe1_id",
+    "xml": "<set>\n<parameter name='prop.l3vpn.pe1_id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1712,
+    "y": 296,
+    "z": "e87b72fe.07c73",
+    "wires": []
+  },
+  {
+    "id": "cd746090.90a5a",
+    "type": "delete",
+    "name": "delete underlay configuration in AAI",
+    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='configuration' \n        key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 815,
+    "y": 850,
+    "z": "e87b72fe.07c73",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "599b3e84.010d1",
+    "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\"/>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1597,
+    "y": 605.7776565551758,
+    "z": "e87b72fe.07c73",
+    "wires": [
+      [
+        "d3f6644d.349f88",
+        "3ae81ceb.b03874"
+      ]
+    ]
+  },
+  {
+    "id": "d3f6644d.349f88",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1837,
+    "y": 568.7776565551758,
+    "z": "e87b72fe.07c73",
+    "wires": [
+      [
+        "7b5e645e.7d6674"
+      ]
+    ]
+  },
+  {
+    "id": "3ae81ceb.b03874",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1844.25,
+    "y": 635.420539855957,
+    "z": "e87b72fe.07c73",
+    "wires": [
+      [
+        "50b8cd7f.3d5c64"
+      ]
+    ]
+  },
+  {
+    "id": "50b8cd7f.3d5c64",
+    "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": 2025,
+    "y": 634.1706008911133,
+    "z": "e87b72fe.07c73",
+    "wires": []
+  },
+  {
+    "id": "7b5e645e.7d6674",
+    "type": "set",
+    "name": "set token-id",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='$token-result.token_id' />\n",
+    "comments": "",
+    "x": 2022,
+    "y": 565.7776565551758,
+    "z": "e87b72fe.07c73",
+    "wires": []
+  },
+  {
+    "id": "6ace128e.38bbf4",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1794,
+    "y": 690.7776565551758,
+    "z": "e87b72fe.07c73",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e03ea1f6.8ae24",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1795.25,
+    "y": 754.4204788208008,
+    "z": "e87b72fe.07c73",
+    "wires": [
+      [
+        "2b054857.56f558"
+      ]
+    ]
+  },
+  {
+    "id": "2b054857.56f558",
+    "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 3rd party controller rest api\" />\n",
+    "comments": "",
+    "x": 1961,
+    "y": 757.1706008911133,
+    "z": "e87b72fe.07c73",
+    "wires": []
+  },
+  {
+    "id": "46db16ed.796608",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1268,
+    "y": 616.7776565551758,
+    "z": "e87b72fe.07c73",
+    "wires": [
+      [
+        "599b3e84.010d1",
+        "8892b470.2ab318"
+      ]
+    ]
+  },
+  {
+    "id": "e9b167f.6457618",
+    "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": 798,
+    "y": 564,
+    "z": "e87b72fe.07c73",
+    "wires": [
+      []
+    ]
   }
 ]