bug fix for ccvpn integration test

wan-connection service bug fix for ccvpn integration test

Issue-ID: SDNC-546

Change-Id: I3dea785645f88da1da302b188fa97dc82d3442c0
Signed-off-by: Zhuoyao Huang <10112215@zte.com.cn>

Former-commit-id: 8c24c8273cdf83d641b23949227f00dd54938603

8 files changed, 774 insertions, 4649 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json
index 0a979d10..68a4f56d 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json
@@ -1,1570 +1 @@
-[{
-	"id": "cda9cb25.008878",
-	"type": "dgstart",
-	"name": "DGSTART",
-	"outputs": 1,
-	"x": 116.00390625,
-	"y": 127.00390625,
-	"z": "6262cf90.82826",
-	"wires": [
-		["62bd4bd7.3ee3c4"]
-	]
-}, {
-	"id": "62bd4bd7.3ee3c4",
-	"type": "service-logic",
-	"name": "GENERIC-RESOURCE-API ${project.version}",
-	"module": "GENERIC-RESOURCE-API",
-	"version": "${project.version}",
-	"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": 197.95626831054688,
-	"y": 167.242018699646,
-	"z": "6262cf90.82826",
-	"wires": [
-		["92bec9ff.3ca028"]
-	]
-}, {
-	"id": "92bec9ff.3ca028",
-	"type": "method",
-	"name": "network-topology-operation",
-	"xml": "<method rpc='network-topology-operation' mode='sync'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 177.4325408935547,
-	"y": 218.0039119720459,
-	"z": "6262cf90.82826",
-	"wires": [
-		["787d9954.38bba8"]
-	]
-}, {
-	"id": "648b626a.56b11c",
-	"type": "comment",
-	"name": " NETWORK-TOPOLOGY-OPERATION ",
-	"info": "",
-	"comments": "",
-	"x": 510.34876251220703,
-	"y": 74.59025001525879,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "787d9954.38bba8",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 230.00393676757812,
-	"y": 290.44738960266113,
-	"z": "6262cf90.82826",
-	"wires": [
-		["fa0c17ce.6e7bc8", "fadbb13.7d2dd5", "dc48dc75.75815", "7270aff7.976ff"]
-	]
-}, {
-	"id": "fa0c17ce.6e7bc8",
-	"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": 434.0873107910156,
-	"y": 1316.5400428771973,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "fadbb13.7d2dd5",
-	"type": "switchNode",
-	"name": "switch svc-action",
-	"xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 456.7181701660156,
-	"y": 520.861083984375,
-	"z": "6262cf90.82826",
-	"wires": [
-		["c05cc8a9.a87538", "8c9c980d.ccc4f8", "8bf526ae.923e18", "7de8f4ae.cff8ac", "26afc371.40355c", "bb05b811.ebde68", "1a44c3fe.115f5c", "315bf1cb.32141e"]
-	]
-}, {
-	"id": "c05cc8a9.a87538",
-	"type": "other",
-	"name": "assign",
-	"xml": "<outcome value='assign'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 671.194408416748,
-	"y": 293.1467628479004,
-	"z": "6262cf90.82826",
-	"wires": [
-		["5bf1acae.be9164"]
-	]
-}, {
-	"id": "5bf1acae.be9164",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 843.4325790405273,
-	"y": 291.1468915939331,
-	"z": "6262cf90.82826",
-	"wires": [
-		["e342989e.94fd28"]
-	]
-}, {
-	"id": "dc48dc75.75815",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:validate-network-input",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-network-input' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 567.0038948059082,
-	"y": 231.0039131641388,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "8c9c980d.ccc4f8",
-	"type": "other",
-	"name": "activate",
-	"xml": "<outcome value='activate'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 674.0039482116699,
-	"y": 383.0039005279541,
-	"z": "6262cf90.82826",
-	"wires": [
-		["e028738c.44a5e"]
-	]
-}, {
-	"id": "647e7eaa.31279",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 1129.2422637939453,
-	"y": 468.00415229797363,
-	"z": "6262cf90.82826",
-	"wires": [
-		["794617b.1131ce8", "ba635494.f7cda8", "5f3efec5.a1f4d"]
-	]
-}, {
-	"id": "b8d794c5.efea38",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:network-topology-operation-activate",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-activate' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2321.063835144043,
-	"y": 971.6111488342285,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "8bf526ae.923e18",
-	"type": "other",
-	"name": "deactivate",
-	"xml": "<outcome value='deactivate'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 668.0039405822754,
-	"y": 615.0038986206055,
-	"z": "6262cf90.82826",
-	"wires": [
-		["cf3c1895.618e38"]
-	]
-}, {
-	"id": "55cb30ff.95ca3",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 1105.2422409057617,
-	"y": 855.0042123794556,
-	"z": "6262cf90.82826",
-	"wires": [
-		["794617b.1131ce8", "7bec74e2.e8459c", "5f3efec5.a1f4d"]
-	]
-}, {
-	"id": "7bec74e2.e8459c",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:network-topology-operation-deactivate",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-deactivate' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1649.2304382324219,
-	"y": 1059.8611965179443,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "7de8f4ae.cff8ac",
-	"type": "other",
-	"name": "unassign",
-	"xml": "<outcome value='unassign'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 665.0039596557617,
-	"y": 867.0039482116699,
-	"z": "6262cf90.82826",
-	"wires": [
-		["cc00dd86.d7918"]
-	]
-}, {
-	"id": "cc00dd86.d7918",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 846.2421188354492,
-	"y": 868.0040702819824,
-	"z": "6262cf90.82826",
-	"wires": [
-		["794617b.1131ce8", "8d92f87.3b71108", "5f3efec5.a1f4d"]
-	]
-}, {
-	"id": "7ba153c5.8b3f2c",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:network-topology-operation-unassign",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2316.8136978149414,
-	"y": 1165.1111183166504,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "26afc371.40355c",
-	"type": "other",
-	"name": "other",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 649.0039596557617,
-	"y": 1122.0039448738098,
-	"z": "6262cf90.82826",
-	"wires": [
-		["14623740.584dd9"]
-	]
-}, {
-	"id": "14623740.584dd9",
-	"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=\"sdnc-request-header.svc-action is a required input\" />\n",
-	"comments": "",
-	"x": 831.0039558410645,
-	"y": 1121.003954410553,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "7270aff7.976ff",
-	"type": "set",
-	"name": "Set final indicator to Y",
-	"xml": "<set>\n<parameter name=\"ack-final\" value=\"Y\"/>",
-	"comments": "",
-	"x": 453.11500549316406,
-	"y": 1275.6983814239502,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "c06efb45.ffaa78",
-	"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": 2185.734363555908,
-	"y": 509.7658576965332,
-	"z": "6262cf90.82826",
-	"wires": [
-		["c1a437ff.1b7718"]
-	]
-}, {
-	"id": "794617b.1131ce8",
-	"type": "switchNode",
-	"name": "switch service-data.networks.network_length",
-	"xml": "<switch test='`$service-data.networks.network_length`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1463.1985206604004,
-	"y": 478.0872497558594,
-	"z": "6262cf90.82826",
-	"wires": [
-		["26994831.0e1298", "ecf2ea88.0ee378"]
-	]
-}, {
-	"id": "26994831.0e1298",
-	"type": "other",
-	"name": "outcome Null",
-	"xml": "<outcome value=''>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1762.448398590088,
-	"y": 476.33724784851074,
-	"z": "6262cf90.82826",
-	"wires": [
-		["55f21fbf.094db"]
-	]
-}, {
-	"id": "ecf2ea88.0ee378",
-	"type": "other",
-	"name": "other",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1716.448429107666,
-	"y": 509.3372688293457,
-	"z": "6262cf90.82826",
-	"wires": [
-		["b06a60a0.ec18c"]
-	]
-}, {
-	"id": "c1a437ff.1b7718",
-	"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": 2476.162914276123,
-	"y": 509.01594161987305,
-	"z": "6262cf90.82826",
-	"wires": [
-		["dc253be8.d2cc08"]
-	]
-}, {
-	"id": "dc253be8.d2cc08",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2665.1152687072754,
-	"y": 509.9086799621582,
-	"z": "6262cf90.82826",
-	"wires": [
-		["db34e276.b7ef7"]
-	]
-}, {
-	"id": "db34e276.b7ef7",
-	"type": "set",
-	"name": "set tmp.nidx and network-data",
-	"xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />\n",
-	"comments": "",
-	"x": 2898.6470375061035,
-	"y": 508.65868759155273,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "810ee0f6.12029",
-	"type": "comment",
-	"name": "Find the index to service data for this network - save id in tmp.nidx, save service-data",
-	"info": "",
-	"comments": "",
-	"x": 1613.559814453125,
-	"y": 443.33726978302,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "faca6d42.ad164",
-	"type": "comment",
-	"name": "service-data  will not be stored until we have a network-id",
-	"info": "",
-	"comments": "",
-	"x": 1181.6707000732422,
-	"y": 72.22616004943848,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "55f21fbf.094db",
-	"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": 1954.2259559631348,
-	"y": 474.22624588012695,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "b06a60a0.ec18c",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 1883.7183952331543,
-	"y": 508.891845703125,
-	"z": "6262cf90.82826",
-	"wires": [
-		["c06efb45.ffaa78", "56e75e01.1337c"]
-	]
-}, {
-	"id": "56e75e01.1337c",
-	"type": "switchNode",
-	"name": "switch tmp.nidx ",
-	"xml": "<switch test=\"`$tmp.nidx`\">\n\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2112.7859077453613,
-	"y": 559.2490568161011,
-	"z": "6262cf90.82826",
-	"wires": [
-		["c0593450.c30c98", "2cfecf83.4d66"]
-	]
-}, {
-	"id": "38dfaef5.ab0d82",
-	"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": 2465.642890930176,
-	"y": 554.9632987976074,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "c0593450.c30c98",
-	"type": "outcome",
-	"name": "NULL",
-	"xml": "<outcome value=''>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2284.214443206787,
-	"y": 557.820442199707,
-	"z": "6262cf90.82826",
-	"wires": [
-		["38dfaef5.ab0d82"]
-	]
-}, {
-	"id": "ba635494.f7cda8",
-	"type": "switchNode",
-	"name": "switch network-level-oper-status",
-	"xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1534.0320663452148,
-	"y": 971.5625495910645,
-	"z": "6262cf90.82826",
-	"wires": [
-		["f777a5ff.1ff918", "65fed18b.d3691"]
-	]
-}, {
-	"id": "f777a5ff.1ff918",
-	"type": "outcome",
-	"name": "outcome PendingCreate",
-	"xml": "<outcome value='PendingCreate'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1899.0320460001622,
-	"y": 971.5625343322754,
-	"z": "6262cf90.82826",
-	"wires": [
-		["b8d794c5.efea38"]
-	]
-}, {
-	"id": "65fed18b.d3691",
-	"type": "other",
-	"name": "other",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1849.0320930480957,
-	"y": 1011.5625648498535,
-	"z": "6262cf90.82826",
-	"wires": [
-		["ad2b7f81.8f2fa"]
-	]
-}, {
-	"id": "ad2b7f81.8f2fa",
-	"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 is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
-	"comments": "",
-	"x": 2019.0320930480957,
-	"y": 1011.5625648498535,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "8d92f87.3b71108",
-	"type": "switchNode",
-	"name": "switch network-level-oper-status",
-	"xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1523.6350784301758,
-	"y": 1166.7153205871582,
-	"z": "6262cf90.82826",
-	"wires": [
-		["2bf6a461.e029dc", "1dc42825.9e33e8", "3c21ea48.9e0a06"]
-	]
-}, {
-	"id": "2bf6a461.e029dc",
-	"type": "outcome",
-	"name": "outcome PendingCreate",
-	"xml": "<outcome value='PendingCreate'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1883.6350479125977,
-	"y": 1166.7153511047363,
-	"z": "6262cf90.82826",
-	"wires": [
-		["7ba153c5.8b3f2c"]
-	]
-}, {
-	"id": "1dc42825.9e33e8",
-	"type": "other",
-	"name": "other",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1839.3849716186523,
-	"y": 1238.2154140472412,
-	"z": "6262cf90.82826",
-	"wires": [
-		["77f1e70c.bfe408"]
-	]
-}, {
-	"id": "77f1e70c.bfe408",
-	"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 is not in appropriate state for unassign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
-	"comments": "",
-	"x": 2030.718391418457,
-	"y": 1236.8820428848267,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "3c21ea48.9e0a06",
-	"type": "outcome",
-	"name": "outcome PendingDelete",
-	"xml": "<outcome value='PendingDelete'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1886.8652725219727,
-	"y": 1204.5625190734863,
-	"z": "6262cf90.82826",
-	"wires": [
-		["7ba153c5.8b3f2c"]
-	]
-}, {
-	"id": "bb05b811.ebde68",
-	"type": "other",
-	"name": "changeassign",
-	"xml": "<outcome value='changeassign'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 676.003978729248,
-	"y": 518.0039310455322,
-	"z": "6262cf90.82826",
-	"wires": [
-		["8f942ed8.86388"]
-	]
-}, {
-	"id": "8f942ed8.86388",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 1048.2539176940918,
-	"y": 515.0039224624634,
-	"z": "6262cf90.82826",
-	"wires": [
-		["794617b.1131ce8", "66843091.29a36"]
-	]
-}, {
-	"id": "42b0a6db.432d98",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:network-topology-operation-assign",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1817.0041007995605,
-	"y": 213.0039234161377,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "e342989e.94fd28",
-	"type": "switchNode",
-	"name": "switch network-level-oper-status",
-	"xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1112.9721565246582,
-	"y": 150.95531463623047,
-	"z": "6262cf90.82826",
-	"wires": [
-		["40bb733e.dd6f7c", "b0f9b859.068648", "593782df.da509c", "387e750f.af463a"]
-	]
-}, {
-	"id": "40bb733e.dd6f7c",
-	"type": "outcome",
-	"name": "outcome PendingCreate",
-	"xml": "<outcome value='PendingCreate'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1498.9722023010254,
-	"y": 170.95529651641846,
-	"z": "6262cf90.82826",
-	"wires": [
-		["511a23b5.730e6c"]
-	]
-}, {
-	"id": "b0f9b859.068648",
-	"type": "other",
-	"name": "other",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1446.9721984863281,
-	"y": 212.9553279876709,
-	"z": "6262cf90.82826",
-	"wires": [
-		["42b0a6db.432d98"]
-	]
-}, {
-	"id": "511a23b5.730e6c",
-	"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 is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
-	"comments": "",
-	"x": 1773.9724235534668,
-	"y": 166.9553451538086,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "387e750f.af463a",
-	"type": "outcome",
-	"name": "outcome PendingDelete",
-	"xml": "<outcome value='PendingDelete'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1497.0039405822754,
-	"y": 136.0039119720459,
-	"z": "6262cf90.82826",
-	"wires": [
-		["511a23b5.730e6c"]
-	]
-}, {
-	"id": "593782df.da509c",
-	"type": "outcome",
-	"name": "outcome Created",
-	"xml": "<outcome value='Created'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1477.003978729248,
-	"y": 101.00391387939453,
-	"z": "6262cf90.82826",
-	"wires": [
-		["511a23b5.730e6c"]
-	]
-}, {
-	"id": "66843091.29a36",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:network-topology-operation-changeassign",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-changeassign' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1626.2503128051758,
-	"y": 903.5000400543213,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "5f3efec5.a1f4d",
-	"type": "switchNode",
-	"name": "switch network-information.network-instance-group-id",
-	"xml": "<switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>\n\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1538.442554473877,
-	"y": 735.5049266815186,
-	"z": "6262cf90.82826",
-	"wires": [
-		["284c8b6d.7f3634", "7a92615c.c2127"]
-	]
-}, {
-	"id": "284c8b6d.7f3634",
-	"type": "other",
-	"name": "Other",
-	"xml": "<outcome value='Other'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1825.1924362182617,
-	"y": 773.6715936660767,
-	"z": "6262cf90.82826",
-	"wires": [
-		["a50032f5.72a83"]
-	]
-}, {
-	"id": "7a92615c.c2127",
-	"type": "other",
-	"name": "NULL",
-	"xml": "<outcome value=''>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1822.85933303833,
-	"y": 740.6714677810669,
-	"z": "6262cf90.82826",
-	"wires": [
-		["b4f37512.d70bb8"]
-	]
-}, {
-	"id": "b4f37512.d70bb8",
-	"type": "returnSuccess",
-	"name": "return success",
-	"xml": "<return status='success'>\n",
-	"comments": "",
-	"x": 1983.1925621032715,
-	"y": 737.6715250015259,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "fe324586.0b55a8",
-	"type": "switchNode",
-	"name": "service-data.network-instance-groups.network-instance-group_length",
-	"xml": "<switch test='`$service-data.network-instance-groups.network-instance-group_length`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2318.2681770324707,
-	"y": 766.9373426437378,
-	"z": "6262cf90.82826",
-	"wires": [
-		["e21d92d1.3db16", "3beb03c.3e8d3fc"]
-	]
-}, {
-	"id": "e21d92d1.3db16",
-	"type": "other",
-	"name": "outcome Null",
-	"xml": "<outcome value=''>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2677.517868041992,
-	"y": 723.9373455047607,
-	"z": "6262cf90.82826",
-	"wires": [
-		["b8fb72eb.e727c"]
-	]
-}, {
-	"id": "3beb03c.3e8d3fc",
-	"type": "other",
-	"name": "other",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2657.517868041992,
-	"y": 758.9373455047607,
-	"z": "6262cf90.82826",
-	"wires": [
-		["48f28981.9aa598"]
-	]
-}, {
-	"id": "a50032f5.72a83",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 1959.3036918640137,
-	"y": 774.1159982681274,
-	"z": "6262cf90.82826",
-	"wires": [
-		["fe324586.0b55a8"]
-	]
-}, {
-	"id": "7d5793c9.a9443c",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 4081.5116844177246,
-	"y": 702.14794921875,
-	"z": "6262cf90.82826",
-	"wires": [
-		["a95997cc.c83c08"]
-	]
-}, {
-	"id": "15a71d4.a9638e3",
-	"type": "set",
-	"name": "set tmp.ngidx and ctx.network-instance-group-data",
-	"xml": "<set>\n<parameter name='tmp.ngidx' value='`$ngidx`' />\n<parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />\n",
-	"comments": "",
-	"x": 4524.043651580811,
-	"y": 701.8979740142822,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "a95997cc.c83c08",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 4230.130123138428,
-	"y": 702.0051345825195,
-	"z": "6262cf90.82826",
-	"wires": [
-		["15a71d4.a9638e3"]
-	]
-}, {
-	"id": "a82beca.188501",
-	"type": "for",
-	"name": "for ngidx..service-data.network-instance-groups.network-instance-group[]",
-	"xml": "<for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 3264.3800888061523,
-	"y": 762.254921913147,
-	"z": "6262cf90.82826",
-	"wires": [
-		["14adc4b7.e22c9b"]
-	]
-}, {
-	"id": "14adc4b7.e22c9b",
-	"type": "switchNode",
-	"name": "switch network-instance-group-id found",
-	"xml": "<switch test=\"`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`\">\n\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 3709.8086853027344,
-	"y": 762.005090713501,
-	"z": "6262cf90.82826",
-	"wires": [
-		["7d5793c9.a9443c"]
-	]
-}, {
-	"id": "48f28981.9aa598",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 2876.363967895508,
-	"y": 760.1308469772339,
-	"z": "6262cf90.82826",
-	"wires": [
-		["a82beca.188501"]
-	]
-}, {
-	"id": "b8fb72eb.e727c",
-	"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-instance-group-id not found in service-data\" />\n",
-	"comments": "",
-	"x": 2869.0675201416016,
-	"y": 723.5049123764038,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "2cfecf83.4d66",
-	"type": "other",
-	"name": "other",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2283.7500953674316,
-	"y": 588.7500247955322,
-	"z": "6262cf90.82826",
-	"wires": [
-		["46a8714e.72c73"]
-	]
-}, {
-	"id": "46a8714e.72c73",
-	"type": "set",
-	"name": "set nidx",
-	"xml": "<set>\n<parameter name='nidx' value='`$tmp.nidx`' />\n",
-	"comments": "",
-	"x": 2440.7500953674316,
-	"y": 589.7500247955322,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "e028738c.44a5e",
-	"type": "switchNode",
-	"name": "switch request-action",
-	"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 865.1150932312012,
-	"y": 375.45883655548096,
-	"z": "6262cf90.82826",
-	"wires": [
-		["4b5ff3a1.79dd3c", "7a80b9c3.a5dcb8", "c5dccdb2.4a1d2", "6dd58869.b5c168"]
-	]
-}, {
-	"id": "4b5ff3a1.79dd3c",
-	"type": "outcome",
-	"name": "ActivateDCINetworkInstance",
-	"xml": "<outcome value='ActivateDCINetworkInstance'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1161.4483184814453,
-	"y": 320.4586658477783,
-	"z": "6262cf90.82826",
-	"wires": [
-		["67b5a7fb.45ef88"]
-	]
-}, {
-	"id": "67b5a7fb.45ef88",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:dci-connects-network-topology-operation-activate",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-activate' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1676.4483947753906,
-	"y": 320.12549781799316,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "7a80b9c3.a5dcb8",
-	"type": "outcome",
-	"name": "other",
-	"xml": "<outcome value='other'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 998.4484367370605,
-	"y": 425.12542152404785,
-	"z": "6262cf90.82826",
-	"wires": [
-		["bf8db20a.91bed"]
-	]
-}, {
-	"id": "cf3c1895.618e38",
-	"type": "switchNode",
-	"name": "switch request-action",
-	"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 869.6706428527832,
-	"y": 616.9032173156738,
-	"z": "6262cf90.82826",
-	"wires": [
-		["cbdbb0cc.f0331", "5badbdc.f46d244", "7e6d0610.2563c8", "13b9136d.b8ff1d"]
-	]
-}, {
-	"id": "cbdbb0cc.f0331",
-	"type": "outcome",
-	"name": "DeactivateSOTNConnectivityInstance",
-	"xml": "<outcome value='DeactivateSOTNConnectivityInstance'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1159.4485206604004,
-	"y": 561.1253547668457,
-	"z": "6262cf90.82826",
-	"wires": [
-		["49a424cb.12dbec"]
-	]
-}, {
-	"id": "5badbdc.f46d244",
-	"type": "other",
-	"name": "other",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1018.8936080932617,
-	"y": 707.8169631958008,
-	"z": "6262cf90.82826",
-	"wires": [
-		["e396e5dc.9253f8"]
-	]
-}, {
-	"id": "49a424cb.12dbec",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-deactivate",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-deactivate' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1650.8057861328125,
-	"y": 559.408727645874,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "1a44c3fe.115f5c",
-	"type": "other",
-	"name": "create",
-	"xml": "<outcome value='create'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 655.3374099731445,
-	"y": 956.2367563247681,
-	"z": "6262cf90.82826",
-	"wires": [
-		["45693d0f.b52f34"]
-	]
-}, {
-	"id": "45693d0f.b52f34",
-	"type": "switchNode",
-	"name": "switch request-action",
-	"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 855.6512298583984,
-	"y": 956.0144290924072,
-	"z": "6262cf90.82826",
-	"wires": [
-		["779b6195.9f707", "620d8e1f.fb138", "3ab6b5e.164cc4a"]
-	]
-}, {
-	"id": "315bf1cb.32141e",
-	"type": "other",
-	"name": "delete",
-	"xml": "<outcome value='delete'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 653.3374137878418,
-	"y": 1033.2367601394653,
-	"z": "6262cf90.82826",
-	"wires": [
-		["93e17ab4.f42768"]
-	]
-}, {
-	"id": "93e17ab4.f42768",
-	"type": "switchNode",
-	"name": "switch request-action",
-	"xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 855.6256713867188,
-	"y": 1034.2975606918335,
-	"z": "6262cf90.82826",
-	"wires": [
-		["bead6e63.0cea2", "2c6e7786.59c9d8", "dd8b829c.98de2"]
-	]
-}, {
-	"id": "f074082c.642148",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 1587.4487915039062,
-	"y": 1447.1256427764893,
-	"z": "6262cf90.82826",
-	"wires": [
-		["e2f268db.e09cb8"]
-	]
-}, {
-	"id": "273eee3d.625232",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 1553.8930892944336,
-	"y": 1742.681453704834,
-	"z": "6262cf90.82826",
-	"wires": [
-		["26e1cb1f.5ee944"]
-	]
-}, {
-	"id": "e2f268db.e09cb8",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:network-topology-operation-create",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-create' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1953.115234375,
-	"y": 1443.5702953338623,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "26e1cb1f.5ee944",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:network-topology-operation-delete",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-delete' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1918.8930130004883,
-	"y": 1741.6813821792603,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "779b6195.9f707",
-	"type": "outcome",
-	"name": "other",
-	"xml": "<outcome value='other'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1417.6512145996094,
-	"y": 1392.9031620025635,
-	"z": "6262cf90.82826",
-	"wires": [
-		["2bb8422a.2e625e"]
-	]
-}, {
-	"id": "620d8e1f.fb138",
-	"type": "outcome",
-	"name": "CreateSOTNConnectivityInstance",
-	"xml": "<outcome value='CreateSOTNConnectivityInstance'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1497.317943572998,
-	"y": 1293.6810633102432,
-	"z": "6262cf90.82826",
-	"wires": [
-		["cd4e7eb6.ff6ff"]
-	]
-}, {
-	"id": "cd4e7eb6.ff6ff",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-create",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-create' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1976.2067604064941,
-	"y": 1295.903245584108,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "2c6e7786.59c9d8",
-	"type": "outcome",
-	"name": "DeleteSOTNConnectivityInstance",
-	"xml": "<outcome value='DeleteSOTNConnectivityInstance'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1490.7371063232422,
-	"y": 1550.85329246521,
-	"z": "6262cf90.82826",
-	"wires": [
-		["19f1388e.0fadf7"]
-	]
-}, {
-	"id": "19f1388e.0fadf7",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-delete",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-delete' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1957.6259231567383,
-	"y": 1553.0754747390747,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "bead6e63.0cea2",
-	"type": "outcome",
-	"name": "other",
-	"xml": "<outcome value='other'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1409.0702438354492,
-	"y": 1662.0754313468933,
-	"z": "6262cf90.82826",
-	"wires": [
-		["1fe426ab.fd1089"]
-	]
-}, {
-	"id": "c5dccdb2.4a1d2",
-	"type": "outcome",
-	"name": "ActivateSOTNConnectivityInstance",
-	"xml": "<outcome value='ActivateSOTNConnectivityInstance'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1181.4484100341797,
-	"y": 271.23657417297363,
-	"z": "6262cf90.82826",
-	"wires": [
-		["2dd1b08b.8bc5e"]
-	]
-}, {
-	"id": "2dd1b08b.8bc5e",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:sotn-network-topology-operation-activate",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-activate' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1635.6706237792969,
-	"y": 272.4711055755615,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "7e6d0610.2563c8",
-	"type": "outcome",
-	"name": "DeActivateDCINetworkInstance",
-	"xml": "<outcome value='DeActivateDCINetworkInstance'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1139.5490608215332,
-	"y": 604.2261543273926,
-	"z": "6262cf90.82826",
-	"wires": [
-		["39e58430.1a297c"]
-	]
-}, {
-	"id": "39e58430.1a297c",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:dci-connects-network-topology-operation-deactivate",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-deactivate' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1679.5494384765625,
-	"y": 607.8929653167725,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "6dd58869.b5c168",
-	"type": "outcome",
-	"name": "ActivateSDWANConnectivityInstance",
-	"xml": "<outcome value='ActivateSDWANConnectivityInstance'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1182.9935455322266,
-	"y": 371.2261791229248,
-	"z": "6262cf90.82826",
-	"wires": [
-		["9662796.a381e88"]
-	]
-}, {
-	"id": "9662796.a381e88",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:sdwan-network-topology-operation-activate",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-activate' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1702.9937438964844,
-	"y": 365.89303398132324,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "13b9136d.b8ff1d",
-	"type": "outcome",
-	"name": "DeactivateSDWANConnectivityInstance",
-	"xml": "<outcome value='DeactivateSDWANConnectivityInstance'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1156.9934997558594,
-	"y": 657.2261600494385,
-	"z": "6262cf90.82826",
-	"wires": [
-		["407f818a.a3f1e"]
-	]
-}, {
-	"id": "407f818a.a3f1e",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:sdwan-network-topology-operation-deactivate",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-deactivate' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1670.9937744140625,
-	"y": 654.893012046814,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "3ab6b5e.164cc4a",
-	"type": "outcome",
-	"name": "CreateSDWANConnectivityInstance",
-	"xml": "<outcome value='CreateSDWANConnectivityInstance'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1502.9934997558594,
-	"y": 1342.2261600494385,
-	"z": "6262cf90.82826",
-	"wires": [
-		["26a8274b.85d1f8"]
-	]
-}, {
-	"id": "26a8274b.85d1f8",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:sdwan-network-topology-operation-create",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-create' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1945.9936904907227,
-	"y": 1339.8929886817932,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "dd8b829c.98de2",
-	"type": "outcome",
-	"name": "DeleteSDWANConnectivityInstance",
-	"xml": "<outcome value='DeleteSDWANConnectivityInstance'>",
-	"comments": "",
-	"outputs": 1,
-	"x": 1491.993564605713,
-	"y": 1601.2263398170471,
-	"z": "6262cf90.82826",
-	"wires": [
-		["a36aa3d0.1a854"]
-	]
-}, {
-	"id": "a36aa3d0.1a854",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:sdwan-network-topology-operation-delete",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-delete' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1958.882381439209,
-	"y": 1603.4485220909119,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "bf8db20a.91bed",
-	"type": "execute",
-	"name": "contains wan-connection",
-	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.service-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"wan-connection\"/>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1188.8993453979492,
-	"y": 410.2326798439026,
-	"z": "6262cf90.82826",
-	"wires": [
-		["a4b8222c.37fd2", "f38dc6c7.31f8f8"]
-	]
-}, {
-	"id": "a4b8222c.37fd2",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1394.899398803711,
-	"y": 405.34375190734863,
-	"z": "6262cf90.82826",
-	"wires": [
-		["cfa31.bc3ac5cf8"]
-	]
-}, {
-	"id": "cfa31.bc3ac5cf8",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:wan-connection-topology-operation-activate",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='wan-connection-topology-operation-activate' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1779.8994979858398,
-	"y": 407.34376525878906,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "f38dc6c7.31f8f8",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 967.1215209960938,
-	"y": 472.2326354980469,
-	"z": "6262cf90.82826",
-	"wires": [
-		["647e7eaa.31279"]
-	]
-}, {
-	"id": "e396e5dc.9253f8",
-	"type": "execute",
-	"name": "contains wan-connection",
-	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.service-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"wan-connection\"/>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1204.6771087646484,
-	"y": 698.4548931121826,
-	"z": "6262cf90.82826",
-	"wires": [
-		["16dbb839.f33278", "5d50fb2f.744eb4"]
-	]
-}, {
-	"id": "16dbb839.f33278",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1405.6772651672363,
-	"y": 697.5659255981445,
-	"z": "6262cf90.82826",
-	"wires": [
-		["db483123.c7a64"]
-	]
-}, {
-	"id": "db483123.c7a64",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:wan-connection-topology-operation-deactivate",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='wan-connection-topology-operation-deactivate' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1771.677230834961,
-	"y": 694.5659408569336,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "5d50fb2f.744eb4",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1051.677158355713,
-	"y": 761.3437719345093,
-	"z": "6262cf90.82826",
-	"wires": [
-		["55cb30ff.95ca3"]
-	]
-}, {
-	"id": "2bb8422a.2e625e",
-	"type": "execute",
-	"name": "contains wan-connection",
-	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.service-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"wan-connection\"/>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1602.899398803711,
-	"y": 1398.899284362793,
-	"z": "6262cf90.82826",
-	"wires": [
-		["f0fc160f.719fc8", "19b66d7a.3c5d03"]
-	]
-}, {
-	"id": "19b66d7a.3c5d03",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1409.8993377685547,
-	"y": 1445.7882862091064,
-	"z": "6262cf90.82826",
-	"wires": [
-		["f074082c.642148"]
-	]
-}, {
-	"id": "f0fc160f.719fc8",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1808.899471282959,
-	"y": 1391.010341644287,
-	"z": "6262cf90.82826",
-	"wires": [
-		["b831c9c0.001f08"]
-	]
-}, {
-	"id": "b831c9c0.001f08",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:wan-connection-topology-operation-create",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='wan-connection-topology-operation-create' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2167.899398803711,
-	"y": 1392.0103950500488,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "1fe426ab.fd1089",
-	"type": "execute",
-	"name": "contains wan-connection",
-	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.service-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"wan-connection\"/>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1615.56591796875,
-	"y": 1670.232666015625,
-	"z": "6262cf90.82826",
-	"wires": [
-		["ff1ea989.df69b8", "d8afda97.54c288"]
-	]
-}, {
-	"id": "d8afda97.54c288",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1400.565933227539,
-	"y": 1746.1215896606445,
-	"z": "6262cf90.82826",
-	"wires": [
-		["273eee3d.625232"]
-	]
-}, {
-	"id": "ff1ea989.df69b8",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1816.566074371338,
-	"y": 1669.343698501587,
-	"z": "6262cf90.82826",
-	"wires": [
-		["bae544d2.711e28"]
-	]
-}, {
-	"id": "bae544d2.711e28",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:wan-connection-topology-operation-deactivate",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='wan-connection-topology-operation-deactivate' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 2182.5660400390625,
-	"y": 1666.343713760376,
-	"z": "6262cf90.82826",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "8343f26d.19336",
-	"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='Created' />\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": 504.79057693481445,
-	"y": 1227.1833486557007,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "fc4f404.28de9c",
-	"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/network-topology/'` \" />\n \n",
-	"comments": "",
-	"x": 462.5048828125,
-	"y": 1181.7548751831055,
-	"z": "6262cf90.82826",
-	"wires": []
-}, {
-	"id": "b8117e21.6ea85",
-	"type": "set",
-	"name": "set networkId",
-	"xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
-	"comments": "",
-	"x": 456.7905158996582,
-	"y": 1144.6119832992554,
-	"z": "6262cf90.82826",
-	"wires": []
-}]
\ No newline at end of file
+[{"id":"391bc566.d29f3a","type":"dgstart","name":"DGSTART","outputs":1,"x":139.03125,"y":137.03125,"z":"80a6e568.0e5da8","wires":[["151aa940.31d5f7"]]},{"id":"151aa940.31d5f7","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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":220.98361206054688,"y":177.269362449646,"z":"80a6e568.0e5da8","wires":[["f4ae722c.e2412"]]},{"id":"f4ae722c.e2412","type":"method","name":"network-topology-operation","xml":"<method rpc='network-topology-operation' mode='sync'>\n","comments":"","outputs":1,"x":200.4598846435547,"y":228.0312557220459,"z":"80a6e568.0e5da8","wires":[["7f69cde1.f6c754"]]},{"id":"8b361294.19af8","type":"comment","name":" NETWORK-TOPOLOGY-OPERATION ","info":"","comments":"","x":533.376106262207,"y":84.61759376525879,"z":"80a6e568.0e5da8","wires":[]},{"id":"7f69cde1.f6c754","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":253.03128051757812,"y":300.47473335266113,"z":"80a6e568.0e5da8","wires":[["6aa44b11.58fab4","8d8d873c.54e428","333480cd.13ba7","f822b7ee.48fd68"]]},{"id":"6aa44b11.58fab4","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":457.1146545410156,"y":1326.5673866271973,"z":"80a6e568.0e5da8","wires":[]},{"id":"8d8d873c.54e428","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":479.7455139160156,"y":530.888427734375,"z":"80a6e568.0e5da8","wires":[["67756f70.342c2","162571c6.e5670e","b72df775.b9cdc8","8253b32c.c2d2f","4e4cc120.29e85","a0a93ee4.1aaaa","fb2ea25a.4e1a3","94d29a5d.cac4b8","c5b5e6bf.f3e6a8"]]},{"id":"67756f70.342c2","type":"other","name":"assign","xml":"<outcome value='assign'>\n","comments":"","outputs":1,"x":694.221752166748,"y":303.1741065979004,"z":"80a6e568.0e5da8","wires":[["16fba10.24b975f"]]},{"id":"16fba10.24b975f","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":866.4599227905273,"y":301.1742353439331,"z":"80a6e568.0e5da8","wires":[["de2b7578.bda2c8"]]},{"id":"333480cd.13ba7","type":"call","name":"call GENERIC-RESOURCE-API:validate-network-input","xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-network-input' mode='sync' >\n","comments":"","outputs":1,"x":590.0312385559082,"y":241.0312569141388,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"162571c6.e5670e","type":"other","name":"activate","xml":"<outcome value='activate'>\n","comments":"","outputs":1,"x":697.0312919616699,"y":393.0312442779541,"z":"80a6e568.0e5da8","wires":[["599829f5.fe5318"]]},{"id":"b2e4fea5.54444","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1152.2696075439453,"y":478.03149604797363,"z":"80a6e568.0e5da8","wires":[["3cc3ef6b.e25a2","15393ab6.d92225","be0e7f18.ecdee"]]},{"id":"2a13f2e9.95540e","type":"call","name":"call GENERIC-RESOURCE-API:network-topology-operation-activate","xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-activate' mode='sync' >\n","comments":"","outputs":1,"x":2344.091178894043,"y":981.6384925842285,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"b72df775.b9cdc8","type":"other","name":"deactivate","xml":"<outcome value='deactivate'>\n","comments":"","outputs":1,"x":691.0312843322754,"y":625.0312423706055,"z":"80a6e568.0e5da8","wires":[["f52c99d4.f263e8"]]},{"id":"7f2bbb62.bb09c4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1128.2695846557617,"y":865.0315561294556,"z":"80a6e568.0e5da8","wires":[["3cc3ef6b.e25a2","6bdb12be.1d8ddc","be0e7f18.ecdee"]]},{"id":"6bdb12be.1d8ddc","type":"call","name":"call GENERIC-RESOURCE-API:network-topology-operation-deactivate","xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-deactivate' mode='sync' >\n","comments":"","outputs":1,"x":1672.2577819824219,"y":1069.8885402679443,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"8253b32c.c2d2f","type":"other","name":"unassign","xml":"<outcome value='unassign'>\n","comments":"","outputs":1,"x":688.0313034057617,"y":877.0312919616699,"z":"80a6e568.0e5da8","wires":[["1761abfd.2588d4"]]},{"id":"1761abfd.2588d4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":869.2694625854492,"y":878.0314140319824,"z":"80a6e568.0e5da8","wires":[["3cc3ef6b.e25a2","de054913.fe8fc8","be0e7f18.ecdee"]]},{"id":"57f5a37b.0d4a2c","type":"call","name":"call GENERIC-RESOURCE-API:network-topology-operation-unassign","xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' >\n","comments":"","outputs":1,"x":2339.8410415649414,"y":1175.1384620666504,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"4e4cc120.29e85","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":672.0313034057617,"y":1132.0312886238098,"z":"80a6e568.0e5da8","wires":[["3d862971.ad4606"]]},{"id":"3d862971.ad4606","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=\"sdnc-request-header.svc-action is a required input\" />\n","comments":"","x":854.0312995910645,"y":1131.031298160553,"z":"80a6e568.0e5da8","wires":[]},{"id":"f822b7ee.48fd68","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":476.14234924316406,"y":1285.7257251739502,"z":"80a6e568.0e5da8","wires":[]},{"id":"6045ad50.51ba74","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":2208.761707305908,"y":519.7932014465332,"z":"80a6e568.0e5da8","wires":[["1f170555.0595ab"]]},{"id":"3cc3ef6b.e25a2","type":"switchNode","name":"switch service-data.networks.network_length","xml":"<switch test='`$service-data.networks.network_length`'>\n","comments":"","outputs":1,"x":1486.2258644104004,"y":488.1145935058594,"z":"80a6e568.0e5da8","wires":[["29b38669.490c4a","abbf4986.a58c08"]]},{"id":"29b38669.490c4a","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1785.475742340088,"y":486.36459159851074,"z":"80a6e568.0e5da8","wires":[["6f6554d7.baa7ac"]]},{"id":"abbf4986.a58c08","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1739.475772857666,"y":519.3646125793457,"z":"80a6e568.0e5da8","wires":[["a19eec6c.430c"]]},{"id":"1f170555.0595ab","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":2499.190258026123,"y":519.043285369873,"z":"80a6e568.0e5da8","wires":[["ec8c2b12.6013c8"]]},{"id":"ec8c2b12.6013c8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2688.1426124572754,"y":519.9360237121582,"z":"80a6e568.0e5da8","wires":[["aec91c53.10e62"]]},{"id":"aec91c53.10e62","type":"set","name":"set tmp.nidx and network-data","xml":"<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />\n","comments":"","x":2921.6743812561035,"y":518.6860313415527,"z":"80a6e568.0e5da8","wires":[]},{"id":"6c384d6a.ebe564","type":"comment","name":"Find the index to service data for this network - save id in tmp.nidx, save service-data","info":"","comments":"","x":1636.587158203125,"y":453.36461353302,"z":"80a6e568.0e5da8","wires":[]},{"id":"72e80856.699538","type":"comment","name":"service-data  will not be stored until we have a network-id","info":"","comments":"","x":1204.6980438232422,"y":82.25350379943848,"z":"80a6e568.0e5da8","wires":[]},{"id":"6f6554d7.baa7ac","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":1977.2532997131348,"y":484.25358963012695,"z":"80a6e568.0e5da8","wires":[]},{"id":"a19eec6c.430c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1906.7457389831543,"y":518.919189453125,"z":"80a6e568.0e5da8","wires":[["6045ad50.51ba74","3d1de00e.e25c4"]]},{"id":"3d1de00e.e25c4","type":"switchNode","name":"switch tmp.nidx ","xml":"<switch test=\"`$tmp.nidx`\">\n\n","comments":"","outputs":1,"x":2135.8132514953613,"y":569.2764005661011,"z":"80a6e568.0e5da8","wires":[["53515622.6c69b8","fdbe7b54.ba6eb8"]]},{"id":"a299bde8.ff648","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":2488.670234680176,"y":564.9906425476074,"z":"80a6e568.0e5da8","wires":[]},{"id":"53515622.6c69b8","type":"outcome","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":2307.241786956787,"y":567.847785949707,"z":"80a6e568.0e5da8","wires":[["a299bde8.ff648"]]},{"id":"15393ab6.d92225","type":"switchNode","name":"switch network-level-oper-status","xml":"<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1557.0594100952148,"y":981.5898933410645,"z":"80a6e568.0e5da8","wires":[["2a32c0d1.5896c","54281db.616ade4"]]},{"id":"2a32c0d1.5896c","type":"outcome","name":"outcome PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":1922.0593897501622,"y":981.5898780822754,"z":"80a6e568.0e5da8","wires":[["2a13f2e9.95540e"]]},{"id":"54281db.616ade4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1872.0594367980957,"y":1021.5899085998535,"z":"80a6e568.0e5da8","wires":[["d24675e4.4c5b58"]]},{"id":"d24675e4.4c5b58","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 is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />","comments":"","x":2042.0594367980957,"y":1021.5899085998535,"z":"80a6e568.0e5da8","wires":[]},{"id":"de054913.fe8fc8","type":"switchNode","name":"switch network-level-oper-status","xml":"<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1546.6624221801758,"y":1176.7426643371582,"z":"80a6e568.0e5da8","wires":[["5f6ee0a9.99bfe","888e2bf1.4afcf8","a7b1a8bf.a1d8a8"]]},{"id":"5f6ee0a9.99bfe","type":"outcome","name":"outcome PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":1906.6623916625977,"y":1176.7426948547363,"z":"80a6e568.0e5da8","wires":[["57f5a37b.0d4a2c"]]},{"id":"888e2bf1.4afcf8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1862.4123153686523,"y":1248.2427577972412,"z":"80a6e568.0e5da8","wires":[["90d3132f.bdcdb"]]},{"id":"90d3132f.bdcdb","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 is not in appropriate state for unassign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />","comments":"","x":2053.745735168457,"y":1246.9093866348267,"z":"80a6e568.0e5da8","wires":[]},{"id":"a7b1a8bf.a1d8a8","type":"outcome","name":"outcome PendingDelete","xml":"<outcome value='PendingDelete'>\n","comments":"","outputs":1,"x":1909.8926162719727,"y":1214.5898628234863,"z":"80a6e568.0e5da8","wires":[["57f5a37b.0d4a2c"]]},{"id":"a0a93ee4.1aaaa","type":"other","name":"changeassign","xml":"<outcome value='changeassign'>","comments":"","outputs":1,"x":699.031322479248,"y":528.0312747955322,"z":"80a6e568.0e5da8","wires":[["9ab0692f.fbf8b8"]]},{"id":"9ab0692f.fbf8b8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1071.2812614440918,"y":525.0312662124634,"z":"80a6e568.0e5da8","wires":[["3cc3ef6b.e25a2","c59ebd.d987e14"]]},{"id":"c2f0516d.f9bc8","type":"call","name":"call GENERIC-RESOURCE-API:network-topology-operation-assign","xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign' mode='sync' >\n","comments":"","outputs":1,"x":1840.0314445495605,"y":223.0312671661377,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"de2b7578.bda2c8","type":"switchNode","name":"switch network-level-oper-status","xml":"<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1135.9995002746582,"y":160.98265838623047,"z":"80a6e568.0e5da8","wires":[["37fcd84a.130878","dfec6f14.31a8d","b70de925.54aa58","533f71f3.53aa2"]]},{"id":"37fcd84a.130878","type":"outcome","name":"outcome PendingCreate","xml":"<outcome value='PendingCreate'>\n","comments":"","outputs":1,"x":1521.9995460510254,"y":180.98264026641846,"z":"80a6e568.0e5da8","wires":[["35c8e15b.d70bce"]]},{"id":"dfec6f14.31a8d","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1469.9995422363281,"y":222.9826717376709,"z":"80a6e568.0e5da8","wires":[["c2f0516d.f9bc8"]]},{"id":"35c8e15b.d70bce","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 is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />","comments":"","x":1796.9997673034668,"y":176.9826889038086,"z":"80a6e568.0e5da8","wires":[]},{"id":"533f71f3.53aa2","type":"outcome","name":"outcome PendingDelete","xml":"<outcome value='PendingDelete'>\n","comments":"","outputs":1,"x":1520.0312843322754,"y":146.0312557220459,"z":"80a6e568.0e5da8","wires":[["35c8e15b.d70bce"]]},{"id":"b70de925.54aa58","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":1500.031322479248,"y":111.03125762939453,"z":"80a6e568.0e5da8","wires":[["35c8e15b.d70bce"]]},{"id":"c59ebd.d987e14","type":"call","name":"call GENERIC-RESOURCE-API:network-topology-operation-changeassign","xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-changeassign' mode='sync' >\n","comments":"","outputs":1,"x":1649.2776565551758,"y":913.5273838043213,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"be0e7f18.ecdee","type":"switchNode","name":"switch network-information.network-instance-group-id","xml":"<switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>\n\n","comments":"","outputs":1,"x":1561.469898223877,"y":745.5322704315186,"z":"80a6e568.0e5da8","wires":[["85c6c572.a652a8","32dda312.6e155c"]]},{"id":"85c6c572.a652a8","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1848.2197799682617,"y":783.6989374160767,"z":"80a6e568.0e5da8","wires":[["85badf2d.c6082"]]},{"id":"32dda312.6e155c","type":"other","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1845.88667678833,"y":750.6988115310669,"z":"80a6e568.0e5da8","wires":[["2c481307.70e77c"]]},{"id":"2c481307.70e77c","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n","comments":"","x":2006.2199058532715,"y":747.6988687515259,"z":"80a6e568.0e5da8","wires":[]},{"id":"f7730dfa.cb9da","type":"switchNode","name":"service-data.network-instance-groups.network-instance-group_length","xml":"<switch test='`$service-data.network-instance-groups.network-instance-group_length`'>\n","comments":"","outputs":1,"x":2341.2955207824707,"y":776.9646863937378,"z":"80a6e568.0e5da8","wires":[["f969191e.dc4358","9055645.3711898"]]},{"id":"f969191e.dc4358","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":2700.545211791992,"y":733.9646892547607,"z":"80a6e568.0e5da8","wires":[["c7a778eb.d559b8"]]},{"id":"9055645.3711898","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2680.545211791992,"y":768.9646892547607,"z":"80a6e568.0e5da8","wires":[["b87cee4b.863b4"]]},{"id":"85badf2d.c6082","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1982.3310356140137,"y":784.1433420181274,"z":"80a6e568.0e5da8","wires":[["f7730dfa.cb9da"]]},{"id":"e03d2d36.5854c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":4104.539028167725,"y":712.17529296875,"z":"80a6e568.0e5da8","wires":[["ed256237.0c81b"]]},{"id":"a4fca569.f0ae58","type":"set","name":"set tmp.ngidx and ctx.network-instance-group-data","xml":"<set>\n<parameter name='tmp.ngidx' value='`$ngidx`' />\n<parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />\n","comments":"","x":4547.070995330811,"y":711.9253177642822,"z":"80a6e568.0e5da8","wires":[]},{"id":"ed256237.0c81b","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":4253.157466888428,"y":712.0324783325195,"z":"80a6e568.0e5da8","wires":[["a4fca569.f0ae58"]]},{"id":"9d4c2f6b.f4734","type":"for","name":"for ngidx..service-data.network-instance-groups.network-instance-group[]","xml":"<for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >\n","comments":"","outputs":1,"x":3287.4074325561523,"y":772.282265663147,"z":"80a6e568.0e5da8","wires":[["ad2fb3f5.10ea7"]]},{"id":"ad2fb3f5.10ea7","type":"switchNode","name":"switch network-instance-group-id found","xml":"<switch test=\"`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`\">\n\n","comments":"","outputs":1,"x":3732.8360290527344,"y":772.032434463501,"z":"80a6e568.0e5da8","wires":[["e03d2d36.5854c"]]},{"id":"b87cee4b.863b4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2899.391311645508,"y":770.1581907272339,"z":"80a6e568.0e5da8","wires":[["9d4c2f6b.f4734"]]},{"id":"c7a778eb.d559b8","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-instance-group-id not found in service-data\" />\n","comments":"","x":2892.0948638916016,"y":733.5322561264038,"z":"80a6e568.0e5da8","wires":[]},{"id":"fdbe7b54.ba6eb8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2306.7774391174316,"y":598.7773685455322,"z":"80a6e568.0e5da8","wires":[["56b4c83e.260768"]]},{"id":"56b4c83e.260768","type":"set","name":"set nidx","xml":"<set>\n<parameter name='nidx' value='`$tmp.nidx`' />\n","comments":"","x":2463.7774391174316,"y":599.7773685455322,"z":"80a6e568.0e5da8","wires":[]},{"id":"599829f5.fe5318","type":"switchNode","name":"switch request-action","xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":888.1424369812012,"y":385.48618030548096,"z":"80a6e568.0e5da8","wires":[["745e4395.07016c","b4b906ca.a76a98","6a8588b1.28c6f8","b74257e0.328b38"]]},{"id":"745e4395.07016c","type":"outcome","name":"ActivateDCINetworkInstance","xml":"<outcome value='ActivateDCINetworkInstance'>","comments":"","outputs":1,"x":1184.4756622314453,"y":330.4860095977783,"z":"80a6e568.0e5da8","wires":[["c3247484.e404b8"]]},{"id":"c3247484.e404b8","type":"call","name":"call GENERIC-RESOURCE-API:dci-connects-network-topology-operation-activate","xml":"<call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-activate' mode='sync' >\n","comments":"","outputs":1,"x":1699.4757385253906,"y":330.15284156799316,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"b4b906ca.a76a98","type":"outcome","name":"ActivateNetworkInstance","xml":"<outcome value='ActivateNetworkInstance'>","comments":"","outputs":1,"x":925.4757690429688,"y":435.15276527404785,"z":"80a6e568.0e5da8","wires":[["2bd4ba80.e75566"]]},{"id":"f52c99d4.f263e8","type":"switchNode","name":"switch request-action","xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":892.6979866027832,"y":626.9305610656738,"z":"80a6e568.0e5da8","wires":[["a8816b1b.efa8b8","a0cb33ec.f6704","72a9f23d.3e6b3c","decaee83.88569"]]},{"id":"a8816b1b.efa8b8","type":"outcome","name":"DeactivateSOTNConnectivityInstance","xml":"<outcome value='DeactivateSOTNConnectivityInstance'>","comments":"","outputs":1,"x":1182.4758644104004,"y":571.1526985168457,"z":"80a6e568.0e5da8","wires":[["bd13c97c.012068"]]},{"id":"a0cb33ec.f6704","type":"other","name":"DeActivateNetworkInstance","xml":"<outcome value='DeActivateNetworkInstance'>\n","comments":"","outputs":1,"x":914.9209594726562,"y":717.8443241119385,"z":"80a6e568.0e5da8","wires":[["1a4544f3.56012b"]]},{"id":"bd13c97c.012068","type":"call","name":"call GENERIC-RESOURCE-API:sotn-network-topology-operation-deactivate","xml":"<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-deactivate' mode='sync' >\n","comments":"","outputs":1,"x":1673.8331298828125,"y":569.436071395874,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"fb2ea25a.4e1a3","type":"other","name":"create","xml":"<outcome value='create'>\n","comments":"","outputs":1,"x":678.3647537231445,"y":966.2641000747681,"z":"80a6e568.0e5da8","wires":[["417a8018.fb8cd"]]},{"id":"417a8018.fb8cd","type":"switchNode","name":"switch request-action","xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":878.6785736083984,"y":966.0417728424072,"z":"80a6e568.0e5da8","wires":[["762f5d11.013634","d7a92705.b48688","666c86f3.535ea8"]]},{"id":"94d29a5d.cac4b8","type":"other","name":"delete","xml":"<outcome value='delete'>\n","comments":"","outputs":1,"x":676.3647575378418,"y":1043.2641038894653,"z":"80a6e568.0e5da8","wires":[["792737be.6931b8"]]},{"id":"792737be.6931b8","type":"switchNode","name":"switch request-action","xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":878.6530151367188,"y":1044.3249044418335,"z":"80a6e568.0e5da8","wires":[["78bf356f.14b20c","e79c5df9.4ad61","cfb392ce.3e4e3"]]},{"id":"6ddb84d.009f17c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1610.4761352539062,"y":1457.1529865264893,"z":"80a6e568.0e5da8","wires":[["20a3fee2.5b03c2"]]},{"id":"71b19a50.ac4be4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1576.9204330444336,"y":1752.708797454834,"z":"80a6e568.0e5da8","wires":[["2106370c.c67988"]]},{"id":"20a3fee2.5b03c2","type":"call","name":"call GENERIC-RESOURCE-API:network-topology-operation-create","xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-create' mode='sync' >\n","comments":"","outputs":1,"x":1976.142578125,"y":1453.5976390838623,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"2106370c.c67988","type":"call","name":"call GENERIC-RESOURCE-API:network-topology-operation-delete","xml":"<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-delete' mode='sync' >\n","comments":"","outputs":1,"x":1941.9203567504883,"y":1751.7087259292603,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"762f5d11.013634","type":"outcome","name":"CreateNetworkInstance","xml":"<outcome value='CreateNetworkInstance'>","comments":"","outputs":1,"x":1367.6785888671875,"y":1399.9305057525635,"z":"80a6e568.0e5da8","wires":[["c6a5cf80.707dd"]]},{"id":"d7a92705.b48688","type":"outcome","name":"CreateSOTNConnectivityInstance","xml":"<outcome value='CreateSOTNConnectivityInstance'>","comments":"","outputs":1,"x":1520.345287322998,"y":1303.7084070602432,"z":"80a6e568.0e5da8","wires":[["be1980c7.50887"]]},{"id":"be1980c7.50887","type":"call","name":"call GENERIC-RESOURCE-API:sotn-network-topology-operation-create","xml":"<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-create' mode='sync' >\n","comments":"","outputs":1,"x":1999.2341041564941,"y":1305.930589334108,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"e79c5df9.4ad61","type":"outcome","name":"DeleteSOTNConnectivityInstance","xml":"<outcome value='DeleteSOTNConnectivityInstance'>","comments":"","outputs":1,"x":1513.7644500732422,"y":1560.88063621521,"z":"80a6e568.0e5da8","wires":[["a98f74f2.03d838"]]},{"id":"a98f74f2.03d838","type":"call","name":"call GENERIC-RESOURCE-API:sotn-network-topology-operation-delete","xml":"<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-delete' mode='sync' >\n","comments":"","outputs":1,"x":1980.6532669067383,"y":1563.1028184890747,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"78bf356f.14b20c","type":"outcome","name":"DeleteNetworkInstance","xml":"<outcome value='DeleteNetworkInstance'>","comments":"","outputs":1,"x":1385.0975341796875,"y":1678.102746963501,"z":"80a6e568.0e5da8","wires":[["ea3c2545.c978f8"]]},{"id":"6a8588b1.28c6f8","type":"outcome","name":"ActivateSOTNConnectivityInstance","xml":"<outcome value='ActivateSOTNConnectivityInstance'>","comments":"","outputs":1,"x":1204.4757537841797,"y":281.26391792297363,"z":"80a6e568.0e5da8","wires":[["c9521032.0137f"]]},{"id":"c9521032.0137f","type":"call","name":"call GENERIC-RESOURCE-API:sotn-network-topology-operation-activate","xml":"<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-activate' mode='sync' >\n","comments":"","outputs":1,"x":1658.6979675292969,"y":282.4984493255615,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"72a9f23d.3e6b3c","type":"outcome","name":"DeActivateDCINetworkInstance","xml":"<outcome value='DeActivateDCINetworkInstance'>","comments":"","outputs":1,"x":1162.5764045715332,"y":614.2534980773926,"z":"80a6e568.0e5da8","wires":[["5d9fc0a8.4e2c2"]]},{"id":"5d9fc0a8.4e2c2","type":"call","name":"call GENERIC-RESOURCE-API:dci-connects-network-topology-operation-deactivate","xml":"<call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-deactivate' mode='sync' >\n","comments":"","outputs":1,"x":1702.5767822265625,"y":617.9203090667725,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"b74257e0.328b38","type":"outcome","name":"ActivateSDWANConnectivityInstance","xml":"<outcome value='ActivateSDWANConnectivityInstance'>","comments":"","outputs":1,"x":1206.0208892822266,"y":381.2535228729248,"z":"80a6e568.0e5da8","wires":[["499d4758.1bf988"]]},{"id":"499d4758.1bf988","type":"call","name":"call GENERIC-RESOURCE-API:sdwan-network-topology-operation-activate","xml":"<call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-activate' mode='sync' >\n","comments":"","outputs":1,"x":1726.0210876464844,"y":375.92037773132324,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"decaee83.88569","type":"outcome","name":"DeactivateSDWANConnectivityInstance","xml":"<outcome value='DeactivateSDWANConnectivityInstance'>","comments":"","outputs":1,"x":1180.0208435058594,"y":667.2535037994385,"z":"80a6e568.0e5da8","wires":[["ac5242b1.17137"]]},{"id":"ac5242b1.17137","type":"call","name":"call GENERIC-RESOURCE-API:sdwan-network-topology-operation-deactivate","xml":"<call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-deactivate' mode='sync' >\n","comments":"","outputs":1,"x":1694.0211181640625,"y":664.920355796814,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"666c86f3.535ea8","type":"outcome","name":"CreateSDWANConnectivityInstance","xml":"<outcome value='CreateSDWANConnectivityInstance'>","comments":"","outputs":1,"x":1526.0208435058594,"y":1352.2535037994385,"z":"80a6e568.0e5da8","wires":[["dd98cd42.78de7"]]},{"id":"dd98cd42.78de7","type":"call","name":"call GENERIC-RESOURCE-API:sdwan-network-topology-operation-create","xml":"<call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-create' mode='sync' >\n","comments":"","outputs":1,"x":1969.0210342407227,"y":1349.9203324317932,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"cfb392ce.3e4e3","type":"outcome","name":"DeleteSDWANConnectivityInstance","xml":"<outcome value='DeleteSDWANConnectivityInstance'>","comments":"","outputs":1,"x":1515.020908355713,"y":1611.2536835670471,"z":"80a6e568.0e5da8","wires":[["b90e9666.3ed138"]]},{"id":"b90e9666.3ed138","type":"call","name":"call GENERIC-RESOURCE-API:sdwan-network-topology-operation-delete","xml":"<call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-delete' mode='sync' >\n","comments":"","outputs":1,"x":1981.909725189209,"y":1613.4758658409119,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"2bd4ba80.e75566","type":"execute","name":"contains WanConnection","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true'>\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.service-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"WanConnection\"/>\n","comments":"","outputs":1,"x":1211.9266891479492,"y":420.2600235939026,"z":"80a6e568.0e5da8","wires":[["7722100f.2b425","ac15ee15.d25c2"]]},{"id":"7722100f.2b425","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1417.926742553711,"y":415.37109565734863,"z":"80a6e568.0e5da8","wires":[["11615b89.4d70b4"]]},{"id":"11615b89.4d70b4","type":"call","name":"call GENERIC-RESOURCE-API:wan-connection-topology-operation-activate","xml":"<call module='GENERIC-RESOURCE-API' rpc='wan-connection-topology-operation-activate' mode='sync' >\n","comments":"","outputs":1,"x":1802.9268417358398,"y":417.37110900878906,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"ac15ee15.d25c2","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":990.1488647460938,"y":482.2599792480469,"z":"80a6e568.0e5da8","wires":[["b2e4fea5.54444"]]},{"id":"1a4544f3.56012b","type":"execute","name":"contains WanConnection","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.service-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"WanConnection\"/>\n","comments":"","outputs":1,"x":1215.7044677734375,"y":709.4822635650635,"z":"80a6e568.0e5da8","wires":[["1dc12f1.9eafdd1","ef89eb4e.56cf48"]]},{"id":"1dc12f1.9eafdd1","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1428.7046089172363,"y":707.5932693481445,"z":"80a6e568.0e5da8","wires":[["6594f107.4cc8b"]]},{"id":"6594f107.4cc8b","type":"call","name":"call GENERIC-RESOURCE-API:wan-connection-topology-operation-deactivate","xml":"<call module='GENERIC-RESOURCE-API' rpc='wan-connection-topology-operation-deactivate' mode='sync' >\n","comments":"","outputs":1,"x":1794.704574584961,"y":704.5932846069336,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"ef89eb4e.56cf48","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1074.704502105713,"y":771.3711156845093,"z":"80a6e568.0e5da8","wires":[["7f2bbb62.bb09c4"]]},{"id":"c6a5cf80.707dd","type":"execute","name":"contains WanConnection","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.service-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"WanConnection\"/>\n","comments":"","outputs":1,"x":1625.926742553711,"y":1408.926628112793,"z":"80a6e568.0e5da8","wires":[["1a2a234b.3f1efd","813a7956.407528"]]},{"id":"813a7956.407528","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1432.9266815185547,"y":1455.8156299591064,"z":"80a6e568.0e5da8","wires":[["6ddb84d.009f17c"]]},{"id":"1a2a234b.3f1efd","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1831.926815032959,"y":1401.037685394287,"z":"80a6e568.0e5da8","wires":[["95eed200.11e3f"]]},{"id":"95eed200.11e3f","type":"call","name":"call GENERIC-RESOURCE-API:wan-connection-topology-operation-create","xml":"<call module='GENERIC-RESOURCE-API' rpc='wan-connection-topology-operation-create' mode='sync' >\n","comments":"","outputs":1,"x":2190.926742553711,"y":1402.0377388000488,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"ea3c2545.c978f8","type":"execute","name":"contains WanConnection","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.service-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"WanConnection\"/>\n","comments":"","outputs":1,"x":1638.59326171875,"y":1680.260009765625,"z":"80a6e568.0e5da8","wires":[["6c1de188.955fc","5eb66ddb.b7cb74"]]},{"id":"5eb66ddb.b7cb74","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1423.593276977539,"y":1756.1489334106445,"z":"80a6e568.0e5da8","wires":[["71b19a50.ac4be4"]]},{"id":"6c1de188.955fc","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1839.593418121338,"y":1679.371042251587,"z":"80a6e568.0e5da8","wires":[["c5bd454e.c33b68"]]},{"id":"c5bd454e.c33b68","type":"call","name":"call GENERIC-RESOURCE-API:wan-connection-topology-operation-deactivate","xml":"<call module='GENERIC-RESOURCE-API' rpc='wan-connection-topology-operation-deactivate' mode='sync' >\n","comments":"","outputs":1,"x":2205.5933837890625,"y":1676.371057510376,"z":"80a6e568.0e5da8","wires":[[]]},{"id":"b33cf1f5.4fe56","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='Created' />\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":527.8179206848145,"y":1237.2106924057007,"z":"80a6e568.0e5da8","wires":[]},{"id":"ec24c30a.06547","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/network-topology/'` \" />\n \n","comments":"","x":485.5322265625,"y":1191.7822189331055,"z":"80a6e568.0e5da8","wires":[]},{"id":"d385fea9.0c9ab","type":"set","name":"set networkId","xml":"<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n","comments":"","x":479.8178596496582,"y":1154.6393270492554,"z":"80a6e568.0e5da8","wires":[]},{"id":"c5b5e6bf.f3e6a8","type":"other","name":"reoptimize","xml":"<outcome value='reoptimize'>\n","comments":"","outputs":1,"x":675.03125,"y":1085.2535037994385,"z":"80a6e568.0e5da8","wires":[["dfda020b.e5eb3"]]},{"id":"dfda020b.e5eb3","type":"switchNode","name":"switch request-action","xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":876.03125,"y":1089.2535037994385,"z":"80a6e568.0e5da8","wires":[["7d1fceb4.2115"]]},{"id":"7d1fceb4.2115","type":"outcome","name":"ReoptimizeSOTNInstance","xml":"<outcome value='ReoptimizeSOTNInstance'>","comments":"","outputs":1,"x":1518.03125,"y":1838.2535037994385,"z":"80a6e568.0e5da8","wires":[["f749fb3c.07f078"]]},{"id":"f749fb3c.07f078","type":"call","name":"call GENERIC-RESOURCE-API:sotn-network-topology-operation-reoptimize","xml":"<call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-reoptimize' mode='sync' >\n","comments":"","outputs":1,"x":1966.03125,"y":1830.2535037994385,"z":"80a6e568.0e5da8","wires":[[]]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.json
index 5fd9bb3c..ea08ff39 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.json
@@ -1,890 +1 @@
-[{
-	"id": "17edfd48.067fb3",
-	"type": "dgstart",
-	"name": "DGSTART",
-	"outputs": 1,
-	"x": 100.01040649414062,
-	"y": 68.01041412353516,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["e615e2a2.ccf4f"]
-	]
-}, {
-	"id": "e615e2a2.ccf4f",
-	"type": "service-logic",
-	"name": "GENERIC-RESOURCE-API ${project.version}",
-	"module": "GENERIC-RESOURCE-API",
-	"version": "${project.version}",
-	"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": 312.0104103088379,
-	"y": 140.01043128967285,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["759cd8cf.a97478"]
-	]
-}, {
-	"id": "759cd8cf.a97478",
-	"type": "method",
-	"name": "wan-connection-topology-operation-activate",
-	"xml": "<method rpc='wan-connection-topology-operation-activate' mode='sync'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 300.0105285644531,
-	"y": 228.01041412353516,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["6de8279c.d96f18"]
-	]
-}, {
-	"id": "edd7fd49.09b45",
-	"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": 687.0106887817383,
-	"y": 312.0104856491089,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "e02df58.543ea08",
-	"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": 287.0104217529297,
-	"y": 1177.010627746582,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "6de8279c.d96f18",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 212.51060485839844,
-	"y": 669.0105495452881,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["c3c817be.4ef968", "ad2c5957.526e98", "ee7ba6fd.384b18", "569cdb0d.3aa8c4", "336b6524.04896a", "edd7fd49.09b45", "e02df58.543ea08"]
-	]
-}, {
-	"id": "c3c817be.4ef968",
-	"type": "execute",
-	"name": "generate services url",
-	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.network-provided-resource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.services-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$network-topology-operation-input.service-information.service-id`\"/>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 673.0106735229492,
-	"y": 383.0105857849121,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "ad2c5957.526e98",
-	"type": "execute",
-	"name": "execute RestApiCallNode - get-resource parent service data",
-	"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.services-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 799.0106735229492,
-	"y": 460.0105857849121,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["649fc773.be7288", "2c3dd512.e7091a"]
-	]
-}, {
-	"id": "649fc773.be7288",
-	"type": "success",
-	"name": "success",
-	"xml": "<outcome value='success'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1146.010856628418,
-	"y": 411.0105857849121,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["27ee6d28.0b0992"]
-	]
-}, {
-	"id": "27ee6d28.0b0992",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 1313.0109329223633,
-	"y": 445.0106463432312,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "2c3dd512.e7091a",
-	"type": "other",
-	"name": "other",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1151.8626289367676,
-	"y": 494.07674503326416,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["a4f3ebc3.28d808"]
-	]
-}, {
-	"id": "a4f3ebc3.28d808",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Parent service data not available\" />\n    \n",
-	"comments": "",
-	"x": 1322.2607803344727,
-	"y": 510.01057529449463,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "ee7ba6fd.384b18",
-	"type": "for",
-	"name": "for pidx..mdsal-psd.service-data.networks.network[]",
-	"xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.networks.network_length`' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 859.5107116699219,
-	"y": 611.0105295181274,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["5178f9b4.19b7c8"]
-	]
-}, {
-	"id": "5178f9b4.19b7c8",
-	"type": "switchNode",
-	"name": "switch model-name",
-	"xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$pidx].network-data.network-information.onap-model-information.model-name == $network-topology-operation-input.network-information.onap-model-information.model-name`\">\n\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 807.5106887817383,
-	"y": 688.0105800628662,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["d017d8d9.0843a8"]
-	]
-}, {
-	"id": "d017d8d9.0843a8",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 989.7607917785645,
-	"y": 690.0106735229492,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["b549c649.6ef3f8"]
-	]
-}, {
-	"id": "b549c649.6ef3f8",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 1160.5214195251465,
-	"y": 694.867790222168,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["90347753.f53c58"]
-	]
-}, {
-	"id": "90347753.f53c58",
-	"type": "set",
-	"name": "set tmp.pidx and tmp.network-input-parameters",
-	"xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n<parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[$pidx].`' />\n<parameter name='tmp.network-input-parameters' value='`$mdsal-psd.service-data.networks.network[$pidx].network-data.network-request-input.network-input-parameters`' />\n<parameter name='tmp.found-network-input' value='true' />",
-	"comments": "",
-	"x": 1107.3788032531738,
-	"y": 768.4393863677979,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "569cdb0d.3aa8c4",
-	"type": "set",
-	"name": "set tmp.found-network-input",
-	"xml": "<set>\n<parameter name='tmp.found-network-input' value='false' />",
-	"comments": "",
-	"x": 741.5106582641602,
-	"y": 540.0105857849121,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "336b6524.04896a",
-	"type": "switchNode",
-	"name": "switch found-network-input",
-	"xml": "<switch test=\"`$found-network-input`\">\n\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 572.5107040405273,
-	"y": 879.0107097625732,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["616108fb.092f18", "40e56e53.4077e"]
-	]
-}, {
-	"id": "616108fb.092f18",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 804.5107955932617,
-	"y": 923.010908126831,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["a846a4bd.9956b8"]
-	]
-}, {
-	"id": "40e56e53.4077e",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 805.2607345581055,
-	"y": 881.010799407959,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["8273b3b3.844e2"]
-	]
-}, {
-	"id": "8273b3b3.844e2",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Network input parameters not found\" />\n    \n",
-	"comments": "",
-	"x": 976.2607345581055,
-	"y": 889.0107688903809,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "a846a4bd.9956b8",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 542.0105819702148,
-	"y": 1035.0106945037842,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["a938b787.7c82b8", "2becb5c8.f5838a", "fec72c37.99e8b"]
-	]
-}, {
-	"id": "a938b787.7c82b8",
-	"type": "for",
-	"name": "for cidx..tmp.network.network-data.network-topology.network-parameters.network-parameter[]",
-	"xml": "<for index='cidx' start='0' end='`$tmp.network.network-data.network-topology.network-parameters.network-parameter_length`' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 991.0104217529297,
-	"y": 1121.0105504989624,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["a608965c.57ec78"]
-	]
-}, {
-	"id": "21b22ac0.8b6036",
-	"type": "switchNode",
-	"name": "switch network-parameter-name == 'restapiUrl'",
-	"xml": "<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiUrl'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1105.010482788086,
-	"y": 1191.010612487793,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["b3b8f491.b604a8"]
-	]
-}, {
-	"id": "b3b8f491.b604a8",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1356.0105361938477,
-	"y": 1194.0106182098389,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["f19676be.7dd8e8"]
-	]
-}, {
-	"id": "f19676be.7dd8e8",
-	"type": "set",
-	"name": "set tmp.thirdparty-sdnc-url",
-	"xml": "<set>\n<parameter name='tmp.restapiUrl' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.restapiUrl-found' value='true' />",
-	"comments": "",
-	"x": 1557.0105667114258,
-	"y": 1192.0106191635132,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "5e9a3d4b.faee04",
-	"type": "execute",
-	"name": "execute RestApiCallNode Create wan-connection",
-	"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$tmp.templateFileName`\" />\n<parameter name=\"restapiUrl\" value=\"`$tmp.restapiUrl`\" />\n<parameter name=\"restapiUser\" value=\"`$tmp.restapiUser`\" />\n<parameter name=\"restapiPassword\" value=\"`$tmp.restapiPassword`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restApi-result\"/>",
-	"comments": "",
-	"outputs": 1,
-	"x": 879.2604522705078,
-	"y": 1923.0111656188965,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["6cfa08fc.d58438", "35b532e4.67c04e", "456722ac.35f45c"]
-	]
-}, {
-	"id": "482305da.d57c9c",
-	"type": "switchNode",
-	"name": "switch network-parameter-name == 'restapiUser'",
-	"xml": "<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiUser'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1108.2604751586914,
-	"y": 1242.0105876922607,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["bfa7b41.e85df48"]
-	]
-}, {
-	"id": "bfa7b41.e85df48",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1374.2605895996094,
-	"y": 1244.0106649398804,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["431e7704.816128"]
-	]
-}, {
-	"id": "431e7704.816128",
-	"type": "set",
-	"name": "set tmp.restapiUser",
-	"xml": "<set>\n<parameter name='tmp.restapiUser' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.restapiUser-found' value='true' />",
-	"comments": "",
-	"x": 1575.2606201171875,
-	"y": 1242.0106658935547,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "d87dc5c6.9f2d38",
-	"type": "switchNode",
-	"name": "switch network-parameter-name == 'restapiPassword'",
-	"xml": "<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiPassword'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1116.2605438232422,
-	"y": 1296.010513305664,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["32c617c3.6666a8"]
-	]
-}, {
-	"id": "32c617c3.6666a8",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1393.260555267334,
-	"y": 1294.0105457305908,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["7965a848.b113a8"]
-	]
-}, {
-	"id": "7965a848.b113a8",
-	"type": "set",
-	"name": "set tmp.restapiPassword",
-	"xml": "<set>\n<parameter name='tmp.restapiPassword' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.restapiPassword-found' value='true' />",
-	"comments": "",
-	"x": 1594.260585784912,
-	"y": 1292.0105466842651,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "8c362f3b.3ca69",
-	"type": "switchNode",
-	"name": "switch network-parameter-name == 'templateFileName'",
-	"xml": "<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'templateFileName'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1125.2605743408203,
-	"y": 1351.0105781555176,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["c074d65e.325f18"]
-	]
-}, {
-	"id": "c074d65e.325f18",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1413.2607078552246,
-	"y": 1354.0106735229492,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["c839c2e5.daaf"]
-	]
-}, {
-	"id": "c839c2e5.daaf",
-	"type": "set",
-	"name": "set tmp.templateFileName",
-	"xml": "<set>\n<parameter name='tmp.templateFileName' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.templateFileName-found' value='true' />",
-	"comments": "",
-	"x": 1614.2607383728027,
-	"y": 1352.0106744766235,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "2becb5c8.f5838a",
-	"type": "set",
-	"name": "set paras flags",
-	"xml": "<set>\n<parameter name='tmp.restapiUrl-found' value='false' />\n<parameter name='tmp.restapiUser-found' value='false' />\n<parameter name='tmp.restapiPassword-found' value='false' />\n<parameter name='tmp.templateFileName-found' value='false' />\n<parameter name='tmp.thirdPartyAdaptorRpc-found' value='false' />",
-	"comments": "",
-	"x": 778.0105895996094,
-	"y": 1036.0105476379395,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "fec72c37.99e8b",
-	"type": "switchNode",
-	"name": "switch thirdPartyAdaptorRpc-found == 'true'",
-	"xml": "<switch test=\"`$tmp.thirdPartyAdaptorRpc-found == 'true'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 820.0104217529297,
-	"y": 1531.0105934143066,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["761c7f6a.1e156", "fc5cb76b.242648"]
-	]
-}, {
-	"id": "a608965c.57ec78",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 762.0104217529297,
-	"y": 1302.0104637145996,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["21b22ac0.8b6036", "482305da.d57c9c", "d87dc5c6.9f2d38", "8c362f3b.3ca69", "2c7884dd.9d5eac"]
-	]
-}, {
-	"id": "761c7f6a.1e156",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1082.010440826416,
-	"y": 1493.0105304718018,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["abb14bbc.08d3c8"]
-	]
-}, {
-	"id": "fc5cb76b.242648",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1083.0103912353516,
-	"y": 1559.010495185852,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["7e672194.b5093"]
-	]
-}, {
-	"id": "abb14bbc.08d3c8",
-	"type": "call",
-	"name": "call thirdPartyAdaptorRpc",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='`$tmp.thirdPartyAdaptorRpc`' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1302.010482788086,
-	"y": 1494.0105895996094,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["97bbf68a.23df28", "54cba094.60db8", "40b8aaf.3584554"]
-	]
-}, {
-	"id": "7e672194.b5093",
-	"type": "switchNode",
-	"name": "switch restapiUrl-found == 'true'",
-	"xml": "<switch test=\"`$tmp.restapiUrl-found == 'true'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 844.461311340332,
-	"y": 1643.0172395706177,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["8b58f6f.b1e3208", "94431bfa.4e9a48"]
-	]
-}, {
-	"id": "8b58f6f.b1e3208",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1095.461296081543,
-	"y": 1641.017035484314,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["fed700d7.65be7"]
-	]
-}, {
-	"id": "fed700d7.65be7",
-	"type": "switchNode",
-	"name": "switch restapiUser-found == 'true'",
-	"xml": "<switch test=\"`$tmp.restapiUser-found == 'true'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 822.4614105224609,
-	"y": 1710.2393379211426,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["9051a6d0.545648", "52bc5ad7.e75954"]
-	]
-}, {
-	"id": "9051a6d0.545648",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1089.4613037109375,
-	"y": 1711.2390508651733,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["558122b6.d2e6dc"]
-	]
-}, {
-	"id": "558122b6.d2e6dc",
-	"type": "switchNode",
-	"name": "switch restapiPassword-found == 'true'",
-	"xml": "<switch test=\"`$tmp.restapiPassword-found == 'true'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 837.4613037109375,
-	"y": 1780.239260673523,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["107aae8d.403771", "3e643f4d.27a45"]
-	]
-}, {
-	"id": "107aae8d.403771",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1097.4613037109375,
-	"y": 1780.2390508651733,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["3e959559.67274a"]
-	]
-}, {
-	"id": "2c7884dd.9d5eac",
-	"type": "switchNode",
-	"name": "switch network-parameter-name == 'thirdPartyAdaptorRpc'",
-	"xml": "<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'thirdPartyAdaptorRpc'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1125.0168762207031,
-	"y": 1405.0168838500977,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["14544bfa.4af374"]
-	]
-}, {
-	"id": "14544bfa.4af374",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1413.0170097351074,
-	"y": 1408.0169792175293,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["2d59e0f.1af282"]
-	]
-}, {
-	"id": "2d59e0f.1af282",
-	"type": "set",
-	"name": "set tmp.thirdPartyAdaptorRpc",
-	"xml": "<set>\n<parameter name='tmp.thirdPartyAdaptorRpc' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.thirdPartyAdaptorRpc-found' value='true' />",
-	"comments": "",
-	"x": 1614.0170402526855,
-	"y": 1406.0169801712036,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "3e959559.67274a",
-	"type": "switchNode",
-	"name": "switch templateFileName-found == 'true'",
-	"xml": "<switch test=\"`$tmp.templateFileName-found == 'true'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 835.0168762207031,
-	"y": 1840.3502979278564,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["5a8246c3.86d3d8", "e9a7f173.e33ea"]
-	]
-}, {
-	"id": "5a8246c3.86d3d8",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1095.0168762207031,
-	"y": 1840.3500881195068,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["5e9a3d4b.faee04"]
-	]
-}, {
-	"id": "40b8aaf.3584554",
-	"type": "not-found",
-	"name": "not-found",
-	"xml": "<outcome value='not-found'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1568.0168762207031,
-	"y": 1533.3502578735352,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["10f2c69f.8e3de9"]
-	]
-}, {
-	"id": "54cba094.60db8",
-	"type": "failure",
-	"name": "failure",
-	"xml": "<outcome value='failure'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1559.0169258117676,
-	"y": 1501.8502836227417,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["10f2c69f.8e3de9"]
-	]
-}, {
-	"id": "97bbf68a.23df28",
-	"type": "success",
-	"name": "success",
-	"xml": "<outcome value='success'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1562.7669639587402,
-	"y": 1472.207388497889,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["9b5e3e39.e0053"]
-	]
-}, {
-	"id": "10f2c69f.8e3de9",
-	"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 calling ' + $tmp.thirdPartyAdaptorRpc`\" />\n",
-	"comments": "",
-	"x": 1725.766990661621,
-	"y": 1518.6003561019897,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "9b5e3e39.e0053",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 1704.4229316711426,
-	"y": 1468.3995576873422,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "456722ac.35f45c",
-	"type": "not-found",
-	"name": "not-found",
-	"xml": "<outcome value='not-found'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1209.0168762207031,
-	"y": 1958.3502578735352,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["504edb98.e54e24"]
-	]
-}, {
-	"id": "35b532e4.67c04e",
-	"type": "failure",
-	"name": "failure",
-	"xml": "<outcome value='failure'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1200.0169258117676,
-	"y": 1926.8502836227417,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["504edb98.e54e24"]
-	]
-}, {
-	"id": "6cfa08fc.d58438",
-	"type": "success",
-	"name": "success",
-	"xml": "<outcome value='success'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1203.7669639587402,
-	"y": 1897.207388497889,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["e5f43bf1.ad3d38"]
-	]
-}, {
-	"id": "504edb98.e54e24",
-	"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 calling ' + $tmp.restapiUrl`\" />\n",
-	"comments": "",
-	"x": 1366.766990661621,
-	"y": 1943.6003561019897,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "e5f43bf1.ad3d38",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 1345.4229316711426,
-	"y": 1893.3995576873422,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "94431bfa.4e9a48",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1246.6835021972656,
-	"y": 1608.4613418579102,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["79546287.78b3ac"]
-	]
-}, {
-	"id": "79546287.78b3ac",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: 3rd party controller restapiUrl not found\" />\n    \n",
-	"comments": "",
-	"x": 1417.6835021972656,
-	"y": 1616.461311340332,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "52bc5ad7.e75954",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1251.6835021972656,
-	"y": 1687.4613418579102,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["e7175614.0bbb18"]
-	]
-}, {
-	"id": "e7175614.0bbb18",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: 3rd party controller restapiUser not found\" />\n    \n",
-	"comments": "",
-	"x": 1422.6835021972656,
-	"y": 1695.461311340332,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "3e643f4d.27a45",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1242.6835021972656,
-	"y": 1758.4613418579102,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["eab97fcc.763a6"]
-	]
-}, {
-	"id": "eab97fcc.763a6",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: 3rd party controller restapiPassword not found\" />\n    \n",
-	"comments": "",
-	"x": 1413.6835021972656,
-	"y": 1766.461311340332,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}, {
-	"id": "e9a7f173.e33ea",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1241.6835021972656,
-	"y": 1819.4613418579102,
-	"z": "e09ddcb4.62be2",
-	"wires": [
-		["4679556f.41babc"]
-	]
-}, {
-	"id": "4679556f.41babc",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: 3rd party controller templateFileName not found\" />\n    \n",
-	"comments": "",
-	"x": 1412.6835021972656,
-	"y": 1827.461311340332,
-	"z": "e09ddcb4.62be2",
-	"wires": []
-}]
\ No newline at end of file
+[{"id":"68f16aa4.9d5074","type":"dgstart","name":"DGSTART","outputs":1,"x":140.03125,"y":67.03125,"z":"91bedfe2.922fa","wires":[["4639d122.77e11"]]},{"id":"4639d122.77e11","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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":352.03125381469727,"y":139.0312671661377,"z":"91bedfe2.922fa","wires":[["9a8bcdac.3c216"]]},{"id":"9a8bcdac.3c216","type":"method","name":"wan-connection-topology-operation-activate","xml":"<method rpc='wan-connection-topology-operation-activate' mode='sync'>\n","comments":"","outputs":1,"x":340.0313720703125,"y":227.03125,"z":"91bedfe2.922fa","wires":[["833942ba.a31a1"]]},{"id":"832d0467.9d95b8","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":590.0318603515625,"y":415.0314540863037,"z":"91bedfe2.922fa","wires":[[]]},{"id":"64833d18.cd9154","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":893.0314712524414,"y":2147.031669616699,"z":"91bedfe2.922fa","wires":[]},{"id":"8af29529.f64618","type":"block","name":"general-activate-block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":734.5315265655518,"y":1862.0314840078354,"z":"91bedfe2.922fa","wires":[["64833d18.cd9154","1391d0e8.4f0b7f","932da35.011766","e9532d4d.6adac"]]},{"id":"932da35.011766","type":"for","name":"for cxid..network-topology-operation-input.network-request-input.network-input-parameters.param[]","xml":"<for index='cxid' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n","comments":"","outputs":1,"x":1548.031328201294,"y":1979.0315145254135,"z":"91bedfe2.922fa","wires":[["b3dd1c0f.44ef8"]]},{"id":"e9532d4d.6adac","type":"execute","name":"execute RestApiCallNode Create wan-connection","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$tmp.templateFileName`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + $tmp.restapiUrl`\" />\n<parameter name=\"restapiUser\" value=\"admin\" />\n<parameter name=\"restapiPassword\" value=\"admin\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restApi-result\"/>","comments":"","outputs":1,"x":1574.2813835144043,"y":2533.0317014455795,"z":"91bedfe2.922fa","wires":[["87ad771a.5f2f98","3a62b4a9.f47f1c","21dbe6e7.09038a"]]},{"id":"d0a8a99e.fd9dd8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1873.281753540039,"y":2083.0318565368652,"z":"91bedfe2.922fa","wires":[["5f9a6ac6.788694"]]},{"id":"5f9a6ac6.788694","type":"set","name":"set tmp.templateFileName","xml":"<set>\n<parameter name='tmp.templateFileName' value=\"`$prop.restapi.templateDir + '/' + $network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value`\" />\n<parameter name='tmp.templateFileName-found' value='true' />","comments":"","x":2230.2817611694336,"y":2086.031723380089,"z":"91bedfe2.922fa","wires":[]},{"id":"1391d0e8.4f0b7f","type":"set","name":"set paras flags","xml":"<set>\n<parameter name='tmp.restapiUrl-found' value='false' />\n<parameter name='tmp.restapiUser-found' value='false' />\n<parameter name='tmp.restapiPassword-found' value='false' />\n<parameter name='tmp.templateFileName-found' value='false' />\n<parameter name='tmp.thirdPartyAdaptorRpc-found' value='false' />","comments":"","x":1335.0314960479736,"y":1894.0315116643906,"z":"91bedfe2.922fa","wires":[]},{"id":"21dbe6e7.09038a","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1904.0378074645996,"y":2568.370793700218,"z":"91bedfe2.922fa","wires":[["79f8115c.63b98"]]},{"id":"3a62b4a9.f47f1c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1895.037857055664,"y":2536.8708194494247,"z":"91bedfe2.922fa","wires":[["79f8115c.63b98"]]},{"id":"87ad771a.5f2f98","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1898.7878952026367,"y":2507.227924324572,"z":"91bedfe2.922fa","wires":[["b4d5e437.520198"]]},{"id":"79f8115c.63b98","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 calling ' + $tmp.restapiUrl`\" />\n","comments":"","x":2061.7879219055176,"y":2553.620891928673,"z":"91bedfe2.922fa","wires":[]},{"id":"833942ba.a31a1","type":"execute","name":"contains specification","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"specification\"/>\n","comments":"","outputs":1,"x":237.03120040893555,"y":349.03507936000824,"z":"91bedfe2.922fa","wires":[["90439097.f91db","ba76ea27.97e208"]]},{"id":"90439097.f91db","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":473.03123474121094,"y":347.03507125377655,"z":"91bedfe2.922fa","wires":[["c5652ec0.4e003"]]},{"id":"ba76ea27.97e208","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":176.03128814697266,"y":572.035244345665,"z":"91bedfe2.922fa","wires":[["b48ade0e.5d05c"]]},{"id":"95a7702b.ecd8f","type":"execute","name":"contains Fc","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"Fc\"/>\n","comments":"","outputs":1,"x":507.03129959106445,"y":656.0351728200912,"z":"91bedfe2.922fa","wires":[["ca7dd575.4d5028","cfcf83f9.ff634"]]},{"id":"cfcf83f9.ff634","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":152.03127670288086,"y":1004.0352452993393,"z":"91bedfe2.922fa","wires":[["54e73abd.a5fa04"]]},{"id":"54e73abd.a5fa04","type":"execute","name":"contains Fd","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"Fd\"/>\n","comments":"","outputs":1,"x":361.03126525878906,"y":1000.0352238416672,"z":"91bedfe2.922fa","wires":[["6dde8a2b.ab5074","a5bc5232.0cec4"]]},{"id":"a5bc5232.0cec4","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":143.99998092651367,"y":1076.0038818120956,"z":"91bedfe2.922fa","wires":[["b2f72333.5df75"]]},{"id":"b2f72333.5df75","type":"execute","name":"contains FcPort","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"FcPort\"/>\n","comments":"","outputs":1,"x":352.99997329711914,"y":1073.0039104223251,"z":"91bedfe2.922fa","wires":[["11a0c8e2.8d25b7","4866cd3f.747984"]]},{"id":"ca7dd575.4d5028","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":689.0313034057617,"y":657.0351561307907,"z":"91bedfe2.922fa","wires":[["f147fb85.dd0498"]]},{"id":"6dde8a2b.ab5074","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":933.0314331054688,"y":1002.035410284996,"z":"91bedfe2.922fa","wires":[["8af29529.f64618"]]},{"id":"11a0c8e2.8d25b7","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":548.000057220459,"y":1075.003942847252,"z":"91bedfe2.922fa","wires":[["7a00ee87.c5ea2"]]},{"id":"4866cd3f.747984","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":105.03140258789062,"y":1317.0355266332626,"z":"91bedfe2.922fa","wires":[["6ee8ce66.1e179"]]},{"id":"6ee8ce66.1e179","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":393.0001029968262,"y":1316.0042842626572,"z":"91bedfe2.922fa","wires":[["803654bf.2906d8"]]},{"id":"c5652ec0.4e003","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":737.0585975646973,"y":343.06244599819183,"z":"91bedfe2.922fa","wires":[]},{"id":"803654bf.2906d8","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":600.0587425231934,"y":1313.0627368688583,"z":"91bedfe2.922fa","wires":[]},{"id":"7a00ee87.c5ea2","type":"execute","name":"contains sitewan","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"sitewan\"/>\n","comments":"","outputs":1,"x":741.0275611877441,"y":1076.031530737877,"z":"91bedfe2.922fa","wires":[["1f5b2dbc.d6ca22","2f394e71.6f28b2"]]},{"id":"1f5b2dbc.d6ca22","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":936.027645111084,"y":1078.0315631628036,"z":"91bedfe2.922fa","wires":[["8af29529.f64618"]]},{"id":"2f394e71.6f28b2","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":489.02745056152344,"y":1230.0313781499863,"z":"91bedfe2.922fa","wires":[["6ee8ce66.1e179"]]},{"id":"11b68612.8f7a2a","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1399.781379699707,"y":843.0351314544678,"z":"91bedfe2.922fa","wires":[["e4c208d0.277478"]]},{"id":"917adf72.a6f24","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":928.7814674377441,"y":945.0351947546005,"z":"91bedfe2.922fa","wires":[["8af29529.f64618"]]},{"id":"2cdd0373.9297cc","type":"for","name":"for sIdx..service-data.networks.network[]","xml":"<for index='sIdx' start='0' end='`$service-data.networks.network_length`' >\n","comments":"","outputs":1,"x":2100.0594024658203,"y":604.062762260437,"z":"91bedfe2.922fa","wires":[["a940454d.edb898"]]},{"id":"7f401448.11848c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2509.0594062805176,"y":644.0628918409348,"z":"91bedfe2.922fa","wires":[["77ad6f46.af5dd"]]},{"id":"4d593807.3e4028","type":"set","name":"set tmp.pidx and tmp.network-input-parameters","xml":"<set>\n<parameter name='tmp.sotnFcPortList[`$sotnFcPortListLength`]' value='`$sIdx`' />","comments":"","x":2958.6787452697754,"y":443.49226903915405,"z":"91bedfe2.922fa","wires":[]},{"id":"a940454d.edb898","type":"execute","name":"contains sotn","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$service-data.networks.network[$sIdx].network-data.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"sotn\"/>\n","comments":"","outputs":1,"x":2346.0593223571777,"y":645.0627735853195,"z":"91bedfe2.922fa","wires":[["7f401448.11848c"]]},{"id":"77ad6f46.af5dd","type":"execute","name":"contains FcPort","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$service-data.networks.network[$sIdx].network-data.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"FcPort\"/>\n","comments":"","outputs":1,"x":2350.059284210205,"y":699.0629585981369,"z":"91bedfe2.922fa","wires":[["8618cc46.29dce"]]},{"id":"b48ade0e.5d05c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":339.0586624145508,"y":574.0624669790268,"z":"91bedfe2.922fa","wires":[["95a7702b.ecd8f","832d0467.9d95b8"]]},{"id":"8618cc46.29dce","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2518.0592079162598,"y":696.0627983808517,"z":"91bedfe2.922fa","wires":[["462f77d5.773928"]]},{"id":"c80e57ec.42e838","type":"block","name":"find-sotn-fc-port-block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1733.059181213379,"y":654.0627698898315,"z":"91bedfe2.922fa","wires":[["2cdd0373.9297cc","28cbc14f.a6b6de"]]},{"id":"28cbc14f.a6b6de","type":"set","name":"set sotnFcPortListLength","xml":"<set>\n<parameter name='sotnFcPortListLength' value='0' />","comments":"","x":2016.058853149414,"y":511.0627384185791,"z":"91bedfe2.922fa","wires":[]},{"id":"462f77d5.773928","type":"block","name":"find-OOF-input-block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":2396.5591468811035,"y":750.0626882314682,"z":"91bedfe2.922fa","wires":[["4d593807.3e4028","b26a4eb9.bc9d4"]]},{"id":"b26a4eb9.bc9d4","type":"for","name":"for sIdx..network-input-parameters[]","xml":"<for index='paramIdx' start='0' end='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param_length`' >\n","comments":"","outputs":1,"x":2934.0589332580566,"y":495.06282663345337,"z":"91bedfe2.922fa","wires":[["d104b219.810a2"]]},{"id":"d104b219.810a2","type":"execute","name":"contains address","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param[$paramIdx].name`\"/>\n    <parameter name=\"target\" value=\"address\"/>\n","comments":"","outputs":1,"x":2902.5588417053223,"y":548.0626587867737,"z":"91bedfe2.922fa","wires":[["3e492c3f.161894"]]},{"id":"3e492c3f.161894","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":3084.5589637756348,"y":548.0626587867737,"z":"91bedfe2.922fa","wires":[["b5771a74.040068"]]},{"id":"b7005c52.6156d","type":"set","name":"set sotnFcPortAddress","xml":"<set>\n<parameter name='sotnFcPortAddress' value='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param[$paramIdx].value`' />","comments":"","x":3142.5604248046875,"y":661.0630855560303,"z":"91bedfe2.922fa","wires":[]},{"id":"b5771a74.040068","type":"block","name":"get-OOF-input-block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":2951.558994293213,"y":606.0628304481506,"z":"91bedfe2.922fa","wires":[["b7005c52.6156d","ac44c155.870b8"]]},{"id":"b7fb6767.077bc8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":3167.0600395202637,"y":783.0626034736633,"z":"91bedfe2.922fa","wires":[["615d66d5.9b4088"]]},{"id":"ac44c155.870b8","type":"execute","name":"execute RestApiCallNode - get access Tp from OSS","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value=\"`$prop.oss.url + '/oss/inventory?location=' + $sotnFcPortAddress`\"/>\n    <parameter name='format' value='json' />\n    <parameter name='customHttpHeaders' value=\"X-FromAppId=MSO\" />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"temp.oss.accessTPs\" />\n\n","comments":"","outputs":1,"x":3264.0589637756348,"y":720.0625367164612,"z":"91bedfe2.922fa","wires":[["b7fb6767.077bc8"]]},{"id":"615d66d5.9b4088","type":"switchNode","name":"switch temp.oss.accessTPs_length","xml":"<switch test=\"`$temp.oss.accessTPs_length`\">\n","comments":"","outputs":1,"x":3463.0591468811035,"y":782.0625138282776,"z":"91bedfe2.922fa","wires":[["ce9513a6.fa2a1"]]},{"id":"ce9513a6.fa2a1","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":3727.560417175293,"y":781.0627908706665,"z":"91bedfe2.922fa","wires":[["69583000.eedc8"]]},{"id":"5cf3d0.c1599c3","type":"set","name":"set temp.accessTPs_length","xml":"<set>\n<parameter name='temp.accessTPs_length' value='`$temp.accessTPs_length + $temp.oss.accessTPs_length`' />\n\n","comments":"","x":3673.060043334961,"y":1047.058952331543,"z":"91bedfe2.922fa","wires":[]},{"id":"69583000.eedc8","type":"block","name":"copy-accessTPs-block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":3327.8084106445312,"y":870.0582141876221,"z":"91bedfe2.922fa","wires":[["5cf3d0.c1599c3","f5ea2f62.8d115","bd31dd70.98957"]]},{"id":"f5ea2f62.8d115","type":"switchNode","name":"switch temp.accessTPs_length","xml":"<switch test='`$temp.accessTPs_length`'>\n","comments":"","outputs":1,"x":3711.558364868164,"y":872.058051109314,"z":"91bedfe2.922fa","wires":[["35877cdd.9af834","1e60e227.14a41e"]]},{"id":"35877cdd.9af834","type":"other","name":"Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":3937.5582160949707,"y":847.0579786300659,"z":"91bedfe2.922fa","wires":[["79e85a70.daad34"]]},{"id":"79e85a70.daad34","type":"set","name":"set tp_length","xml":"<set>\n<parameter name='tp_length' value='0' />","comments":"","x":4124.058052062988,"y":845.0579843814485,"z":"91bedfe2.922fa","wires":[]},{"id":"1e60e227.14a41e","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":3933.5581817626953,"y":902.0580244064331,"z":"91bedfe2.922fa","wires":[["9e2dd7ed.c17c38"]]},{"id":"9e2dd7ed.c17c38","type":"set","name":"set tp_length","xml":"<set>\n<parameter name='tp_length' value='`$temp.accessTPs_length`' />","comments":"","x":4122.308120727539,"y":902.058009147644,"z":"91bedfe2.922fa","wires":[]},{"id":"bd31dd70.98957","type":"for","name":"for each existing temp.oss.accessTPs","xml":"<for index='idx' start='0' end='`$temp.oss.accessTPs_length`' >\n","comments":"","outputs":1,"x":3713.308807373047,"y":970.0581560134888,"z":"91bedfe2.922fa","wires":[["66a013e.97656ec"]]},{"id":"66a013e.97656ec","type":"set","name":"set temp.accessTPs","xml":"<set>\n<parameter name='`temp.accessTPs[$idx + $tp_length].`' value='`$temp.oss.accessTPs[$idx].`' />","comments":"","x":4081.3087005615234,"y":971.0583038330078,"z":"91bedfe2.922fa","wires":[]},{"id":"e4c208d0.277478","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1547.0587539672852,"y":838.0624504089355,"z":"91bedfe2.922fa","wires":[["c80e57ec.42e838","fc9fbee7.497f7"]]},{"id":"ba1677d3.f8c8c8","type":"execute","name":"execute RestApiCallNode getPath from OOF","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"oof\"/>\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":1551.5591850280762,"y":1552.0627818107605,"z":"91bedfe2.922fa","wires":[["5d426596.ead63c","e8e2281e.c12888"]]},{"id":"e8e2281e.c12888","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1880.558837890625,"y":1532.062849521637,"z":"91bedfe2.922fa","wires":[[]]},{"id":"5d426596.ead63c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1881.5590515136719,"y":1583.062758922577,"z":"91bedfe2.922fa","wires":[["48f3c354.04cd4c"]]},{"id":"fc9fbee7.497f7","type":"switchNode","name":"switch temp.accessTPs_length","xml":"<switch test=\"`$temp.accessTPs_length >= 2`\">\n\n","comments":"","outputs":1,"x":1613.558650970459,"y":1047.0625962018967,"z":"91bedfe2.922fa","wires":[["d130df9e.8c303"]]},{"id":"d130df9e.8c303","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1845.0589485168457,"y":1046.0624426603317,"z":"91bedfe2.922fa","wires":[["b71c53f5.3fe3b"]]},{"id":"b71c53f5.3fe3b","type":"block","name":"call-oof-block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1589.0585975646973,"y":1183.0625027418137,"z":"91bedfe2.922fa","wires":[["ba1677d3.f8c8c8","a976d196.bd745","733d49b7.633db8"]]},{"id":"a976d196.bd745","type":"set","name":"set oof input","xml":"<set>\n<parameter name='prop.connection-attachment.access-topology-id' value='`$temp.accessTPs[0].access-topology-id`' />\n<parameter name='prop.connection-attachment.access-client-id' value='`$temp.accessTPs[0].access-client-id`' />\n<parameter name='prop.connection-attachment.access-provider-id' value='`$temp.accessTPs[0].access-provider-id`' />\n<parameter name='prop.connection-attachment.access-node-id' value='`$temp.accessTPs[0].access-node-id`' />\n<parameter name='prop.connection-attachment.access-ltp-id' value='`$temp.accessTPs[0].access-ltp-id`' />\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$temp.accessTPs[1].access-topology-id`' />\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$temp.accessTPs[1].access-client-id`' />\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$temp.accessTPs[1].access-provider-id`' />\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$temp.accessTPs[1].access-node-id`' />\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$temp.accessTPs[1].access-ltp-id`' />","comments":"","x":2105.5587158203125,"y":1053.0625,"z":"91bedfe2.922fa","wires":[]},{"id":"ac70c995.1af6f8","type":"execute","name":"execute RestApiCallNode Create Sotn connectivity Service","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-api-ConnectivityService.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-ConnectivityService:create-connectivity-service'`\" />\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=\"patch\"/>\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":2604.694091796875,"y":1909.0313720703125,"z":"91bedfe2.922fa","wires":[["fe14c007.4766","1f23efb1.acfa8"]]},{"id":"fe14c007.4766","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2942.6939086914062,"y":1939.0314555168152,"z":"91bedfe2.922fa","wires":[["77fdadb2.363454"]]},{"id":"77fdadb2.363454","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":3090.6939086914062,"y":1937.0313334465027,"z":"91bedfe2.922fa","wires":[[]]},{"id":"b2a8d96c.96a628","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 Create vpn rest api\" />\n","comments":"","x":3072.6939392089844,"y":1884.0313935279846,"z":"91bedfe2.922fa","wires":[]},{"id":"1f23efb1.acfa8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2933.69384765625,"y":1884.0313935279846,"z":"91bedfe2.922fa","wires":[["b2a8d96c.96a628"]]},{"id":"48f3c354.04cd4c","type":"for","name":"for vidx..oof.vpns_length[]","xml":"<for index='vidx' start='0' end='`$oof.vpns_length`' >","comments":"","outputs":1,"x":2182.697708129883,"y":1597.5348572731018,"z":"91bedfe2.922fa","wires":[["8da1b53d.3f8698"]]},{"id":"8da1b53d.3f8698","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2295.815071105957,"y":1697.3748722076416,"z":"91bedfe2.922fa","wires":[["e2bd4237.c1ef5","198632cb.6fa54d","ac70c995.1af6f8","b45c504.549f6b"]]},{"id":"61c2a7e.f334258","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":2937.259735107422,"y":1761.7080645561218,"z":"91bedfe2.922fa","wires":[]},{"id":"198632cb.6fa54d","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":2553.7596435546875,"y":1798.7080039978027,"z":"91bedfe2.922fa","wires":[["ceb42ab8.7673f8","244c6ee4.3a22c2","45382c1f.420c94"]]},{"id":"ceb42ab8.7673f8","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2773.759578704834,"y":1762.7079730033875,"z":"91bedfe2.922fa","wires":[["61c2a7e.f334258"]]},{"id":"244c6ee4.3a22c2","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2783.250518798828,"y":1803.281979084015,"z":"91bedfe2.922fa","wires":[["e4d2a17a.6f57f"]]},{"id":"45382c1f.420c94","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2778.58349609375,"y":1839.6152920722961,"z":"91bedfe2.922fa","wires":[["aa5d9fdb.59fb9"]]},{"id":"e4d2a17a.6f57f","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":2929.8218688964844,"y":1799.5678057670593,"z":"91bedfe2.922fa","wires":[]},{"id":"aa5d9fdb.59fb9","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":2933.3561401367188,"y":1841.054440021515,"z":"91bedfe2.922fa","wires":[]},{"id":"e2bd4237.c1ef5","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 = $oof.vpn.access-node-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n\n","comments":"","outputs":1,"x":2499.259536743164,"y":1707.7076478004456,"z":"91bedfe2.922fa","wires":[["4e443c20.39c954","ba91a4a5.6c48e8","54e123e0.23566c"]]},{"id":"4e443c20.39c954","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2681.2595825195312,"y":1652.707757949829,"z":"91bedfe2.922fa","wires":[["24c24cf3.6a2d84"]]},{"id":"ba91a4a5.6c48e8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2681.7504844665527,"y":1690.2818546295166,"z":"91bedfe2.922fa","wires":[["e191088c.e1d868"]]},{"id":"54e123e0.23566c","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2673.08349609375,"y":1723.6152296066284,"z":"91bedfe2.922fa","wires":[["93475c12.229ca"]]},{"id":"e191088c.e1d868","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n","comments":"","x":2829.322109222412,"y":1689.5677433013916,"z":"91bedfe2.922fa","wires":[]},{"id":"93475c12.229ca","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n","comments":"","x":2826.8561401367188,"y":1723.0543775558472,"z":"91bedfe2.922fa","wires":[]},{"id":"24c24cf3.6a2d84","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":2866.2595825195312,"y":1651.7078800201416,"z":"91bedfe2.922fa","wires":[]},{"id":"b45c504.549f6b","type":"set","name":"set oof.vpn","xml":"<set>\n<parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />","comments":"","x":2491.2595291137695,"y":1596.8187198638916,"z":"91bedfe2.922fa","wires":[]},{"id":"79f3f49d.7b094c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1883.5586395263672,"y":2044.062343597412,"z":"91bedfe2.922fa","wires":[["ce0e254a.b42ad8"]]},{"id":"ce0e254a.b42ad8","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 = `$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value` AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n","comments":"","outputs":1,"x":2258.559513092041,"y":2038.0622037649155,"z":"91bedfe2.922fa","wires":[["a73413da.0d3fe","432dc6e9.a236a8","94bb6e2e.10811"]]},{"id":"a73413da.0d3fe","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2520.5593185424805,"y":1982.0620158910751,"z":"91bedfe2.922fa","wires":[["9608e38e.4f87c"]]},{"id":"9608e38e.4f87c","type":"set","name":"set controller data","xml":"<set>\n<parameter name='prop.thirdpartySdnc-found' value='true' />\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":2718.0593795776367,"y":1970.0620158910751,"z":"91bedfe2.922fa","wires":[]},{"id":"432dc6e9.a236a8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2552.0501823425293,"y":2030.6361192464828,"z":"91bedfe2.922fa","wires":[["c9e0c907.d8a728"]]},{"id":"94bb6e2e.10811","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2547.3831901550293,"y":2071.969432234764,"z":"91bedfe2.922fa","wires":[["c9e0c907.d8a728"]]},{"id":"c9e0c907.d8a728","type":"set","name":"set controller data","xml":"<set>\n<parameter name='prop.thirdpartySdnc-found' value='false' />\n","comments":"","x":2759.0585975646973,"y":2049.062201857567,"z":"91bedfe2.922fa","wires":[]},{"id":"9f6948c5.2a58d8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1888.5587310791016,"y":2129.062282562256,"z":"91bedfe2.922fa","wires":[["e5fab659.ef7a38"]]},{"id":"e5fab659.ef7a38","type":"set","name":"set tmp.restapiUrl-found","xml":"<set>\n<parameter name='tmp.restapiUrl' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value`' />\n<parameter name='tmp.restapiUrl-found' value='true' />","comments":"","x":2221.558645248413,"y":2133.0622762441635,"z":"91bedfe2.922fa","wires":[]},{"id":"84c2d17f.5b55","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2350.03125,"y":1177.03125,"z":"91bedfe2.922fa","wires":[["bbf97bc1.3d8288","b18e8b0.ea73c78","22727b16.4cf754","16e2b81c.57f1a8","3f2a6e7b.1b7b12","c5be7792.660d98","c4ec6159.c161a","87b2050d.891c48","ea67c8f7.362028","732f1f87.5620a"]]},{"id":"bbf97bc1.3d8288","type":"switchNode","name":"switch name","xml":"<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'name'`\">","comments":"","outputs":1,"x":2572.0311965942383,"y":975.0313305854797,"z":"91bedfe2.922fa","wires":[["6b9dc48e.4e73fc"]]},{"id":"6b9dc48e.4e73fc","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2759.0311965942383,"y":971.0313305854797,"z":"91bedfe2.922fa","wires":[["f0790d7f.5f87b"]]},{"id":"f0790d7f.5f87b","type":"set","name":"set name","xml":"<set>\n<parameter name='template.name' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n","comments":"","x":2927.0311965942383,"y":971.6313366889954,"z":"91bedfe2.922fa","wires":[]},{"id":"b18e8b0.ea73c78","type":"switchNode","name":"switch service-type","xml":"<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'service-type'`\">","comments":"","outputs":1,"x":2589.541389465332,"y":1036.0312705039978,"z":"91bedfe2.922fa","wires":[["48fae459.c01e7c"]]},{"id":"48fae459.c01e7c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2776.541389465332,"y":1032.0312705039978,"z":"91bedfe2.922fa","wires":[["265025ce.cf736a"]]},{"id":"265025ce.cf736a","type":"set","name":"set service-type","xml":"<set>\n<parameter name='template.service-type' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n","comments":"","x":2944.541389465332,"y":1032.6312766075134,"z":"91bedfe2.922fa","wires":[]},{"id":"22727b16.4cf754","type":"switchNode","name":"switch total-size","xml":"<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'total-size'`\">","comments":"","outputs":1,"x":2583.0039672851562,"y":1092.504071712494,"z":"91bedfe2.922fa","wires":[["cea79a2a.5f4858"]]},{"id":"cea79a2a.5f4858","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2770.0039672851562,"y":1088.504071712494,"z":"91bedfe2.922fa","wires":[["568f3e66.80ef2"]]},{"id":"568f3e66.80ef2","type":"set","name":"set total-size","xml":"<set>\n<parameter name='template.total-size' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n","comments":"","x":2938.0039672851562,"y":1089.1040778160095,"z":"91bedfe2.922fa","wires":[]},{"id":"16e2b81c.57f1a8","type":"switchNode","name":"switch pir","xml":"<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'pir'`\">","comments":"","outputs":1,"x":2561.004066467285,"y":1141.5041108131409,"z":"91bedfe2.922fa","wires":[["f0f66054.90f89"]]},{"id":"f0f66054.90f89","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2748.004066467285,"y":1137.5041108131409,"z":"91bedfe2.922fa","wires":[["959c927f.bbb45"]]},{"id":"959c927f.bbb45","type":"set","name":"set pir","xml":"<set>\n<parameter name='template.pir' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n","comments":"","x":2916.004066467285,"y":1138.1041169166565,"z":"91bedfe2.922fa","wires":[]},{"id":"3f2a6e7b.1b7b12","type":"switchNode","name":"switch cbs","xml":"<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'cbs'`\">","comments":"","outputs":1,"x":2562.0041007995605,"y":1192.5040354728699,"z":"91bedfe2.922fa","wires":[["8cfdbe1b.f9af7"]]},{"id":"8cfdbe1b.f9af7","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2749.0041007995605,"y":1188.5040354728699,"z":"91bedfe2.922fa","wires":[["8416ac0a.84ba"]]},{"id":"8416ac0a.84ba","type":"set","name":"set cbs","xml":"<set>\n<parameter name='template.cbs' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n","comments":"","x":2917.0041007995605,"y":1189.1040415763855,"z":"91bedfe2.922fa","wires":[]},{"id":"c5be7792.660d98","type":"switchNode","name":"switch pbs","xml":"<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'pbs'`\">","comments":"","outputs":1,"x":2558.0041007995605,"y":1247.5040354728699,"z":"91bedfe2.922fa","wires":[["77d48b70.398a54"]]},{"id":"77d48b70.398a54","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2745.0041007995605,"y":1243.5040354728699,"z":"91bedfe2.922fa","wires":[["2292252a.4c72ba"]]},{"id":"2292252a.4c72ba","type":"set","name":"set pbs","xml":"<set>\n<parameter name='template.pbs' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n","comments":"","x":2913.0041007995605,"y":1244.1040415763855,"z":"91bedfe2.922fa","wires":[]},{"id":"c4ec6159.c161a","type":"switchNode","name":"switch couplingFlag","xml":"<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'couplingFlag'`\">","comments":"","outputs":1,"x":2588.004249572754,"y":1303.5040373802185,"z":"91bedfe2.922fa","wires":[["7fb12146.f3083"]]},{"id":"7fb12146.f3083","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2775.004249572754,"y":1299.5040373802185,"z":"91bedfe2.922fa","wires":[["8df17862.a1db28"]]},{"id":"8df17862.a1db28","type":"set","name":"set couplingFlag","xml":"<set>\n<parameter name='template.couplingFlag' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n","comments":"","x":2943.004249572754,"y":1300.1040434837341,"z":"91bedfe2.922fa","wires":[]},{"id":"87b2050d.891c48","type":"switchNode","name":"switch colorAware","xml":"<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'colorAware'`\">","comments":"","outputs":1,"x":2582.004249572754,"y":1349.5040373802185,"z":"91bedfe2.922fa","wires":[["b4a5d880.33e8a8"]]},{"id":"b4a5d880.33e8a8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2769.004249572754,"y":1345.5040373802185,"z":"91bedfe2.922fa","wires":[["e6b73f7a.54d"]]},{"id":"e6b73f7a.54d","type":"set","name":"set colorAware","xml":"<set>\n<parameter name='template.colorAware' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n","comments":"","x":2937.004249572754,"y":1346.1040434837341,"z":"91bedfe2.922fa","wires":[]},{"id":"732f1f87.5620a","type":"switchNode","name":"switch diversity-policy","xml":"<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'diversity-policy'`\">","comments":"","outputs":1,"x":2590.0044898986816,"y":1440.504102230072,"z":"91bedfe2.922fa","wires":[["6068e7d3.5d3898"]]},{"id":"6068e7d3.5d3898","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2777.0044898986816,"y":1436.504102230072,"z":"91bedfe2.922fa","wires":[["c26ebc65.6b9e6"]]},{"id":"c26ebc65.6b9e6","type":"set","name":"set diversity-policy","xml":"<set>\n<parameter name='template.diversity-policy' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n","comments":"","x":2945.0044898986816,"y":1437.1041083335876,"z":"91bedfe2.922fa","wires":[]},{"id":"ea67c8f7.362028","type":"switchNode","name":"switch route-objective-function","xml":"<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'route-objective-function'`\">","comments":"","outputs":1,"x":2619.0043983459473,"y":1389.504102230072,"z":"91bedfe2.922fa","wires":[["e437737b.d7214"]]},{"id":"e437737b.d7214","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2806.0043983459473,"y":1385.504102230072,"z":"91bedfe2.922fa","wires":[["74ef3ea6.f3f81"]]},{"id":"74ef3ea6.f3f81","type":"set","name":"set route-objective-function","xml":"<set>\n<parameter name='template.route-objective-function' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n","comments":"","x":2974.0043983459473,"y":1386.1041083335876,"z":"91bedfe2.922fa","wires":[]},{"id":"733d49b7.633db8","type":"for","name":"for paidx..tmp.network-input-parameters.param_length[]","xml":"<for index='paidx' start='0' end='`$tmp.network-input-parameters.param_length`' >","comments":"","outputs":1,"x":2070.1667861938477,"y":1307.500174999237,"z":"91bedfe2.922fa","wires":[["84c2d17f.5b55"]]},{"id":"1dba7638.703c1a","type":"set","name":"set param","xml":"<set>\n<parameter name='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value`' />","comments":"","x":1346.7812843322754,"y":2228.0313358306885,"z":"91bedfe2.922fa","wires":[]},{"id":"f147fb85.dd0498","type":"block","name":"find-sotn-fc-port-block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":927.5313568115234,"y":602.0312833786011,"z":"91bedfe2.922fa","wires":[["fdf3e7e0.be64b8","3fed6fc6.8fcc6","3e95d3f1.93938c"]]},{"id":"fdf3e7e0.be64b8","type":"for","name":"for aidx..network-topology-operation-input.network-request-input.network-input-parameters.param[]","xml":"<for index='aidx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n","comments":"","outputs":1,"x":1003.2813110351562,"y":759.031328201294,"z":"91bedfe2.922fa","wires":[["5f0b9d55.a5e084"]]},{"id":"5f0b9d55.a5e084","type":"execute","name":"contains fcport","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$aidx].name`\"/>\n    <parameter name=\"target\" value=\"fcport\"/>\n","comments":"","outputs":1,"x":862.5312728881836,"y":813.0314826965332,"z":"91bedfe2.922fa","wires":[["e4ff4af2.60dc08"]]},{"id":"e4ff4af2.60dc08","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1038.2812614440918,"y":814.0313148498535,"z":"91bedfe2.922fa","wires":[["7f41f04.a42101"]]},{"id":"7f41f04.a42101","type":"set","name":"set needOof","xml":"<set>\n<parameter name='needOof' value='true' />","comments":"","x":1208.281265258789,"y":811.0313014984131,"z":"91bedfe2.922fa","wires":[]},{"id":"3fed6fc6.8fcc6","type":"set","name":"set needOof","xml":"<set>\n<parameter name='needOof' value='false' />","comments":"","x":737.2813110351562,"y":710.0313472747803,"z":"91bedfe2.922fa","wires":[]},{"id":"3e95d3f1.93938c","type":"switchNode","name":"switch needOof","xml":"<switch test=\"`$needOof`\">\n\n","comments":"","outputs":1,"x":722.2812652587891,"y":866.0313014984131,"z":"91bedfe2.922fa","wires":[["917adf72.a6f24","11b68612.8f7a2a"]]},{"id":"a2539fc0.c8e2","type":"execute","name":"contains thirdPartySdncId","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`\"/>\n    <parameter name=\"target\" value=\"thirdPartySdncId\"/>\n","comments":"","outputs":1,"x":1579.2854461669922,"y":2035.0314559936523,"z":"91bedfe2.922fa","wires":[["79f3f49d.7b094c","a21a570d.c46eb8"]]},{"id":"20e1d185.90d58e","type":"execute","name":"contains templateFileName","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`\"/>\n    <parameter name=\"target\" value=\"templateFileName\"/>\n","comments":"","outputs":1,"x":1582.285385131836,"y":2079.0312423706055,"z":"91bedfe2.922fa","wires":[["d0a8a99e.fd9dd8","2117ee85.1f5b82"]]},{"id":"448efb74.023b24","type":"execute","name":"contains restapiUrl","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`\"/>\n    <parameter name=\"target\" value=\"restapiUrl\"/>\n","comments":"","outputs":1,"x":1552.2853164672852,"y":2128.03133392334,"z":"91bedfe2.922fa","wires":[["9f6948c5.2a58d8"]]},{"id":"a21a570d.c46eb8","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1386.53125,"y":2083.03125,"z":"91bedfe2.922fa","wires":[["20e1d185.90d58e"]]},{"id":"2117ee85.1f5b82","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1375.53125,"y":2133.03125,"z":"91bedfe2.922fa","wires":[["448efb74.023b24"]]},{"id":"b3dd1c0f.44ef8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":1200.7813034057617,"y":2047.0313968658447,"z":"91bedfe2.922fa","wires":[["a2539fc0.c8e2","1dba7638.703c1a"]]},{"id":"b4d5e437.520198","type":"for","name":"for sIdx..service-data.networks.network[]","xml":"<for index='sIdx' start='0' end='`$service-data.networks.network_length`' >\n","comments":"","outputs":1,"x":2250.531265258789,"y":2503.03125,"z":"91bedfe2.922fa","wires":[["7c336efa.08344"]]},{"id":"7c336efa.08344","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$service-data.networks.network[$sIdx].network-id == $network-topology-operation-input.network-information.network-id`'>\n","comments":"","outputs":1,"x":2541.7816162109375,"y":2498.03125,"z":"91bedfe2.922fa","wires":[["778f9e9e.7a418"]]},{"id":"778f9e9e.7a418","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2708.5321922302246,"y":2496.031280517578,"z":"91bedfe2.922fa","wires":[["a5d233a9.d2394"]]},{"id":"b08020a2.d1212","type":"set","name":"set localServiceId","xml":"<set>\n<parameter name='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param[$paraIndx].name`' value='localServiceId' />\n<parameter name='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param[$paraIndx].value`' value='`$restApi-result.output.service.uuid`' />","comments":"","x":3063.0316467285156,"y":2519.031280517578,"z":"91bedfe2.922fa","wires":[]},{"id":"672af35f.38734c","type":"set","name":"set paraIndx","xml":"<set>\n<parameter name='paraIndx' value='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param_length`' />","comments":"","x":3061.5313987731934,"y":2452.0313720703125,"z":"91bedfe2.922fa","wires":[]},{"id":"a5d233a9.d2394","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":2863.531280517578,"y":2486.0313415527344,"z":"91bedfe2.922fa","wires":[["672af35f.38734c","b08020a2.d1212"]]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-create.json
index 5660246c..ec47f879 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-create.json
@@ -1,360 +1 @@
-[{
-	"id": "6ac67ae1.a0aa44",
-	"type": "dgstart",
-	"name": "DGSTART",
-	"outputs": 1,
-	"x": 175.00390625,
-	"y": 106.00390625,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["a7166f73.c3b7d"]
-	]
-}, {
-	"id": "a7166f73.c3b7d",
-	"type": "service-logic",
-	"name": "GENERIC-RESOURCE-API ${project.version}",
-	"module": "GENERIC-RESOURCE-API",
-	"version": "${project.version}",
-	"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": 387.00391006469727,
-	"y": 178.0039234161377,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["28d122a6.3dff6e"]
-	]
-}, {
-	"id": "28d122a6.3dff6e",
-	"type": "method",
-	"name": "wan-connection-topology-operation-create",
-	"xml": "<method rpc='wan-connection-topology-operation-create' mode='sync'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 375.0040283203125,
-	"y": 266.00390625,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["5e728e05.d58"]
-	]
-}, {
-	"id": "9cfd5628.0461f8",
-	"type": "execute",
-	"name": "contains specification",
-	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"specification\"/>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 571.0351867675781,
-	"y": 443.03515338897705,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["880d63dc.b5a38", "f32a417.139a7c"]
-	]
-}, {
-	"id": "fecacce0.e773",
-	"type": "execute",
-	"name": "contains FC",
-	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"FC\"/>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 542.0352630615234,
-	"y": 541.0352182388306,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["e31d6f4d.a6b8a", "3a9f16f2.1de22a"]
-	]
-}, {
-	"id": "328d5a5f.8b3686",
-	"type": "execute",
-	"name": "contains FD",
-	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"FD\"/>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 540.0351867675781,
-	"y": 619.0352191925049,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["95036d7b.e76b7", "a957c80c.629788"]
-	]
-}, {
-	"id": "8ced5ada.6dacc8",
-	"type": "execute",
-	"name": "contains Link",
-	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"Link\"/>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 545.0352325439453,
-	"y": 699.0353374481201,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["3306f585.d6ad4a", "f7a1c197.52e9b"]
-	]
-}, {
-	"id": "880d63dc.b5a38",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 807.0352210998535,
-	"y": 441.03514528274536,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["4a720633.6d38d8"]
-	]
-}, {
-	"id": "f32a417.139a7c",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 336.03525161743164,
-	"y": 541.0352182388306,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["fecacce0.e773"]
-	]
-}, {
-	"id": "e31d6f4d.a6b8a",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 723.035270690918,
-	"y": 543.0352516174316,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["e96c15e0.5108b8"]
-	]
-}, {
-	"id": "95036d7b.e76b7",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 735.035270690918,
-	"y": 621.0352516174316,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["e96c15e0.5108b8"]
-	]
-}, {
-	"id": "3a9f16f2.1de22a",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 331.03519439697266,
-	"y": 622.0351905822754,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["328d5a5f.8b3686"]
-	]
-}, {
-	"id": "a957c80c.629788",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 336.03526306152344,
-	"y": 705.0353965759277,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["8ced5ada.6dacc8"]
-	]
-}, {
-	"id": "3306f585.d6ad4a",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 736.035343170166,
-	"y": 698.0353984832764,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["ff5b5810.5ac2a8"]
-	]
-}, {
-	"id": "914afff2.c348e",
-	"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": 566.0039978027344,
-	"y": 386.0039253234863,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "5e728e05.d58",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 281.00392150878906,
-	"y": 366.00390243530273,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["914afff2.c348e", "9cfd5628.0461f8", "d08cdbfc.d46288", "8af933b4.c5208"]
-	]
-}, {
-	"id": "d08cdbfc.d46288",
-	"type": "switchNode",
-	"name": "switch network-id",
-	"xml": "<switch test='`$network-topology-operation-input.network-information.network-id`'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 566.0039291381836,
-	"y": 324.00391578674316,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["13cbf19b.fc4f5e", "163e4527.d3d54b"]
-	]
-}, {
-	"id": "13cbf19b.fc4f5e",
-	"type": "outcome",
-	"name": "NULL",
-	"xml": "<outcome value=''>",
-	"comments": "",
-	"outputs": 1,
-	"x": 815.0040054321289,
-	"y": 263.00391578674316,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["600a4007.612e"]
-	]
-}, {
-	"id": "600a4007.612e",
-	"type": "execute",
-	"name": "generate tmp.ar.allotted-resource-id",
-	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"network-topology-operation-input.network-information.network-id\"/>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1030.0039825439453,
-	"y": 264.00392150878906,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["224d0a6c.fd47b6"]
-	]
-}, {
-	"id": "224d0a6c.fd47b6",
-	"type": "failure",
-	"name": "failure",
-	"xml": "<outcome value='failure'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1248.0040245056152,
-	"y": 264.00388526916504,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["c61d540b.7cf0a8"]
-	]
-}, {
-	"id": "c61d540b.7cf0a8",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation allotted resource ID\" />\n",
-	"comments": "",
-	"x": 1414.003978729248,
-	"y": 264.0038995742798,
-	"z": "7d848bad.6cea14",
-	"wires": []
-}, {
-	"id": "163e4527.d3d54b",
-	"type": "other",
-	"name": "other",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 812.5039024353027,
-	"y": 311.00391006469727,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "4a720633.6d38d8",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:wan-connection-save-specification",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='wan-connection-save-specification' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1129.0039367675781,
-	"y": 441.00395679473877,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "e96c15e0.5108b8",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:wan-connection-find-specifications",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='wan-connection-find-specifications' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1125.5040283203125,
-	"y": 586.0039100646973,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "8af933b4.c5208",
-	"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": 341.00391387939453,
-	"y": 827.0039396286011,
-	"z": "7d848bad.6cea14",
-	"wires": []
-}, {
-	"id": "ff5b5810.5ac2a8",
-	"type": "call",
-	"name": "call GENERIC-RESOURCE-API:wan-connection-route-calculation",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='wan-connection-route-calculation' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1105.003921508789,
-	"y": 701.0039482116699,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "f7a1c197.52e9b",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 741.00390625,
-	"y": 765.00390625,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		["7ef91d7a.861074"]
-	]
-}, {
-	"id": "7ef91d7a.861074",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 909.00390625,
-	"y": 771.0039482116699,
-	"z": "7d848bad.6cea14",
-	"wires": [
-		[]
-	]
-}]
\ No newline at end of file
+[{"id":"d9a485a7.8cfe08","type":"dgstart","name":"DGSTART","outputs":1,"x":166.03125,"y":100.03125,"z":"c5a28f0d.64302","wires":[["3e53924b.2a55fe"]]},{"id":"3e53924b.2a55fe","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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":378.03125381469727,"y":172.0312671661377,"z":"c5a28f0d.64302","wires":[["f69d7b99.b12528"]]},{"id":"f69d7b99.b12528","type":"method","name":"wan-connection-topology-operation-create","xml":"<method rpc='wan-connection-topology-operation-create' mode='sync'>\n","comments":"","outputs":1,"x":366.0313720703125,"y":260.03125,"z":"c5a28f0d.64302","wires":[["6175e256.59761c"]]},{"id":"5d16c6e7.077638","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":534.0313873291016,"y":692.0312900543213,"z":"c5a28f0d.64302","wires":[[]]},{"id":"6175e256.59761c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":272.03126525878906,"y":360.03124618530273,"z":"c5a28f0d.64302","wires":[["5d16c6e7.077638","cef7b1e1.7f76a","f06d173e.09bd08","85cf667e.c67328"]]},{"id":"cef7b1e1.7f76a","type":"switchNode","name":"switch network-id","xml":"<switch test='`$network-topology-operation-input.network-information.network-id`'>\n","comments":"","outputs":1,"x":534.0312957763672,"y":363.0312728881836,"z":"c5a28f0d.64302","wires":[["f9b1bf2b.11c82"]]},{"id":"f9b1bf2b.11c82","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":576.0314712524414,"y":518.0313191413879,"z":"c5a28f0d.64302","wires":[["a9168afa.8d3a48"]]},{"id":"a9168afa.8d3a48","type":"execute","name":"generate network-id","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"network-topology-operation-input.network-information.network-id\"/>\n","comments":"","outputs":1,"x":798.0316772460938,"y":529.0313682556152,"z":"c5a28f0d.64302","wires":[["4f502e35.3536","9802953.f46e768"]]},{"id":"4f502e35.3536","type":"failure","name":"Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1013.0317230224609,"y":455.03134775161743,"z":"c5a28f0d.64302","wires":[["a5f5800f.532e6"]]},{"id":"a5f5800f.532e6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation allotted resource ID\" />\n","comments":"","x":1179.0317306518555,"y":457.03136682510376,"z":"c5a28f0d.64302","wires":[]},{"id":"f06d173e.09bd08","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":433.0313186645508,"y":999.031286239624,"z":"c5a28f0d.64302","wires":[]},{"id":"85cf667e.c67328","type":"block","name":"save-block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":523.031364440918,"y":825.0351696014404,"z":"c5a28f0d.64302","wires":[["cfe8fe51.ccac9","6de7a792.66c358"]]},{"id":"cfe8fe51.ccac9","type":"set","name":"set network in service-data","xml":"<set>\n<parameter name='service-data.networks.network[$nidx].network-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.' value='`$network-topology-operation-input.network-request-input.`' />\n<parameter name='service-data.networks.network_length' value='`$nidx+1`' />\n\n","comments":"","x":909.0313720703125,"y":1030.0352153778076,"z":"c5a28f0d.64302","wires":[]},{"id":"6de7a792.66c358","type":"switchNode","name":"switch service-data.networks_length","xml":"<switch test='`$service-data.networks.network_length`'>\n","comments":"","outputs":1,"x":948.0313949584961,"y":776.0352096557617,"z":"c5a28f0d.64302","wires":[["43ab177c.4b8ff8","eee3637.41d0da"]]},{"id":"43ab177c.4b8ff8","type":"other","name":"Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":897.031494140625,"y":846.0352544784546,"z":"c5a28f0d.64302","wires":[["af6e3db1.b1591"]]},{"id":"af6e3db1.b1591","type":"set","name":"set nidx","xml":"<set>\n<parameter name='nidx' value='0' />","comments":"","x":1030.531394958496,"y":845.0352387428284,"z":"c5a28f0d.64302","wires":[]},{"id":"eee3637.41d0da","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":894.0312805175781,"y":894.0352535247803,"z":"c5a28f0d.64302","wires":[["c88049a.0ea41b8"]]},{"id":"c88049a.0ea41b8","type":"set","name":"set nidx","xml":"<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />","comments":"","x":1031.0872192382812,"y":890.5909185409546,"z":"c5a28f0d.64302","wires":[]},{"id":"9802953.f46e768","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":991.3649368286133,"y":685.0313763618469,"z":"c5a28f0d.64302","wires":[["28ce123.cdf27ee"]]},{"id":"28ce123.cdf27ee","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1164.3648529052734,"y":680.0313687324524,"z":"c5a28f0d.64302","wires":[["d91d9639.b17f68"]]},{"id":"d91d9639.b17f68","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":1427.5315246582031,"y":679.0313687324524,"z":"c5a28f0d.64302","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-deactivate.json
index 3b0b0fb3..693ae8b0 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-deactivate.json
@@ -1,890 +1 @@
-[{
-	"id": "dc5daae1.4b2b68",
-	"type": "dgstart",
-	"name": "DGSTART",
-	"outputs": 1,
-	"x": 136.01040649414062,
-	"y": 88.01041412353516,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["f86fe308.85c13"]
-	]
-}, {
-	"id": "f86fe308.85c13",
-	"type": "service-logic",
-	"name": "GENERIC-RESOURCE-API ${project.version}",
-	"module": "GENERIC-RESOURCE-API",
-	"version": "${project.version}",
-	"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": 348.0104103088379,
-	"y": 160.01043128967285,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["c94e70a1.1a9f8"]
-	]
-}, {
-	"id": "c94e70a1.1a9f8",
-	"type": "method",
-	"name": "wan-connection-topology-operation-deactivate",
-	"xml": "<method rpc='wan-connection-topology-operation-deactivate' mode='sync'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 336.0105285644531,
-	"y": 248.01041412353516,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["2779c46a.0d3bfc"]
-	]
-}, {
-	"id": "57a97cf3.f011a4",
-	"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": 723.0106887817383,
-	"y": 332.0104856491089,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "ea250cc1.d5382",
-	"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": 323.0104217529297,
-	"y": 1197.010627746582,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "2779c46a.0d3bfc",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 248.51060485839844,
-	"y": 689.0105495452881,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["ed99019f.1977", "7dda64d7.a5a00c", "f7ff6068.4e95b", "3266b2a4.654dfe", "5f4320a1.8de1c", "57a97cf3.f011a4", "ea250cc1.d5382"]
-	]
-}, {
-	"id": "ed99019f.1977",
-	"type": "execute",
-	"name": "generate services url",
-	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.network-provided-resource`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.services-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$network-topology-operation-input.service-information.service-id`\"/>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 709.0106735229492,
-	"y": 403.0105857849121,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "7dda64d7.a5a00c",
-	"type": "execute",
-	"name": "execute RestApiCallNode - get-resource parent service data",
-	"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.services-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 835.0106735229492,
-	"y": 480.0105857849121,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["1a420eef.b4ab81", "758b4d6.827c5b4"]
-	]
-}, {
-	"id": "1a420eef.b4ab81",
-	"type": "success",
-	"name": "success",
-	"xml": "<outcome value='success'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1182.010856628418,
-	"y": 431.0105857849121,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["f55029d2.253db8"]
-	]
-}, {
-	"id": "f55029d2.253db8",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 1349.0109329223633,
-	"y": 465.0106463432312,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "758b4d6.827c5b4",
-	"type": "other",
-	"name": "other",
-	"xml": "<outcome value='Other'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1187.8626289367676,
-	"y": 514.0767450332642,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["1418c003.c3bc4"]
-	]
-}, {
-	"id": "1418c003.c3bc4",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Parent service data not available\" />\n    \n",
-	"comments": "",
-	"x": 1358.2607803344727,
-	"y": 530.0105752944946,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "f7ff6068.4e95b",
-	"type": "for",
-	"name": "for pidx..mdsal-psd.service-data.networks.network[]",
-	"xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.networks.network_length`' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 895.5107116699219,
-	"y": 631.0105295181274,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["492dcfc8.84723"]
-	]
-}, {
-	"id": "492dcfc8.84723",
-	"type": "switchNode",
-	"name": "switch model-name",
-	"xml": "<switch test=\"`$mdsal-psd.service-data.networks.network[$pidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 843.5106887817383,
-	"y": 708.0105800628662,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["27343179.181b8e"]
-	]
-}, {
-	"id": "27343179.181b8e",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1025.7607917785645,
-	"y": 710.0106735229492,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["63f3970f.a34118"]
-	]
-}, {
-	"id": "63f3970f.a34118",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 1196.5214195251465,
-	"y": 714.867790222168,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["a56f8acd.7498b8"]
-	]
-}, {
-	"id": "a56f8acd.7498b8",
-	"type": "set",
-	"name": "set tmp.pidx and tmp.network-input-parameters",
-	"xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n<parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[$pidx].`' />\n<parameter name='tmp.network-input-parameters' value='`$mdsal-psd.service-data.networks.network[$pidx].network-data.network-request-input.network-input-parameters`' />\n<parameter name='tmp.found-network-input' value='true' />",
-	"comments": "",
-	"x": 1143.3788032531738,
-	"y": 788.4393863677979,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "3266b2a4.654dfe",
-	"type": "set",
-	"name": "set tmp.found-network-input",
-	"xml": "<set>\n<parameter name='tmp.found-network-input' value='false' />",
-	"comments": "",
-	"x": 777.5106582641602,
-	"y": 560.0105857849121,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "5f4320a1.8de1c",
-	"type": "switchNode",
-	"name": "switch found-network-input",
-	"xml": "<switch test=\"`$found-network-input`\">\n\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 608.5107040405273,
-	"y": 899.0107097625732,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["8d8a4cba.9e184", "b9d9fb0b.7db9b8"]
-	]
-}, {
-	"id": "8d8a4cba.9e184",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 840.5107955932617,
-	"y": 943.010908126831,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["d6f87580.2dc1d8"]
-	]
-}, {
-	"id": "b9d9fb0b.7db9b8",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 841.2607345581055,
-	"y": 901.010799407959,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["cd109ebd.9e8f9"]
-	]
-}, {
-	"id": "cd109ebd.9e8f9",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Network input parameters not found\" />\n    \n",
-	"comments": "",
-	"x": 1012.2607345581055,
-	"y": 909.0107688903809,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "d6f87580.2dc1d8",
-	"type": "block",
-	"name": "block : atomic",
-	"xml": "<block atomic=\"true\">",
-	"atomic": "true",
-	"outputs": 1,
-	"x": 578.0105819702148,
-	"y": 1055.0106945037842,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["9089330c.7c429", "f7517eb4.eccef", "c4ea6652.9fa878"]
-	]
-}, {
-	"id": "9089330c.7c429",
-	"type": "for",
-	"name": "for cidx..tmp.network.network-data.network-topology.network-parameters.network-parameter[]",
-	"xml": "<for index='cidx' start='0' end='`$tmp.network.network-data.network-topology.network-parameters.network-parameter_length`' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1027.0104217529297,
-	"y": 1141.0105504989624,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["91a2217e.0aa36"]
-	]
-}, {
-	"id": "44bbe120.7255",
-	"type": "switchNode",
-	"name": "switch network-parameter-name == 'restapiUrl-deactivate'",
-	"xml": "<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiUrl-deactivate'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1141.010482788086,
-	"y": 1211.010612487793,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["ae0bda70.be78d8"]
-	]
-}, {
-	"id": "ae0bda70.be78d8",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1414.0106048583984,
-	"y": 1210.010570526123,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["866f7c3c.d7349"]
-	]
-}, {
-	"id": "866f7c3c.d7349",
-	"type": "set",
-	"name": "set tmp.thirdparty-sdnc-url",
-	"xml": "<set>\n<parameter name='tmp.restapiUrl' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.restapiUrl-found' value='true' />",
-	"comments": "",
-	"x": 1593.0105667114258,
-	"y": 1212.0106191635132,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "2a83ab2c.a5f774",
-	"type": "execute",
-	"name": "execute RestApiCallNode delete wan-connection",
-	"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.restapiUrl + $tmp.actualId`\" />\n<parameter name=\"restapiUser\" value=\"`$tmp.restapiUser`\" />\n<parameter name=\"restapiPassword\" value=\"`$tmp.restapiPassword`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>",
-	"comments": "",
-	"outputs": 1,
-	"x": 915.2604522705078,
-	"y": 1943.0111656188965,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["5eb1697e.075858", "dd1f30f9.8bae3", "bd716a80.bf8068"]
-	]
-}, {
-	"id": "9154a660.674bb8",
-	"type": "switchNode",
-	"name": "switch network-parameter-name == 'restapiUser'",
-	"xml": "<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiUser'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1144.2604751586914,
-	"y": 1262.0105876922607,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["dcf17939.4e7148"]
-	]
-}, {
-	"id": "dcf17939.4e7148",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1410.2605895996094,
-	"y": 1264.0106649398804,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["de64ea4d.ab18b8"]
-	]
-}, {
-	"id": "de64ea4d.ab18b8",
-	"type": "set",
-	"name": "set tmp.restapiUser",
-	"xml": "<set>\n<parameter name='tmp.restapiUser' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.restapiUser-found' value='true' />",
-	"comments": "",
-	"x": 1611.2606201171875,
-	"y": 1262.0106658935547,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "6d3fee98.40477",
-	"type": "switchNode",
-	"name": "switch network-parameter-name == 'restapiPassword'",
-	"xml": "<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiPassword'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1152.2605438232422,
-	"y": 1316.010513305664,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["e3d0d091.7555a"]
-	]
-}, {
-	"id": "e3d0d091.7555a",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1429.260555267334,
-	"y": 1314.0105457305908,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["4b4e91b6.1741a"]
-	]
-}, {
-	"id": "4b4e91b6.1741a",
-	"type": "set",
-	"name": "set tmp.restapiPassword",
-	"xml": "<set>\n<parameter name='tmp.restapiPassword' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.restapiPassword-found' value='true' />",
-	"comments": "",
-	"x": 1630.260585784912,
-	"y": 1312.0105466842651,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "f7517eb4.eccef",
-	"type": "set",
-	"name": "set paras flags",
-	"xml": "<set>\n<parameter name='tmp.restapiUrl-found' value='false' />\n<parameter name='tmp.restapiUser-found' value='false' />\n<parameter name='tmp.restapiPassword-found' value='false' />\n<parameter name='tmp.thirdPartyAdaptorRpc-found' value='false' />\n<parameter name='tmp.actualId-found' value='false' />",
-	"comments": "",
-	"x": 814.0105895996094,
-	"y": 1056.0105476379395,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "c4ea6652.9fa878",
-	"type": "switchNode",
-	"name": "switch thirdPartyAdaptorRpc-found == 'true'",
-	"xml": "<switch test=\"`$tmp.thirdPartyAdaptorRpc-found == 'true'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 856.0104217529297,
-	"y": 1551.0105934143066,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["a1470852.fbe9a8", "44560421.b5783c"]
-	]
-}, {
-	"id": "91a2217e.0aa36",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 798.0104217529297,
-	"y": 1322.0104637145996,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["44bbe120.7255", "9154a660.674bb8", "6d3fee98.40477", "fe9a117b.1f532", "9e6c08bf.a2fe88"]
-	]
-}, {
-	"id": "a1470852.fbe9a8",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1118.010440826416,
-	"y": 1513.0105304718018,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["87499e3e.8efd7"]
-	]
-}, {
-	"id": "44560421.b5783c",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1119.0103912353516,
-	"y": 1579.010495185852,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["1d000250.ddb41e"]
-	]
-}, {
-	"id": "87499e3e.8efd7",
-	"type": "call",
-	"name": "call thirdPartyAdaptorRpc",
-	"xml": "<call module='GENERIC-RESOURCE-API' rpc='`$tmp.thirdPartyAdaptorRpc`' mode='sync' >\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1338.010482788086,
-	"y": 1514.0105895996094,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["be1c43cd.6c6d5", "36f2fa8b.9ff576", "9830e901.9d2aa8"]
-	]
-}, {
-	"id": "1d000250.ddb41e",
-	"type": "switchNode",
-	"name": "switch restapiUrl-found == 'true'",
-	"xml": "<switch test=\"`$tmp.restapiUrl-found == 'true'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 880.461311340332,
-	"y": 1663.0172395706177,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["e6d9ab3.015a858", "20fb14a8.faab2c"]
-	]
-}, {
-	"id": "e6d9ab3.015a858",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1131.461296081543,
-	"y": 1661.017035484314,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["481b171e.ab37e8"]
-	]
-}, {
-	"id": "481b171e.ab37e8",
-	"type": "switchNode",
-	"name": "switch restapiUser-found == 'true'",
-	"xml": "<switch test=\"`$tmp.restapiUser-found == 'true'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 858.4614105224609,
-	"y": 1730.2393379211426,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["3742155.0c254ea", "6f396aea.673404"]
-	]
-}, {
-	"id": "3742155.0c254ea",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1125.4613037109375,
-	"y": 1731.2390508651733,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["2df75511.30eb8a"]
-	]
-}, {
-	"id": "2df75511.30eb8a",
-	"type": "switchNode",
-	"name": "switch restapiPassword-found == 'true'",
-	"xml": "<switch test=\"`$tmp.restapiPassword-found == 'true'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 873.4613037109375,
-	"y": 1800.239260673523,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["6e3c4b77.f76d04", "79b92f2b.ec99"]
-	]
-}, {
-	"id": "6e3c4b77.f76d04",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1133.4613037109375,
-	"y": 1800.2390508651733,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["e4613219.7da05"]
-	]
-}, {
-	"id": "fe9a117b.1f532",
-	"type": "switchNode",
-	"name": "switch network-parameter-name == 'thirdPartyAdaptorRpc-deactivate'",
-	"xml": "<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'thirdPartyAdaptorRpc-deactivate'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1170.0169410705566,
-	"y": 1409.0168914794922,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["3b34faa8.496266"]
-	]
-}, {
-	"id": "3b34faa8.496266",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1481.0171585083008,
-	"y": 1413.0167961120605,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["89a96064.90193"]
-	]
-}, {
-	"id": "89a96064.90193",
-	"type": "set",
-	"name": "set tmp.thirdPartyAdaptorRpc",
-	"xml": "<set>\n<parameter name='tmp.thirdPartyAdaptorRpc' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.thirdPartyAdaptorRpc-found' value='true' />",
-	"comments": "",
-	"x": 1676.0171127319336,
-	"y": 1407.0169868469238,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "9830e901.9d2aa8",
-	"type": "not-found",
-	"name": "not-found",
-	"xml": "<outcome value='not-found'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1604.0168762207031,
-	"y": 1553.3502578735352,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["e00f6454.dddf68"]
-	]
-}, {
-	"id": "36f2fa8b.9ff576",
-	"type": "failure",
-	"name": "failure",
-	"xml": "<outcome value='failure'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1595.0169258117676,
-	"y": 1521.8502836227417,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["e00f6454.dddf68"]
-	]
-}, {
-	"id": "be1c43cd.6c6d5",
-	"type": "success",
-	"name": "success",
-	"xml": "<outcome value='success'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1598.7669639587402,
-	"y": 1492.207388497889,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["6355ce7d.fb42b"]
-	]
-}, {
-	"id": "e00f6454.dddf68",
-	"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 calling ' + $tmp.thirdPartyAdaptorRpc`\" />\n",
-	"comments": "",
-	"x": 1761.766990661621,
-	"y": 1538.6003561019897,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "6355ce7d.fb42b",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 1740.4229316711426,
-	"y": 1488.3995576873422,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "bd716a80.bf8068",
-	"type": "not-found",
-	"name": "not-found",
-	"xml": "<outcome value='not-found'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1245.0168762207031,
-	"y": 1978.3502578735352,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["593817ce.8c6458"]
-	]
-}, {
-	"id": "dd1f30f9.8bae3",
-	"type": "failure",
-	"name": "failure",
-	"xml": "<outcome value='failure'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1236.0169258117676,
-	"y": 1946.8502836227417,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["593817ce.8c6458"]
-	]
-}, {
-	"id": "5eb1697e.075858",
-	"type": "success",
-	"name": "success",
-	"xml": "<outcome value='success'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1239.7669639587402,
-	"y": 1917.207388497889,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["33a4cba3.45a344"]
-	]
-}, {
-	"id": "593817ce.8c6458",
-	"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 calling ' + $tmp.restapiUrl`\" />\n",
-	"comments": "",
-	"x": 1402.766990661621,
-	"y": 1963.6003561019897,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "33a4cba3.45a344",
-	"type": "block",
-	"name": "block",
-	"xml": "<block>\n",
-	"atomic": "false",
-	"comments": "",
-	"outputs": 1,
-	"x": 1381.4229316711426,
-	"y": 1913.3995576873422,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		[]
-	]
-}, {
-	"id": "20fb14a8.faab2c",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1282.6835021972656,
-	"y": 1628.4613418579102,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["f5cee36d.88941"]
-	]
-}, {
-	"id": "f5cee36d.88941",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: 3rd party controller restapiUrl not found\" />\n    \n",
-	"comments": "",
-	"x": 1453.6835021972656,
-	"y": 1636.461311340332,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "6f396aea.673404",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1287.6835021972656,
-	"y": 1707.4613418579102,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["82e86a2a.10b8e8"]
-	]
-}, {
-	"id": "82e86a2a.10b8e8",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: 3rd party controller restapiUser not found\" />\n    \n",
-	"comments": "",
-	"x": 1458.6835021972656,
-	"y": 1715.461311340332,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "79b92f2b.ec99",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1278.6835021972656,
-	"y": 1778.4613418579102,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["2dcb87b4.9d09e8"]
-	]
-}, {
-	"id": "2dcb87b4.9d09e8",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: 3rd party controller restapiPassword not found\" />\n    \n",
-	"comments": "",
-	"x": 1449.6835021972656,
-	"y": 1786.461311340332,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "9e6c08bf.a2fe88",
-	"type": "switchNode",
-	"name": "switch network-parameter-name == 'actualId'",
-	"xml": "<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'actualId'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1156.0103759765625,
-	"y": 1364.0103759765625,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["11fcb359.0b74ed"]
-	]
-}, {
-	"id": "11fcb359.0b74ed",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1433.0103874206543,
-	"y": 1362.0104084014893,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["f5a304ff.f9aea8"]
-	]
-}, {
-	"id": "f5a304ff.f9aea8",
-	"type": "set",
-	"name": "set tmp.actualId",
-	"xml": "<set>\n<parameter name='tmp.actualId' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.actualId-found' value='true' />",
-	"comments": "",
-	"x": 1634.0104179382324,
-	"y": 1360.0104093551636,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}, {
-	"id": "e4613219.7da05",
-	"type": "switchNode",
-	"name": "switch actualId-found == 'true'",
-	"xml": "<switch test=\"`$tmp.actualId-found == 'true'`\">\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 887.2326049804688,
-	"y": 1868.454833984375,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["572932d1.b17b3c", "c0db58a1.69dc58"]
-	]
-}, {
-	"id": "572932d1.b17b3c",
-	"type": "outcomeTrue",
-	"name": "true",
-	"xml": "<outcome value='true'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1147.2326049804688,
-	"y": 1868.4546241760254,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["2a83ab2c.a5f774"]
-	]
-}, {
-	"id": "c0db58a1.69dc58",
-	"type": "outcomeTrue",
-	"name": "false",
-	"xml": "<outcome value='false'>\n",
-	"comments": "",
-	"outputs": 1,
-	"x": 1292.4548034667969,
-	"y": 1846.6769151687622,
-	"z": "5f2b1b80.205544",
-	"wires": [
-		["cf40162e.095f98"]
-	]
-}, {
-	"id": "cf40162e.095f98",
-	"type": "returnFailure",
-	"name": "return failure",
-	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Wan Connection actualId not found\" />\n    \n",
-	"comments": "",
-	"x": 1463.4548034667969,
-	"y": 1854.676884651184,
-	"z": "5f2b1b80.205544",
-	"wires": []
-}]
\ No newline at end of file
+[{"id":"fb139930.a5ac98","type":"dgstart","name":"DGSTART","outputs":1,"x":167.03125,"y":89.03125,"z":"31004b62.477bf4","wires":[["48e0e6f4.30bbf8"]]},{"id":"48e0e6f4.30bbf8","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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":379.03125381469727,"y":161.0312671661377,"z":"31004b62.477bf4","wires":[["78dc56c8.def1a8"]]},{"id":"78dc56c8.def1a8","type":"method","name":"wan-connection-topology-operation-deactivate","xml":"<method rpc='wan-connection-topology-operation-deactivate' mode='sync'>\n","comments":"","outputs":1,"x":367.0313720703125,"y":249.03125,"z":"31004b62.477bf4","wires":[["48439268.1dfbdc"]]},{"id":"467f342d.7d22ac","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":754.0315322875977,"y":333.03132152557373,"z":"31004b62.477bf4","wires":[[]]},{"id":"5566030f.560f5c","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":354.03126525878906,"y":1198.0314636230469,"z":"31004b62.477bf4","wires":[]},{"id":"48439268.1dfbdc","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":279.5314483642578,"y":690.0313854217529,"z":"31004b62.477bf4","wires":[["41eefa5d.723984","73444414.51ee3c","467f342d.7d22ac","5566030f.560f5c","bfe6e253.51bda"]]},{"id":"41eefa5d.723984","type":"for","name":"for pidx..service-data.networks.network[]","xml":"<for index='pidx' start='0' end='`$service-data.networks.network_length`' >\n","comments":"","outputs":1,"x":917.5316619873047,"y":490.03138399124146,"z":"31004b62.477bf4","wires":[["73275112.eb265"]]},{"id":"73275112.eb265","type":"switchNode","name":"switch network-id","xml":"<switch test=\"`$service-data.networks.network[$pidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n","comments":"","outputs":1,"x":968.5315933227539,"y":563.031415939331,"z":"31004b62.477bf4","wires":[["3cb7881c.e77758"]]},{"id":"3cb7881c.e77758","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1150.78169631958,"y":565.0315093994141,"z":"31004b62.477bf4","wires":[["bb475021.956ca"]]},{"id":"bb475021.956ca","type":"set","name":"set tmp.pidx and tmp.network-input-parameters","xml":"<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n<parameter name='tmp.network.' value='`$service-data.networks.network[$pidx].`' />\n<parameter name='tmp.network-input-parameters' value='`$service-data.networks.network[$pidx].network-data.network-request-input.network-input-parameters`' />\n<parameter name='tmp.found-network-input' value='true' />","comments":"","x":1437.399658203125,"y":549.4603414535522,"z":"31004b62.477bf4","wires":[]},{"id":"73444414.51ee3c","type":"set","name":"set tmp.found-network-input","xml":"<set>\n<parameter name='tmp.found-network-input' value='false' />","comments":"","x":902.5315628051758,"y":415.03142166137695,"z":"31004b62.477bf4","wires":[]},{"id":"7ef8bc93.72d7e4","type":"switchNode","name":"switch found-network-input","xml":"<switch test=\"`$found-network-input`\">\n\n","comments":"","outputs":1,"x":639.5315475463867,"y":900.0315456390381,"z":"31004b62.477bf4","wires":[["879fbfe.6bbb14","1f7a132d.4d9f0d"]]},{"id":"879fbfe.6bbb14","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":871.5316390991211,"y":944.0317440032959,"z":"31004b62.477bf4","wires":[["ea5209e1.dfa278"]]},{"id":"1f7a132d.4d9f0d","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":872.2815780639648,"y":902.0316352844238,"z":"31004b62.477bf4","wires":[["1a0d4bfd.22a1c4"]]},{"id":"1a0d4bfd.22a1c4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Network input parameters not found\" />\n    \n","comments":"","x":1043.2815780639648,"y":910.0316047668457,"z":"31004b62.477bf4","wires":[]},{"id":"ea5209e1.dfa278","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":609.0314254760742,"y":1056.031530380249,"z":"31004b62.477bf4","wires":[["779b431.149c2bc","ce19c54d.859618","7d3319a2.799358"]]},{"id":"779b431.149c2bc","type":"for","name":"for cidx..tmp.network.network-data.network-topology.network-parameters.network-parameter[]","xml":"<for index='cidx' start='0' end='`$tmp.network.network-data.network-topology.network-parameters.network-parameter_length`' >\n","comments":"","outputs":1,"x":1058.031265258789,"y":1142.0313863754272,"z":"31004b62.477bf4","wires":[["8de9fe3f.ec51c"]]},{"id":"f0ae8659.57b548","type":"switchNode","name":"switch network-parameter-name == 'restapiUrl-deactivate'","xml":"<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiUrl-deactivate'`\">\n","comments":"","outputs":1,"x":1172.0313262939453,"y":1212.0314483642578,"z":"31004b62.477bf4","wires":[["c927c5bf.bcf4e8"]]},{"id":"c927c5bf.bcf4e8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1445.0314483642578,"y":1211.031406402588,"z":"31004b62.477bf4","wires":[["b3c6953a.75ca08"]]},{"id":"b3c6953a.75ca08","type":"set","name":"set tmp.thirdparty-sdnc-url","xml":"<set>\n<parameter name='tmp.restapiUrl' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.restapiUrl-found' value='true' />","comments":"","x":1624.0314102172852,"y":1213.031455039978,"z":"31004b62.477bf4","wires":[]},{"id":"b12f1c0.9e26fe8","type":"execute","name":"execute RestApiCallNode delete wan-connection","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$tmp.restapiUrl + $tmp.actualId`\" />\n<parameter name=\"restapiUser\" value=\"`$tmp.restapiUser`\" />\n<parameter name=\"restapiPassword\" value=\"`$tmp.restapiPassword`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>","comments":"","outputs":1,"x":946.2812957763672,"y":1944.0320014953613,"z":"31004b62.477bf4","wires":[["8e8c53c2.06b4d","e24db978.0e77a8","3690625e.d2f00e"]]},{"id":"60b22039.bfdef","type":"switchNode","name":"switch network-parameter-name == 'restapiUser'","xml":"<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiUser'`\">\n","comments":"","outputs":1,"x":1175.2813186645508,"y":1263.0314235687256,"z":"31004b62.477bf4","wires":[["1a01da0.b6d3826"]]},{"id":"1a01da0.b6d3826","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1441.2814331054688,"y":1265.0315008163452,"z":"31004b62.477bf4","wires":[["3207e040.5bbe9"]]},{"id":"3207e040.5bbe9","type":"set","name":"set tmp.restapiUser","xml":"<set>\n<parameter name='tmp.restapiUser' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.restapiUser-found' value='true' />","comments":"","x":1642.2814636230469,"y":1263.0315017700195,"z":"31004b62.477bf4","wires":[]},{"id":"d8d4ce6.c31703","type":"switchNode","name":"switch network-parameter-name == 'restapiPassword'","xml":"<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiPassword'`\">\n","comments":"","outputs":1,"x":1183.2813873291016,"y":1317.031349182129,"z":"31004b62.477bf4","wires":[["65057520.32caac"]]},{"id":"65057520.32caac","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1460.2813987731934,"y":1315.0313816070557,"z":"31004b62.477bf4","wires":[["9b70b8cf.209798"]]},{"id":"9b70b8cf.209798","type":"set","name":"set tmp.restapiPassword","xml":"<set>\n<parameter name='tmp.restapiPassword' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.restapiPassword-found' value='true' />","comments":"","x":1661.2814292907715,"y":1313.03138256073,"z":"31004b62.477bf4","wires":[]},{"id":"ce19c54d.859618","type":"set","name":"set paras flags","xml":"<set>\n<parameter name='tmp.restapiUrl-found' value='false' />\n<parameter name='tmp.restapiUser-found' value='false' />\n<parameter name='tmp.restapiPassword-found' value='false' />\n<parameter name='tmp.thirdPartyAdaptorRpc-found' value='false' />\n<parameter name='tmp.actualId-found' value='false' />","comments":"","x":845.0314331054688,"y":1057.0313835144043,"z":"31004b62.477bf4","wires":[]},{"id":"7d3319a2.799358","type":"switchNode","name":"switch thirdPartyAdaptorRpc-found == 'true'","xml":"<switch test=\"`$tmp.thirdPartyAdaptorRpc-found == 'true'`\">\n","comments":"","outputs":1,"x":887.0312652587891,"y":1552.0314292907715,"z":"31004b62.477bf4","wires":[["368277b8.bc08b8","7a07eba8.e04e64"]]},{"id":"8de9fe3f.ec51c","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":829.0312652587891,"y":1323.0312995910645,"z":"31004b62.477bf4","wires":[["f0ae8659.57b548","60b22039.bfdef","d8d4ce6.c31703","48aa5052.ae52c","a4f48d87.24801"]]},{"id":"368277b8.bc08b8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1149.0312843322754,"y":1514.0313663482666,"z":"31004b62.477bf4","wires":[["96632ba5.c52f68"]]},{"id":"7a07eba8.e04e64","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1150.031234741211,"y":1580.031331062317,"z":"31004b62.477bf4","wires":[["6963dd9c.467af4"]]},{"id":"96632ba5.c52f68","type":"call","name":"call thirdPartyAdaptorRpc","xml":"<call module='GENERIC-RESOURCE-API' rpc='`$tmp.thirdPartyAdaptorRpc`' mode='sync' >\n","comments":"","outputs":1,"x":1369.0313262939453,"y":1515.0314254760742,"z":"31004b62.477bf4","wires":[["17b23395.dbf90c","cba3bf5e.954aa","79dd5a51.2f85a4"]]},{"id":"6963dd9c.467af4","type":"switchNode","name":"switch restapiUrl-found == 'true'","xml":"<switch test=\"`$tmp.restapiUrl-found == 'true'`\">\n","comments":"","outputs":1,"x":911.4821548461914,"y":1664.0380754470825,"z":"31004b62.477bf4","wires":[["fcd82e49.da981","f4a968f.a316c98"]]},{"id":"fcd82e49.da981","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1162.4821395874023,"y":1662.0378713607788,"z":"31004b62.477bf4","wires":[["987ecdfc.5e08"]]},{"id":"987ecdfc.5e08","type":"switchNode","name":"switch restapiUser-found == 'true'","xml":"<switch test=\"`$tmp.restapiUser-found == 'true'`\">\n","comments":"","outputs":1,"x":889.4822540283203,"y":1731.2601737976074,"z":"31004b62.477bf4","wires":[["b4729227.6ae8d","58c5c70d.9bf9e8"]]},{"id":"b4729227.6ae8d","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1156.4821472167969,"y":1732.2598867416382,"z":"31004b62.477bf4","wires":[["c42f9d5.758fa6"]]},{"id":"c42f9d5.758fa6","type":"switchNode","name":"switch restapiPassword-found == 'true'","xml":"<switch test=\"`$tmp.restapiPassword-found == 'true'`\">\n","comments":"","outputs":1,"x":904.4821472167969,"y":1801.2600965499878,"z":"31004b62.477bf4","wires":[["8106bd42.342cf","d1647b0a.927598"]]},{"id":"8106bd42.342cf","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1164.4821472167969,"y":1801.2598867416382,"z":"31004b62.477bf4","wires":[["39947653.f85f4a"]]},{"id":"48aa5052.ae52c","type":"switchNode","name":"switch network-parameter-name == 'thirdPartyAdaptorRpc-deactivate'","xml":"<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'thirdPartyAdaptorRpc-deactivate'`\">\n","comments":"","outputs":1,"x":1201.037784576416,"y":1410.037727355957,"z":"31004b62.477bf4","wires":[["c2db7be7.487398"]]},{"id":"c2db7be7.487398","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1512.0380020141602,"y":1414.0376319885254,"z":"31004b62.477bf4","wires":[["1fa513b3.d3816c"]]},{"id":"1fa513b3.d3816c","type":"set","name":"set tmp.thirdPartyAdaptorRpc","xml":"<set>\n<parameter name='tmp.thirdPartyAdaptorRpc' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.thirdPartyAdaptorRpc-found' value='true' />","comments":"","x":1707.037956237793,"y":1408.0378227233887,"z":"31004b62.477bf4","wires":[]},{"id":"79dd5a51.2f85a4","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1635.0377197265625,"y":1554.37109375,"z":"31004b62.477bf4","wires":[["4f507407.937bfc"]]},{"id":"cba3bf5e.954aa","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1626.037769317627,"y":1522.8711194992065,"z":"31004b62.477bf4","wires":[["4f507407.937bfc"]]},{"id":"17b23395.dbf90c","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1629.7878074645996,"y":1493.2282243743539,"z":"31004b62.477bf4","wires":[["93386697.16bc58"]]},{"id":"4f507407.937bfc","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 calling ' + $tmp.thirdPartyAdaptorRpc`\" />\n","comments":"","x":1792.7878341674805,"y":1539.6211919784546,"z":"31004b62.477bf4","wires":[]},{"id":"93386697.16bc58","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1771.443775177002,"y":1489.420393563807,"z":"31004b62.477bf4","wires":[[]]},{"id":"3690625e.d2f00e","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1276.0377197265625,"y":1979.37109375,"z":"31004b62.477bf4","wires":[["1b7421e5.8ea83e"]]},{"id":"e24db978.0e77a8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1267.037769317627,"y":1947.8711194992065,"z":"31004b62.477bf4","wires":[["1b7421e5.8ea83e"]]},{"id":"8e8c53c2.06b4d","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1270.7878074645996,"y":1918.2282243743539,"z":"31004b62.477bf4","wires":[["8097800c.ac74a"]]},{"id":"1b7421e5.8ea83e","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 calling ' + $tmp.restapiUrl`\" />\n","comments":"","x":1433.7878341674805,"y":1964.6211919784546,"z":"31004b62.477bf4","wires":[]},{"id":"8097800c.ac74a","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1412.443775177002,"y":1914.420393563807,"z":"31004b62.477bf4","wires":[[]]},{"id":"f4a968f.a316c98","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1313.704345703125,"y":1629.482177734375,"z":"31004b62.477bf4","wires":[["55dd436d.edcdac"]]},{"id":"55dd436d.edcdac","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: 3rd party controller restapiUrl not found\" />\n    \n","comments":"","x":1484.704345703125,"y":1637.4821472167969,"z":"31004b62.477bf4","wires":[]},{"id":"58c5c70d.9bf9e8","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1318.704345703125,"y":1708.482177734375,"z":"31004b62.477bf4","wires":[["8c180413.9d4258"]]},{"id":"8c180413.9d4258","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: 3rd party controller restapiUser not found\" />\n    \n","comments":"","x":1489.704345703125,"y":1716.4821472167969,"z":"31004b62.477bf4","wires":[]},{"id":"d1647b0a.927598","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1309.704345703125,"y":1779.482177734375,"z":"31004b62.477bf4","wires":[["b96338ca.66ea18"]]},{"id":"b96338ca.66ea18","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: 3rd party controller restapiPassword not found\" />\n    \n","comments":"","x":1480.704345703125,"y":1787.4821472167969,"z":"31004b62.477bf4","wires":[]},{"id":"a4f48d87.24801","type":"switchNode","name":"switch network-parameter-name == 'actualId'","xml":"<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'actualId'`\">\n","comments":"","outputs":1,"x":1187.0312194824219,"y":1365.0312118530273,"z":"31004b62.477bf4","wires":[["57fdb4d9.05d2cc"]]},{"id":"57fdb4d9.05d2cc","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1464.0312309265137,"y":1363.031244277954,"z":"31004b62.477bf4","wires":[["6c430977.2e1378"]]},{"id":"6c430977.2e1378","type":"set","name":"set tmp.actualId","xml":"<set>\n<parameter name='tmp.actualId' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.actualId-found' value='true' />","comments":"","x":1665.0312614440918,"y":1361.0312452316284,"z":"31004b62.477bf4","wires":[]},{"id":"39947653.f85f4a","type":"switchNode","name":"switch actualId-found == 'true'","xml":"<switch test=\"`$tmp.actualId-found == 'true'`\">\n","comments":"","outputs":1,"x":918.2534484863281,"y":1869.4756698608398,"z":"31004b62.477bf4","wires":[["a40d6fae.4775a","fb284461.03b8e8"]]},{"id":"a40d6fae.4775a","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1178.2534484863281,"y":1869.4754600524902,"z":"31004b62.477bf4","wires":[["b12f1c0.9e26fe8"]]},{"id":"fb284461.03b8e8","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1323.4756469726562,"y":1847.697751045227,"z":"31004b62.477bf4","wires":[["4f11aa13.b448a4"]]},{"id":"4f11aa13.b448a4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Wan Connection actualId not found\" />\n    \n","comments":"","x":1494.4756469726562,"y":1855.697720527649,"z":"31004b62.477bf4","wires":[]},{"id":"b313d1c1.2c37a","type":"execute","name":"execute RestApiCallNode get wan-connection localId","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn_get_zte_template.json' `\" />\n<parameter name=\"restapiUrl\" value=\"http://10.80.80.21:8443/restconf/operations/ZTE-API-ConnectivityService:get-service-details\" />\n<parameter name=\"restapiUser\" value=\"admin\" />\n<parameter name=\"restapiPassword\" value=\"admin\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restApiResult\"/>","comments":"","outputs":1,"x":852.28125,"y":2180.0351576805115,"z":"31004b62.477bf4","wires":[["8962849f.6c5a68","d7eebf22.fa641","e40980f9.1a89d"]]},{"id":"e40980f9.1a89d","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1182.0376739501953,"y":2215.37424993515,"z":"31004b62.477bf4","wires":[["91ecae46.d5795"]]},{"id":"d7eebf22.fa641","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1173.0377235412598,"y":2183.8742756843567,"z":"31004b62.477bf4","wires":[["91ecae46.d5795"]]},{"id":"8962849f.6c5a68","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1176.7877616882324,"y":2154.231380559504,"z":"31004b62.477bf4","wires":[["872b8257.fbc9d"]]},{"id":"91ecae46.d5795","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 calling ' + $tmp.restapiUrl`\" />\n","comments":"","x":1371.787826538086,"y":2278.6242938041687,"z":"31004b62.477bf4","wires":[]},{"id":"bfe6e253.51bda","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":509.03125,"y":2184.0351576805115,"z":"31004b62.477bf4","wires":[["b313d1c1.2c37a","753f179e.1a3cb8","fdc15ea1.aa59e","79499f6e.7527e"]]},{"id":"345bec05.532ec4","type":"set","name":"set localId","xml":"<set>\n<parameter name='localId' value='`$restApiResult.output.normal-service.name[0].value`' />","comments":"","x":1002.7812957763672,"y":2416.0351824760437,"z":"31004b62.477bf4","wires":[]},{"id":"872b8257.fbc9d","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":889.78125,"y":2343.0351576805115,"z":"31004b62.477bf4","wires":[["345bec05.532ec4","10a30ef0.458841"]]},{"id":"10a30ef0.458841","type":"execute","name":"execute RestApiCallNode delete wan-connection","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn_delete_zte_template.json' `\" />\n<parameter name=\"restapiUrl\" value=\"http://10.80.80.21:8443/restconf/operations/ZTE-API-ConnectivityService:delete-connectivity-service\" />\n<parameter name=\"restapiUser\" value=\"admin\" />\n<parameter name=\"restapiPassword\" value=\"admin\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restApiResult\"/>","comments":"","outputs":1,"x":1130.78125,"y":2489.0351519584656,"z":"31004b62.477bf4","wires":[["a25154e0.87df68","679a24aa.00a63c","353afaed.168f16"]]},{"id":"353afaed.168f16","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1439.78125,"y":2520.0351576805115,"z":"31004b62.477bf4","wires":[["91ecae46.d5795"]]},{"id":"679a24aa.00a63c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1430.7812995910645,"y":2488.535183429718,"z":"31004b62.477bf4","wires":[["91ecae46.d5795"]]},{"id":"a25154e0.87df68","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1434.531337738037,"y":2458.8922883048654,"z":"31004b62.477bf4","wires":[["cbd0812b.40bcf"]]},{"id":"cbd0812b.40bcf","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1583.7813148498535,"y":2458.0351519584656,"z":"31004b62.477bf4","wires":[[]]},{"id":"724e66b1.0c1b28","type":"set","name":"set sotnServiceId","xml":"<set>\n<parameter name='sotnServiceId' value='73aa6033-a43e-3162-9bc9-085edc2b5a10' />","comments":"","x":1135.7813034057617,"y":2112.035325050354,"z":"31004b62.477bf4","wires":[]},{"id":"753f179e.1a3cb8","type":"for","name":"for pidx..network-input-parameters[]","xml":"<for index='paidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >\n","comments":"","outputs":1,"x":797.0312805175781,"y":2055.035241127014,"z":"31004b62.477bf4","wires":[["84cf10fb.c6987"]]},{"id":"84cf10fb.c6987","type":"switchNode","name":"switch svc-action","xml":"<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$paidx].name == 'localServiceId'`\">\n","comments":"","outputs":1,"x":1069.0312805175781,"y":2062.035241127014,"z":"31004b62.477bf4","wires":[["b5cb211.1443ee"]]},{"id":"b5cb211.1443ee","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1243.0312805175781,"y":2067.035241127014,"z":"31004b62.477bf4","wires":[["6c9015be.54aaec"]]},{"id":"6c9015be.54aaec","type":"set","name":"set localServiceId","xml":"<set>\n<parameter name='localServiceId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$paidx].value`' />\n<parameter name='isLocalIdFound' value='true' />","comments":"","x":1438.0312805175781,"y":2065.035241127014,"z":"31004b62.477bf4","wires":[]},{"id":"fdc15ea1.aa59e","type":"switchNode","name":"switch isLocalIdFound","xml":"<switch test=\"`$isLocalIdFound`\">\n","comments":"","outputs":1,"x":762.2813034057617,"y":2110.0352640151978,"z":"31004b62.477bf4","wires":[["529b0277.481b5c"]]},{"id":"529b0277.481b5c","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":957.2812652587891,"y":2110.0352640151978,"z":"31004b62.477bf4","wires":[["724e66b1.0c1b28"]]},{"id":"79499f6e.7527e","type":"set","name":"set isLocalIdFound","xml":"<set>\n<parameter name='isLocalIdFound' value='false' />","comments":"","x":739.28125,"y":2007.0351572036743,"z":"31004b62.477bf4","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
index f2e71fad..b7b21b0b 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
@@ -1,443 +1,247 @@
-<?xml version="1.0" encoding="utf-8"?>
+<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'><method rpc='network-topology-operation' mode='sync'>
+<block atomic="true"><call module='GENERIC-RESOURCE-API' rpc='validate-network-input' mode='sync' >
+</call><switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>
+<outcome value='assign'>
+<block atomic="true"><switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
+<outcome value='Created'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Network is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" /></return></outcome><outcome value='PendingDelete'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Network is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" /></return></outcome><outcome value='PendingCreate'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Network is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" /></return></outcome><outcome value='Other'>
+<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign' mode='sync' >
+</call></outcome></switch></block></outcome><outcome value='activate'>
+<switch test='`$network-topology-operation-input.request-information.request-action`'>
+<outcome value='ActivateSOTNConnectivityInstance'><call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-activate' mode='sync' >
+</call></outcome><outcome value='ActivateDCINetworkInstance'><call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-activate' mode='sync' >
+</call></outcome><outcome value='ActivateSDWANConnectivityInstance'><call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-activate' mode='sync' >
+</call></outcome><outcome value='ActivateNetworkInstance'><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true'>
+    <parameter name="source" value="`$network-topology-operation-input.service-information.onap-model-information.model-name`"/>
+    <parameter name="target" value="WanConnection"/>
+<outcome value='true'>
+<call module='GENERIC-RESOURCE-API' rpc='wan-connection-topology-operation-activate' mode='sync' >
+</call></outcome><outcome value='false'>
+<block atomic="true"><switch test='`$service-data.networks.network_length`'>
+<outcome value=''>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+</return></outcome><outcome value='Other'>
+<block atomic="true"><for index='nidx' start='0' end='`$service-data.networks.network_length`' >
+<switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
 
-<service-logic xmlns="http://www.onap.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">
-  <method rpc="network-topology-operation" mode="sync"> 
-    <block atomic="true">
-      <call module="GENERIC-RESOURCE-API" rpc="validate-network-input" mode="sync"></call>
-      <switch test="`$network-topology-operation-input.sdnc-request-header.svc-action`"> 
-        <outcome value="assign"> 
-          <block atomic="true">
-            <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`"> 
-              <outcome value="Created"> 
-                <return status="failure"> 
-                  <parameter name="ack-final" value="Y"/>  
-                  <parameter name="error-code" value="500"/>  
-                  <parameter name="error-message" value="`'Network is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`"/>
-                </return>
-              </outcome>
-              <outcome value="PendingDelete"> 
-                <return status="failure"> 
-                  <parameter name="ack-final" value="Y"/>  
-                  <parameter name="error-code" value="500"/>  
-                  <parameter name="error-message" value="`'Network is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`"/>
-                </return>
-              </outcome>
-              <outcome value="PendingCreate"> 
-                <return status="failure"> 
-                  <parameter name="ack-final" value="Y"/>  
-                  <parameter name="error-code" value="500"/>  
-                  <parameter name="error-message" value="`'Network is not in appropriate state for assign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`"/>
-                </return>
-              </outcome>
-              <outcome value="Other"> 
-                <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-assign" mode="sync"></call>
-              </outcome>
-            </switch>
-          </block>
-        </outcome>
-        <outcome value="activate"> 
-          <switch test="`$network-topology-operation-input.request-information.request-action`"> 
-            <outcome value="ActivateSOTNConnectivityInstance">
-              <call module="GENERIC-RESOURCE-API" rpc="sotn-network-topology-operation-activate" mode="sync"></call>
-            </outcome>
-            <outcome value="ActivateDCINetworkInstance">
-              <call module="GENERIC-RESOURCE-API" rpc="dci-connects-network-topology-operation-activate" mode="sync"></call>
-            </outcome>
-            <outcome value="ActivateSDWANConnectivityInstance">
-              <call module="GENERIC-RESOURCE-API" rpc="sdwan-network-topology-operation-activate" mode="sync"></call>
-            </outcome>
-            <outcome value="other">
-              <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="contains"> 
-                <parameter name="source" value="`$network-topology-operation-input.service-information.onap-model-information.model-name`"/>  
-                <parameter name="target" value="wan-connection"/>  
-                <outcome value="true"> 
-                  <call module="GENERIC-RESOURCE-API" rpc="wan-connection-topology-operation-activate" mode="sync"></call>
-                </outcome>
-                <outcome value="false"> 
-                  <block atomic="true">
-                    <switch test="`$service-data.networks.network_length`"> 
-                      <outcome value=""> 
-                        <return status="failure"> 
-                          <parameter name="ack-final" value="Y"/>  
-                          <parameter name="error-code" value="500"/>  
-                          <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data"/> 
-                        </return>
-                      </outcome>
-                      <outcome value="Other"> 
-                        <block atomic="true">
-                          <for index="nidx" start="0" end="`$service-data.networks.network_length`"> 
-                            <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`"> 
-                              <outcome value="true"> 
-                                <set> 
-                                  <parameter name="tmp.nidx" value="`$nidx`"/>  
-                                  <parameter name="network-data." value="`$service-data.networks.network[$nidx].`"/> 
-                                </set>
-                              </outcome>
-                            </switch>
-                          </for>
-                          <switch test="`$tmp.nidx`"> 
-                            <outcome value=""> 
-                              <return status="failure"> 
-                                <parameter name="ack-final" value="Y"/>  
-                                <parameter name="error-code" value="500"/>  
-                                <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data"/> 
-                              </return>
-                            </outcome>
-                            <outcome value="Other"> 
-                              <set> 
-                                <parameter name="nidx" value="`$tmp.nidx`"/> 
-                              </set>
-                            </outcome>
-                          </switch>
-                        </block>
-                      </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-information.network-instance-group-id`"> 
-                      <outcome value="">
-                        <return status="success"></return>
-                      </outcome>
-                      <outcome value="Other">
-                        <block> 
-                          <switch test="`$service-data.network-instance-groups.network-instance-group_length`"> 
-                            <outcome value=""> 
-                              <return status="failure"> 
-                                <parameter name="ack-final" value="Y"/>  
-                                <parameter name="error-code" value="500"/>  
-                                <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data"/> 
-                              </return>
-                            </outcome>
-                            <outcome value="Other"> 
-                              <block atomic="true">
-                                <for index="ngidx" start="0" end="`$service-data.network-instance-groups.network-instance-_length`"> 
-                                  <switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`"> 
-                                    <outcome value="true"> 
-                                      <block atomic="true">
-                                        <set> 
-                                          <parameter name="tmp.ngidx" value="`$ngidx`"/>  
-                                          <parameter name="ctx.network-instance-group-data." value="`$service-data.network-instance-groups.network-instance-group[$ngidx].`"/> 
-                                        </set>
-                                      </block>
-                                    </outcome>
-                                  </switch>
-                                </for>
-                              </block>
-                            </outcome>
-                          </switch>
-                        </block>
-                      </outcome>
-                    </switch>
-                    <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`"> 
-                      <outcome value="PendingCreate"> 
-                        <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-activate" mode="sync"></call>
-                      </outcome>
-                      <outcome value="Other"> 
-                        <return status="failure"> 
-                          <parameter name="ack-final" value="Y"/>  
-                          <parameter name="error-code" value="500"/>  
-                          <parameter name="error-message" value="`'Network is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`"/>
-                        </return>
-                      </outcome>
-                    </switch>
-                  </block>
-                </outcome>
-              </execute>
-            </outcome>
-          </switch>
-        </outcome>
-        <outcome value="changeassign">
-          <block atomic="true">
-            <switch test="`$service-data.networks.network_length`"> 
-              <outcome value=""> 
-                <return status="failure"> 
-                  <parameter name="ack-final" value="Y"/>  
-                  <parameter name="error-code" value="500"/>  
-                  <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data"/> 
-                </return>
-              </outcome>
-              <outcome value="Other"> 
-                <block atomic="true">
-                  <for index="nidx" start="0" end="`$service-data.networks.network_length`"> 
-                    <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`"> 
-                      <outcome value="true"> 
-                        <set> 
-                          <parameter name="tmp.nidx" value="`$nidx`"/>  
-                          <parameter name="network-data." value="`$service-data.networks.network[$nidx].`"/> 
-                        </set>
-                      </outcome>
-                    </switch>
-                  </for>
-                  <switch test="`$tmp.nidx`"> 
-                    <outcome value=""> 
-                      <return status="failure"> 
-                        <parameter name="ack-final" value="Y"/>  
-                        <parameter name="error-code" value="500"/>  
-                        <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data"/> 
-                      </return>
-                    </outcome>
-                    <outcome value="Other"> 
-                      <set> 
-                        <parameter name="nidx" value="`$tmp.nidx`"/> 
-                      </set>
-                    </outcome>
-                  </switch>
-                </block>
-              </outcome>
-            </switch>
-            <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-changeassign" mode="sync"></call>
-          </block>
-        </outcome>
-        <outcome value="deactivate"> 
-          <switch test="`$network-topology-operation-input.request-information.request-action`"> 
-            <outcome value="DeactivateSOTNConnectivityInstance">
-              <call module="GENERIC-RESOURCE-API" rpc="sotn-network-topology-operation-deactivate" mode="sync"></call>
-            </outcome>
-            <outcome value="DeActivateDCINetworkInstance">
-              <call module="GENERIC-RESOURCE-API" rpc="dci-connects-network-topology-operation-deactivate" mode="sync"></call>
-            </outcome>
-            <outcome value="DeactivateSDWANConnectivityInstance">
-              <call module="GENERIC-RESOURCE-API" rpc="sdwan-network-topology-operation-deactivate" mode="sync"></call>
-            </outcome>
-            <outcome value="Other"> 
-              <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="contains"> 
-                <parameter name="source" value="`$network-topology-operation-input.service-information.onap-model-information.model-name`"/>  
-                <parameter name="target" value="wan-connection"/>  
-                <outcome value="true"> 
-                  <call module="GENERIC-RESOURCE-API" rpc="wan-connection-topology-operation-deactivate" mode="sync"></call>
-                </outcome>
-                <outcome value="false"> 
-                  <block atomic="true">
-                    <switch test="`$service-data.networks.network_length`"> 
-                      <outcome value=""> 
-                        <return status="failure"> 
-                          <parameter name="ack-final" value="Y"/>  
-                          <parameter name="error-code" value="500"/>  
-                          <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data"/> 
-                        </return>
-                      </outcome>
-                      <outcome value="Other"> 
-                        <block atomic="true">
-                          <for index="nidx" start="0" end="`$service-data.networks.network_length`"> 
-                            <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`"> 
-                              <outcome value="true"> 
-                                <set> 
-                                  <parameter name="tmp.nidx" value="`$nidx`"/>  
-                                  <parameter name="network-data." value="`$service-data.networks.network[$nidx].`"/> 
-                                </set>
-                              </outcome>
-                            </switch>
-                          </for>
-                          <switch test="`$tmp.nidx`"> 
-                            <outcome value=""> 
-                              <return status="failure"> 
-                                <parameter name="ack-final" value="Y"/>  
-                                <parameter name="error-code" value="500"/>  
-                                <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data"/> 
-                              </return>
-                            </outcome>
-                            <outcome value="Other"> 
-                              <set> 
-                                <parameter name="nidx" value="`$tmp.nidx`"/> 
-                              </set>
-                            </outcome>
-                          </switch>
-                        </block>
-                      </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-information.network-instance-group-id`"> 
-                      <outcome value="">
-                        <return status="success"></return>
-                      </outcome>
-                      <outcome value="Other">
-                        <block> 
-                          <switch test="`$service-data.network-instance-groups.network-instance-group_length`"> 
-                            <outcome value=""> 
-                              <return status="failure"> 
-                                <parameter name="ack-final" value="Y"/>  
-                                <parameter name="error-code" value="500"/>  
-                                <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data"/> 
-                              </return>
-                            </outcome>
-                            <outcome value="Other"> 
-                              <block atomic="true">
-                                <for index="ngidx" start="0" end="`$service-data.network-instance-groups.network-instance-_length`"> 
-                                  <switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`"> 
-                                    <outcome value="true"> 
-                                      <block atomic="true">
-                                        <set> 
-                                          <parameter name="tmp.ngidx" value="`$ngidx`"/>  
-                                          <parameter name="ctx.network-instance-group-data." value="`$service-data.network-instance-groups.network-instance-group[$ngidx].`"/> 
-                                        </set>
-                                      </block>
-                                    </outcome>
-                                  </switch>
-                                </for>
-                              </block>
-                            </outcome>
-                          </switch>
-                        </block>
-                      </outcome>
-                    </switch>
-                    <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-deactivate" mode="sync"></call>
-                  </block>
-                </outcome>
-              </execute>
-            </outcome>
-          </switch>
-        </outcome>
-        <outcome value="unassign"> 
-          <block atomic="true">
-            <switch test="`$service-data.networks.network_length`"> 
-              <outcome value=""> 
-                <return status="failure"> 
-                  <parameter name="ack-final" value="Y"/>  
-                  <parameter name="error-code" value="500"/>  
-                  <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data"/> 
-                </return>
-              </outcome>
-              <outcome value="Other"> 
-                <block atomic="true">
-                  <for index="nidx" start="0" end="`$service-data.networks.network_length`"> 
-                    <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`"> 
-                      <outcome value="true"> 
-                        <set> 
-                          <parameter name="tmp.nidx" value="`$nidx`"/>  
-                          <parameter name="network-data." value="`$service-data.networks.network[$nidx].`"/> 
-                        </set>
-                      </outcome>
-                    </switch>
-                  </for>
-                  <switch test="`$tmp.nidx`"> 
-                    <outcome value=""> 
-                      <return status="failure"> 
-                        <parameter name="ack-final" value="Y"/>  
-                        <parameter name="error-code" value="500"/>  
-                        <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data"/> 
-                      </return>
-                    </outcome>
-                    <outcome value="Other"> 
-                      <set> 
-                        <parameter name="nidx" value="`$tmp.nidx`"/> 
-                      </set>
-                    </outcome>
-                  </switch>
-                </block>
-              </outcome>
-            </switch>
-            <switch test="`$network-topology-operation-input.network-information.network-instance-group-id`"> 
-              <outcome value="">
-                <return status="success"></return>
-              </outcome>
-              <outcome value="Other">
-                <block> 
-                  <switch test="`$service-data.network-instance-groups.network-instance-group_length`"> 
-                    <outcome value=""> 
-                      <return status="failure"> 
-                        <parameter name="ack-final" value="Y"/>  
-                        <parameter name="error-code" value="500"/>  
-                        <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data"/> 
-                      </return>
-                    </outcome>
-                    <outcome value="Other"> 
-                      <block atomic="true">
-                        <for index="ngidx" start="0" end="`$service-data.network-instance-groups.network-instance-_length`"> 
-                          <switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`"> 
-                            <outcome value="true"> 
-                              <block atomic="true">
-                                <set> 
-                                  <parameter name="tmp.ngidx" value="`$ngidx`"/>  
-                                  <parameter name="ctx.network-instance-group-data." value="`$service-data.network-instance-groups.network-instance-group[$ngidx].`"/> 
-                                </set>
-                              </block>
-                            </outcome>
-                          </switch>
-                        </for>
-                      </block>
-                    </outcome>
-                  </switch>
-                </block>
-              </outcome>
-            </switch>
-            <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`"> 
-              <outcome value="PendingCreate"> 
-                <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-unassign" mode="sync"></call>
-              </outcome>
-              <outcome value="PendingDelete"> 
-                <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-unassign" mode="sync"></call>
-              </outcome>
-              <outcome value="Other"> 
-                <return status="failure"> 
-                  <parameter name="ack-final" value="Y"/>  
-                  <parameter name="error-code" value="500"/>  
-                  <parameter name="error-message" value="`'Network is not in appropriate state for unassign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`"/>
-                </return>
-              </outcome>
-            </switch>
-          </block>
-        </outcome>
-        <outcome value="create"> 
-          <switch test="`$network-topology-operation-input.request-information.request-action`"> 
-            <outcome value="CreateSOTNConnectivityInstance">
-              <call module="GENERIC-RESOURCE-API" rpc="sotn-network-topology-operation-create" mode="sync"></call>
-            </outcome>
-            <outcome value="CreateSDWANConnectivityInstance">
-              <call module="GENERIC-RESOURCE-API" rpc="sdwan-network-topology-operation-create" mode="sync"></call>
-            </outcome>
-            <outcome value="other">
-              <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="contains"> 
-                <parameter name="source" value="`$network-topology-operation-input.service-information.onap-model-information.model-name`"/>  
-                <parameter name="target" value="wan-connection"/>  
-                <outcome value="true"> 
-                  <call module="GENERIC-RESOURCE-API" rpc="wan-connection-topology-operation-create" mode="sync"></call>
-                </outcome>
-                <outcome value="false"> 
-                  <block atomic="true">
-                    <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-create" mode="sync"></call>
-                  </block>
-                </outcome>
-              </execute>
-            </outcome>
-          </switch>
-        </outcome>
-        <outcome value="delete"> 
-          <switch test="`$network-topology-operation-input.request-information.request-action`"> 
-            <outcome value="DeleteSOTNConnectivityInstance">
-              <call module="GENERIC-RESOURCE-API" rpc="sotn-network-topology-operation-delete" mode="sync"></call>
-            </outcome>
-            <outcome value="DeleteSDWANConnectivityInstance">
-              <call module="GENERIC-RESOURCE-API" rpc="sdwan-network-topology-operation-delete" mode="sync"></call>
-            </outcome>
-            <outcome value="other">
-              <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="contains"> 
-                <parameter name="source" value="`$network-topology-operation-input.service-information.onap-model-information.model-name`"/>  
-                <parameter name="target" value="wan-connection"/>  
-                <outcome value="true"> 
-                  <call module="GENERIC-RESOURCE-API" rpc="wan-connection-topology-operation-deactivate" mode="sync"></call>
-                </outcome>
-                <outcome value="false"> 
-                  <block atomic="true">
-                    <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-delete" mode="sync"></call>
-                  </block>
-                </outcome>
-              </execute>
-            </outcome>
-          </switch>
-        </outcome>
-        <outcome value="Other"> 
-          <return status="failure"> 
-            <parameter name="ack-final" value="Y"/>  
-            <parameter name="error-code" value="500"/>  
-            <parameter name="error-message" value="sdnc-request-header.svc-action is a required input"/> 
-          </return>
-        </outcome>
-      </switch>
-      <set> 
-        <parameter name="ack-final" value="Y"/>
-      </set>
-      <return status="success"> 
-        <parameter name="ack-final-indicator" value="Y"/>  
-        <parameter name="error-code" value="200"/>  
-        <parameter name="error-message" value="`$error-message`"/> 
-      </return>
-    </block>
-  </method>
-</service-logic>
+<outcome value='true'>
+<set>
+<parameter name='tmp.nidx' value='`$nidx`' />
+<parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
+</set></outcome></switch></for><switch test="`$tmp.nidx`">
+
+<outcome value=''>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+</return></outcome><outcome value='Other'>
+<set>
+<parameter name='nidx' value='`$tmp.nidx`' />
+</set></outcome></switch></block></outcome></switch><switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>
+
+<outcome value=''><return status='success'>
+</return></outcome><outcome value='Other'><block>
+<switch test='`$service-data.network-instance-groups.network-instance-group_length`'>
+<outcome value=''>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data" />
+</return></outcome><outcome value='Other'>
+<block atomic="true"><for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >
+<switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`">
+
+<outcome value='true'>
+<block atomic="true"><set>
+<parameter name='tmp.ngidx' value='`$ngidx`' />
+<parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />
+</set></block></outcome></switch></for></block></outcome></switch></block></outcome></switch><switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
+<outcome value='PendingCreate'>
+<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-activate' mode='sync' >
+</call></outcome><outcome value='Other'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Network is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" /></return></outcome></switch></block></outcome></execute></outcome></switch></outcome><outcome value='changeassign'><block atomic="true"><switch test='`$service-data.networks.network_length`'>
+<outcome value=''>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+</return></outcome><outcome value='Other'>
+<block atomic="true"><for index='nidx' start='0' end='`$service-data.networks.network_length`' >
+<switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
+
+<outcome value='true'>
+<set>
+<parameter name='tmp.nidx' value='`$nidx`' />
+<parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
+</set></outcome></switch></for><switch test="`$tmp.nidx`">
+
+<outcome value=''>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+</return></outcome><outcome value='Other'>
+<set>
+<parameter name='nidx' value='`$tmp.nidx`' />
+</set></outcome></switch></block></outcome></switch><call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-changeassign' mode='sync' >
+</call></block></outcome><outcome value='deactivate'>
+<switch test='`$network-topology-operation-input.request-information.request-action`'>
+<outcome value='DeactivateSOTNConnectivityInstance'><call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-deactivate' mode='sync' >
+</call></outcome><outcome value='DeActivateDCINetworkInstance'><call module='GENERIC-RESOURCE-API' rpc='dci-connects-network-topology-operation-deactivate' mode='sync' >
+</call></outcome><outcome value='DeactivateSDWANConnectivityInstance'><call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-deactivate' mode='sync' >
+</call></outcome><outcome value='DeActivateNetworkInstance'>
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.service-information.onap-model-information.model-name`"/>
+    <parameter name="target" value="WanConnection"/>
+<outcome value='true'>
+<call module='GENERIC-RESOURCE-API' rpc='wan-connection-topology-operation-deactivate' mode='sync' >
+</call></outcome><outcome value='false'>
+<block atomic="true"><switch test='`$service-data.networks.network_length`'>
+<outcome value=''>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+</return></outcome><outcome value='Other'>
+<block atomic="true"><for index='nidx' start='0' end='`$service-data.networks.network_length`' >
+<switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
+
+<outcome value='true'>
+<set>
+<parameter name='tmp.nidx' value='`$nidx`' />
+<parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
+</set></outcome></switch></for><switch test="`$tmp.nidx`">
+
+<outcome value=''>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+</return></outcome><outcome value='Other'>
+<set>
+<parameter name='nidx' value='`$tmp.nidx`' />
+</set></outcome></switch></block></outcome></switch><switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>
+
+<outcome value=''><return status='success'>
+</return></outcome><outcome value='Other'><block>
+<switch test='`$service-data.network-instance-groups.network-instance-group_length`'>
+<outcome value=''>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data" />
+</return></outcome><outcome value='Other'>
+<block atomic="true"><for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >
+<switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`">
+
+<outcome value='true'>
+<block atomic="true"><set>
+<parameter name='tmp.ngidx' value='`$ngidx`' />
+<parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />
+</set></block></outcome></switch></for></block></outcome></switch></block></outcome></switch><call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-deactivate' mode='sync' >
+</call></block></outcome></execute></outcome></switch></outcome><outcome value='unassign'>
+<block atomic="true"><switch test='`$service-data.networks.network_length`'>
+<outcome value=''>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+</return></outcome><outcome value='Other'>
+<block atomic="true"><for index='nidx' start='0' end='`$service-data.networks.network_length`' >
+<switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
+
+<outcome value='true'>
+<set>
+<parameter name='tmp.nidx' value='`$nidx`' />
+<parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
+</set></outcome></switch></for><switch test="`$tmp.nidx`">
+
+<outcome value=''>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+</return></outcome><outcome value='Other'>
+<set>
+<parameter name='nidx' value='`$tmp.nidx`' />
+</set></outcome></switch></block></outcome></switch><switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>
+
+<outcome value=''><return status='success'>
+</return></outcome><outcome value='Other'><block>
+<switch test='`$service-data.network-instance-groups.network-instance-group_length`'>
+<outcome value=''>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-instance-group-id not found in service-data" />
+</return></outcome><outcome value='Other'>
+<block atomic="true"><for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >
+<switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`">
+
+<outcome value='true'>
+<block atomic="true"><set>
+<parameter name='tmp.ngidx' value='`$ngidx`' />
+<parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />
+</set></block></outcome></switch></for></block></outcome></switch></block></outcome></switch><switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>
+<outcome value='PendingCreate'>
+<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' >
+</call></outcome><outcome value='PendingDelete'>
+<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' >
+</call></outcome><outcome value='Other'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Network is not in appropriate state for unassign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" /></return></outcome></switch></block></outcome><outcome value='create'>
+<switch test='`$network-topology-operation-input.request-information.request-action`'>
+<outcome value='CreateSOTNConnectivityInstance'><call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-create' mode='sync' >
+</call></outcome><outcome value='CreateSDWANConnectivityInstance'><call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-create' mode='sync' >
+</call></outcome><outcome value='CreateNetworkInstance'><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.service-information.onap-model-information.model-name`"/>
+    <parameter name="target" value="WanConnection"/>
+<outcome value='true'>
+<call module='GENERIC-RESOURCE-API' rpc='wan-connection-topology-operation-create' mode='sync' >
+</call></outcome><outcome value='false'>
+<block atomic="true"><call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-create' mode='sync' >
+</call></block></outcome></execute></outcome></switch></outcome><outcome value='delete'>
+<switch test='`$network-topology-operation-input.request-information.request-action`'>
+<outcome value='DeleteSOTNConnectivityInstance'><call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-delete' mode='sync' >
+</call></outcome><outcome value='DeleteSDWANConnectivityInstance'><call module='GENERIC-RESOURCE-API' rpc='sdwan-network-topology-operation-delete' mode='sync' >
+</call></outcome><outcome value='DeleteNetworkInstance'><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.service-information.onap-model-information.model-name`"/>
+    <parameter name="target" value="WanConnection"/>
+<outcome value='true'>
+<call module='GENERIC-RESOURCE-API' rpc='wan-connection-topology-operation-deactivate' mode='sync' >
+</call></outcome><outcome value='false'>
+<block atomic="true"><call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-delete' mode='sync' >
+</call></block></outcome></execute></outcome></switch></outcome><outcome value='reoptimize'>
+<switch test='`$network-topology-operation-input.request-information.request-action`'>
+<outcome value='ReoptimizeSOTNInstance'><call module='GENERIC-RESOURCE-API' rpc='sotn-network-topology-operation-reoptimize' mode='sync' >
+</call></outcome></switch></outcome><outcome value='Other'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="sdnc-request-header.svc-action is a required input" />
+</return></outcome></switch><set>
+<parameter name="ack-final" value="Y"/></set><return status='success'>
+<parameter name="ack-final-indicator" value="Y" />
+<parameter name="error-code" value="200" />
+<parameter name="error-message" value="`$error-message`" />
+</return></block></method></service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.xml
index fbae8f81..b0664205 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.xml
@@ -1,217 +1,428 @@
-<?xml version="1.0" encoding="utf-8"?>
+<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'><method rpc='wan-connection-topology-operation-activate' mode='sync'>
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.network-information.onap-model-information.model-name`"/>
+    <parameter name="target" value="specification"/>
+<outcome value='true'>
+<return status='success'>
+<parameter name="ack-final-indicator" value="Y" />
+<parameter name="error-code" value="200" />
+<parameter name="error-message" value="`$error-message`" />
+</return></outcome><outcome value='false'>
+<block atomic="true"><execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+    <parameter name='contextPrefix' value='prop' />
+</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.network-information.onap-model-information.model-name`"/>
+    <parameter name="target" value="Fc"/>
+<outcome value='true'>
+<block atomic="true"><set>
+<parameter name='needOof' value='false' /></set><for index='aidx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$aidx].name`"/>
+    <parameter name="target" value="fcport"/>
+<outcome value='true'>
+<set>
+<parameter name='needOof' value='true' /></set></outcome></execute></for><switch test="`$needOof`">
 
-<service-logic xmlns="http://www.onap.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">
-  <method rpc="wan-connection-topology-operation-activate" mode="sync"> 
-    <block atomic="true">
-      <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties"> 
-        <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties"/>  
-        <parameter name="contextPrefix" value="prop"/> 
-      </execute>
-      <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace"> 
-        <parameter name="source" value="`$prop.network-provided-resource`"/>  
-        <parameter name="outputPath" value="tmp.services-url"/>  
-        <parameter name="target" value="{service-instance-id}"/>  
-        <parameter name="replacement" value="`$network-topology-operation-input.service-information.service-id`"/> 
-      </execute>
-      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> 
-        <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.services-url`"/>  
-        <parameter name="restapiUser" value="`$prop.controller.user`"/>  
-        <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>  
-        <parameter name="format" value="json"/>  
-        <parameter name="httpMethod" value="GET"/>  
-        <parameter name="responsePrefix" value="mdsal-psd"/>  
-        <outcome value="success"> 
-          <block></block>
-        </outcome>
-        <outcome value="Other"> 
-          <return status="failure"> 
-            <parameter name="ack-final" value="Y"/>  
-            <parameter name="error-code" value="404"/>  
-            <parameter name="error-message" value="Error: Parent service data not available"/> 
-          </return>
-        </outcome>
-      </execute>
-      <set> 
-        <parameter name="tmp.found-network-input" value="false"/>
-      </set>
-      <for index="pidx" start="0" end="`$mdsal-psd.service-data.networks.network_length`"> 
-        <switch test="`$mdsal-psd.service-data.networks.network[$pidx].network-data.network-information.onap-model-information.model-name == $network-topology-operation-input.network-information.onap-model-information.model-name`"> 
-          <outcome value="true"> 
-            <block atomic="true">
-              <set> 
-                <parameter name="tmp.pidx" value="`$pidx`"/>  
-                <parameter name="tmp.network." value="`$mdsal-psd.service-data.networks.network[$pidx].`"/>  
-                <parameter name="tmp.network-input-parameters" value="`$mdsal-psd.service-data.networks.network[$pidx].network-data.network-request-input.network-input-parameters`"/>  
-                <parameter name="tmp.found-network-input" value="true"/>
-              </set>
-            </block>
-          </outcome>
-        </switch>
-      </for>
-      <switch test="`$found-network-input`"> 
-        <outcome value="false"> 
-          <return status="failure"> 
-            <parameter name="ack-final" value="Y"/>  
-            <parameter name="error-code" value="404"/>  
-            <parameter name="error-message" value="Error: Network input parameters not found"/> 
-          </return>
-        </outcome>
-        <outcome value="true"> 
-          <block atomic="true">
-            <set> 
-              <parameter name="tmp.restapiUrl-found" value="false"/>  
-              <parameter name="tmp.restapiUser-found" value="false"/>  
-              <parameter name="tmp.restapiPassword-found" value="false"/>  
-              <parameter name="tmp.templateFileName-found" value="false"/>  
-              <parameter name="tmp.thirdPartyAdaptorRpc-found" value="false"/>
-            </set>
-            <for index="cidx" start="0" end="`$tmp.network.network-data.network-topology.network-parameters.network-parameter_length`"> 
-              <block> 
-                <switch test="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiUrl'`"> 
-                  <outcome value="true"> 
-                    <set> 
-                      <parameter name="tmp.restapiUrl" value="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`"/>  
-                      <parameter name="tmp.restapiUrl-found" value="true"/>
-                    </set>
-                  </outcome>
-                </switch>
-                <switch test="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiUser'`"> 
-                  <outcome value="true"> 
-                    <set> 
-                      <parameter name="tmp.restapiUser" value="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`"/>  
-                      <parameter name="tmp.restapiUser-found" value="true"/>
-                    </set>
-                  </outcome>
-                </switch>
-                <switch test="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiPassword'`"> 
-                  <outcome value="true"> 
-                    <set> 
-                      <parameter name="tmp.restapiPassword" value="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`"/>  
-                      <parameter name="tmp.restapiPassword-found" value="true"/>
-                    </set>
-                  </outcome>
-                </switch>
-                <switch test="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'templateFileName'`"> 
-                  <outcome value="true"> 
-                    <set> 
-                      <parameter name="tmp.templateFileName" value="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`"/>  
-                      <parameter name="tmp.templateFileName-found" value="true"/>
-                    </set>
-                  </outcome>
-                </switch>
-                <switch test="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'thirdPartyAdaptorRpc'`"> 
-                  <outcome value="true"> 
-                    <set> 
-                      <parameter name="tmp.thirdPartyAdaptorRpc" value="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`"/>  
-                      <parameter name="tmp.thirdPartyAdaptorRpc-found" value="true"/>
-                    </set>
-                  </outcome>
-                </switch>
-              </block>
-            </for>
-            <switch test="`$tmp.thirdPartyAdaptorRpc-found == 'true'`"> 
-              <outcome value="true"> 
-                <call module="GENERIC-RESOURCE-API" rpc="`$tmp.thirdPartyAdaptorRpc`" mode="sync"> 
-                  <outcome value="success"> 
-                    <block></block>
-                  </outcome>
-                  <outcome value="failure"> 
-                    <return status="failure"> 
-                      <parameter name="ack-final" value="Y"/>  
-                      <parameter name="error-code" value="500"/>  
-                      <parameter name="error-message" value="`'Error calling ' + $tmp.thirdPartyAdaptorRpc`"/> 
-                    </return>
-                  </outcome>
-                  <outcome value="not-found"> 
-                    <return status="failure"> 
-                      <parameter name="ack-final" value="Y"/>  
-                      <parameter name="error-code" value="500"/>  
-                      <parameter name="error-message" value="`'Error calling ' + $tmp.thirdPartyAdaptorRpc`"/> 
-                    </return>
-                  </outcome>
-                </call>
-              </outcome>
-              <outcome value="false"> 
-                <switch test="`$tmp.restapiUrl-found == 'true'`"> 
-                  <outcome value="false"> 
-                    <return status="failure"> 
-                      <parameter name="ack-final" value="Y"/>  
-                      <parameter name="error-code" value="404"/>  
-                      <parameter name="error-message" value="Error: 3rd party controller restapiUrl not found"/> 
-                    </return>
-                  </outcome>
-                  <outcome value="true"> 
-                    <switch test="`$tmp.restapiUser-found == 'true'`"> 
-                      <outcome value="false"> 
-                        <return status="failure"> 
-                          <parameter name="ack-final" value="Y"/>  
-                          <parameter name="error-code" value="404"/>  
-                          <parameter name="error-message" value="Error: 3rd party controller restapiUser not found"/> 
-                        </return>
-                      </outcome>
-                      <outcome value="true"> 
-                        <switch test="`$tmp.restapiPassword-found == 'true'`"> 
-                          <outcome value="false"> 
-                            <return status="failure"> 
-                              <parameter name="ack-final" value="Y"/>  
-                              <parameter name="error-code" value="404"/>  
-                              <parameter name="error-message" value="Error: 3rd party controller restapiPassword not found"/> 
-                            </return>
-                          </outcome>
-                          <outcome value="true"> 
-                            <switch test="`$tmp.templateFileName-found == 'true'`"> 
-                              <outcome value="false"> 
-                                <return status="failure"> 
-                                  <parameter name="ack-final" value="Y"/>  
-                                  <parameter name="error-code" value="404"/>  
-                                  <parameter name="error-message" value="Error: 3rd party controller templateFileName not found"/> 
-                                </return>
-                              </outcome>
-                              <outcome value="true"> 
-                                <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> 
-                                  <parameter name="templateFileName" value="`$tmp.templateFileName`"/>  
-                                  <parameter name="restapiUrl" value="`$tmp.restapiUrl`"/>  
-                                  <parameter name="restapiUser" value="`$tmp.restapiUser`"/>  
-                                  <parameter name="restapiPassword" value="`$tmp.restapiPassword`"/>  
-                                  <parameter name="format" value="json"/>  
-                                  <parameter name="httpMethod" value="post"/>  
-                                  <parameter name="responsePrefix" value="restApi-result"/>
-                                  <outcome value="success"> 
-                                    <block></block>
-                                  </outcome>
-                                  <outcome value="failure"> 
-                                    <return status="failure"> 
-                                      <parameter name="ack-final" value="Y"/>  
-                                      <parameter name="error-code" value="500"/>  
-                                      <parameter name="error-message" value="`'Error calling ' + $tmp.restapiUrl`"/> 
-                                    </return>
-                                  </outcome>
-                                  <outcome value="not-found"> 
-                                    <return status="failure"> 
-                                      <parameter name="ack-final" value="Y"/>  
-                                      <parameter name="error-code" value="500"/>  
-                                      <parameter name="error-message" value="`'Error calling ' + $tmp.restapiUrl`"/> 
-                                    </return>
-                                  </outcome>
-                                </execute>
-                              </outcome>
-                            </switch>
-                          </outcome>
-                        </switch>
-                      </outcome>
-                    </switch>
-                  </outcome>
-                </switch>
-              </outcome>
-            </switch>
-          </block>
-        </outcome>
-      </switch>
-      <return status="success"> 
-        <parameter name="ack-final-indicator" value="Y"/>  
-        <parameter name="error-code" value="200"/>  
-        <parameter name="error-message" value="`$error-message`"/> 
-      </return>
-    </block>
-  </method>
-</service-logic>
+<outcome value='true'>
+<block>
+<block atomic="true"><set>
+<parameter name='sotnFcPortListLength' value='0' /></set><for index='sIdx' start='0' end='`$service-data.networks.network_length`' >
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$service-data.networks.network[$sIdx].network-data.network-information.onap-model-information.model-name`"/>
+    <parameter name="target" value="sotn"/>
+<outcome value='true'>
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$service-data.networks.network[$sIdx].network-data.network-information.onap-model-information.model-name`"/>
+    <parameter name="target" value="FcPort"/>
+<outcome value='true'>
+<block atomic="true"><set>
+<parameter name='tmp.sotnFcPortList[`$sotnFcPortListLength`]' value='`$sIdx`' /></set><for index='paramIdx' start='0' end='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param_length`' >
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param[$paramIdx].name`"/>
+    <parameter name="target" value="address"/>
+<outcome value='true'>
+<block atomic="true"><set>
+<parameter name='sotnFcPortAddress' value='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param[$paramIdx].value`' /></set><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+    <parameter name='restapiUrl' value="`$prop.oss.url + '/oss/inventory?location=' + $sotnFcPortAddress`"/>
+    <parameter name='format' value='json' />
+    <parameter name='customHttpHeaders' value="X-FromAppId=MSO" />
+    <parameter name='httpMethod' value='GET' />
+    <parameter name="responsePrefix" value="temp.oss.accessTPs" />
+
+<outcome value='success'>
+<switch test="`$temp.oss.accessTPs_length`">
+<outcome value='Other'>
+<block atomic="true"><switch test='`$temp.accessTPs_length`'>
+<outcome value=''>
+<set>
+<parameter name='tp_length' value='0' /></set></outcome><outcome value='Other'>
+<set>
+<parameter name='tp_length' value='`$temp.accessTPs_length`' /></set></outcome></switch><for index='idx' start='0' end='`$temp.oss.accessTPs_length`' >
+<set>
+<parameter name='`temp.accessTPs[$idx + $tp_length].`' value='`$temp.oss.accessTPs[$idx].`' /></set></for><set>
+<parameter name='temp.accessTPs_length' value='`$temp.accessTPs_length + $temp.oss.accessTPs_length`' />
+
+</set></block></outcome></switch></outcome></execute></block></outcome></execute></for></block></outcome></execute></outcome></execute></for></block><switch test="`$temp.accessTPs_length >= 2`">
+
+<outcome value='true'>
+<block atomic="true"><set>
+<parameter name='prop.connection-attachment.access-topology-id' value='`$temp.accessTPs[0].access-topology-id`' />
+<parameter name='prop.connection-attachment.access-client-id' value='`$temp.accessTPs[0].access-client-id`' />
+<parameter name='prop.connection-attachment.access-provider-id' value='`$temp.accessTPs[0].access-provider-id`' />
+<parameter name='prop.connection-attachment.access-node-id' value='`$temp.accessTPs[0].access-node-id`' />
+<parameter name='prop.connection-attachment.access-ltp-id' value='`$temp.accessTPs[0].access-ltp-id`' />
+<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$temp.accessTPs[1].access-topology-id`' />
+<parameter name='prop.remote.connection-attachment.access-client-id' value='`$temp.accessTPs[1].access-client-id`' />
+<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$temp.accessTPs[1].access-provider-id`' />
+<parameter name='prop.remote.connection-attachment.access-node-id' value='`$temp.accessTPs[1].access-node-id`' />
+<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$temp.accessTPs[1].access-ltp-id`' /></set><for index='paidx' start='0' end='`$tmp.network-input-parameters.param_length`' ><block>
+<switch test="`$tmp.network-input-parameters.param[$paidx].name == 'name'`"><outcome value='true'>
+<set>
+<parameter name='template.name' value='`$tmp.network-input-parameters.param[$paidx].value`' />
+</set></outcome></switch><switch test="`$tmp.network-input-parameters.param[$paidx].name == 'service-type'`"><outcome value='true'>
+<set>
+<parameter name='template.service-type' value='`$tmp.network-input-parameters.param[$paidx].value`' />
+</set></outcome></switch><switch test="`$tmp.network-input-parameters.param[$paidx].name == 'total-size'`"><outcome value='true'>
+<set>
+<parameter name='template.total-size' value='`$tmp.network-input-parameters.param[$paidx].value`' />
+</set></outcome></switch><switch test="`$tmp.network-input-parameters.param[$paidx].name == 'pir'`"><outcome value='true'>
+<set>
+<parameter name='template.pir' value='`$tmp.network-input-parameters.param[$paidx].value`' />
+</set></outcome></switch><switch test="`$tmp.network-input-parameters.param[$paidx].name == 'cbs'`"><outcome value='true'>
+<set>
+<parameter name='template.cbs' value='`$tmp.network-input-parameters.param[$paidx].value`' />
+</set></outcome></switch><switch test="`$tmp.network-input-parameters.param[$paidx].name == 'pbs'`"><outcome value='true'>
+<set>
+<parameter name='template.pbs' value='`$tmp.network-input-parameters.param[$paidx].value`' />
+</set></outcome></switch><switch test="`$tmp.network-input-parameters.param[$paidx].name == 'couplingFlag'`"><outcome value='true'>
+<set>
+<parameter name='template.couplingFlag' value='`$tmp.network-input-parameters.param[$paidx].value`' />
+</set></outcome></switch><switch test="`$tmp.network-input-parameters.param[$paidx].name == 'colorAware'`"><outcome value='true'>
+<set>
+<parameter name='template.colorAware' value='`$tmp.network-input-parameters.param[$paidx].value`' />
+</set></outcome></switch><switch test="`$tmp.network-input-parameters.param[$paidx].name == 'route-objective-function'`"><outcome value='true'>
+<set>
+<parameter name='template.route-objective-function' value='`$tmp.network-input-parameters.param[$paidx].value`' />
+</set></outcome></switch><switch test="`$tmp.network-input-parameters.param[$paidx].name == 'diversity-policy'`"><outcome value='true'>
+<set>
+<parameter name='template.diversity-policy' value='`$tmp.network-input-parameters.param[$paidx].value`' />
+</set></outcome></switch></block></for><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />
+<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />
+<parameter name="restapiUser" value="`$prop.oof.user`" />
+<parameter name="restapiPassword" value="`$prop.oof.password`" />
+<parameter name="format" value="json"/>
+<parameter name="httpMethod" value="post"/>
+<parameter name="responsePrefix" value="oof"/>
+<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+<parameter name="trustStorePassword" value="adminadmin"/>
+<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+<parameter name="keyStorePassword" value="adminadmin"/>
+<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" /><outcome value='failure'>
+</outcome><outcome value='success'>
+<for index='vidx' start='0' end='`$oof.vpns_length`' ><block atomic="true"><set>
+<parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' /></set><get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="pnf" 
+		key="pnf.pnf-name = $oof.vpn.access-node-id 
+		AND depth = '0'"
+        pfx='tmp.aai.pnf' local-only='false' >
+
+
+<outcome value='success'>
+<set>
+<parameter name='tmp.thirdparty-sdnc-id' value="`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`" />
+</set></outcome><outcome value='not-found'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+
+</return></outcome><outcome value='Other'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+
+</return></outcome></get-resource><get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="esr-thirdparty-sdnc" 
+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND 
+		     depth = '1'"
+        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+
+<outcome value='success'>
+<set>
+<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+</set></outcome><outcome value='not-found'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+
+</return></outcome><outcome value='Other'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
+
+</return></outcome></get-resource><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-api-ConnectivityService.json'`" />
+<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-ConnectivityService:create-connectivity-service'`" />
+<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+<parameter name="format" value="json"/>
+<parameter name="httpMethod" value="patch"/>
+<parameter name="responsePrefix" value="vpn-result"/>
+<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+<parameter name="trustStorePassword" value="adminadmin"/>
+<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+<parameter name="keyStorePassword" value="adminadmin"/>
+<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" /><outcome value='failure'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="Error executing Create vpn rest api" />
+</return></outcome><outcome value='success'>
+<block atomic="true"></block></outcome></execute></block></for></outcome></execute></block></outcome></switch></block></outcome><outcome value='false'>
+<block atomic="true"><set>
+<parameter name='tmp.restapiUrl-found' value='false' />
+<parameter name='tmp.restapiUser-found' value='false' />
+<parameter name='tmp.restapiPassword-found' value='false' />
+<parameter name='tmp.templateFileName-found' value='false' />
+<parameter name='tmp.thirdPartyAdaptorRpc-found' value='false' /></set><for index='cxid' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
+<block atomic="true"><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`"/>
+    <parameter name="target" value="thirdPartySdncId"/>
+<outcome value='true'>
+<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="esr-thirdparty-sdnc" 
+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = `$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value` AND 
+		     depth = '1'"
+        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+
+<outcome value='success'>
+<set>
+<parameter name='prop.thirdpartySdnc-found' value='true' />
+<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+</set></outcome><outcome value='not-found'>
+<set>
+<parameter name='prop.thirdpartySdnc-found' value='false' />
+</set></outcome><outcome value='Other'>
+<set>
+<parameter name='prop.thirdpartySdnc-found' value='false' />
+</set></outcome></get-resource></outcome><outcome value='false'>
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`"/>
+    <parameter name="target" value="templateFileName"/>
+<outcome value='true'>
+<set>
+<parameter name='tmp.templateFileName' value="`$prop.restapi.templateDir + '/' + $network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value`" />
+<parameter name='tmp.templateFileName-found' value='true' /></set></outcome><outcome value='false'>
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`"/>
+    <parameter name="target" value="restapiUrl"/>
+<outcome value='true'>
+<set>
+<parameter name='tmp.restapiUrl' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value`' />
+<parameter name='tmp.restapiUrl-found' value='true' /></set></outcome></execute></outcome></execute></outcome></execute><set>
+<parameter name='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value`' /></set></block></for><return status='success'>
+<parameter name="ack-final-indicator" value="Y" />
+<parameter name="error-code" value="200" />
+<parameter name="error-message" value="`$error-message`" />
+</return><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+<parameter name="templateFileName" value="`$tmp.templateFileName`" />
+<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + $tmp.restapiUrl`" />
+<parameter name="restapiUser" value="admin" />
+<parameter name="restapiPassword" value="admin" />
+<parameter name="format" value="json"/>
+<parameter name="httpMethod" value="post"/>
+<parameter name="responsePrefix" value="restApi-result"/><outcome value='success'>
+<for index='sIdx' start='0' end='`$service-data.networks.network_length`' >
+<switch test='`$service-data.networks.network[$sIdx].network-id == $network-topology-operation-input.network-information.network-id`'>
+<outcome value='true'>
+<block atomic="true"><set>
+<parameter name='paraIndx' value='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param_length`' /></set><set>
+<parameter name='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param[$paraIndx].name`' value='localServiceId' />
+<parameter name='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param[$paraIndx].value`' value='`$restApi-result.output.service.uuid`' /></set></block></outcome></switch></for></outcome><outcome value='failure'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Error calling ' + $tmp.restapiUrl`" />
+</return></outcome><outcome value='not-found'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Error calling ' + $tmp.restapiUrl`" />
+</return></outcome></execute></block></outcome></switch></block></outcome><outcome value='false'>
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.network-information.onap-model-information.model-name`"/>
+    <parameter name="target" value="Fd"/>
+<outcome value='true'>
+<block atomic="true"><set>
+<parameter name='tmp.restapiUrl-found' value='false' />
+<parameter name='tmp.restapiUser-found' value='false' />
+<parameter name='tmp.restapiPassword-found' value='false' />
+<parameter name='tmp.templateFileName-found' value='false' />
+<parameter name='tmp.thirdPartyAdaptorRpc-found' value='false' /></set><for index='cxid' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
+<block atomic="true"><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`"/>
+    <parameter name="target" value="thirdPartySdncId"/>
+<outcome value='true'>
+<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="esr-thirdparty-sdnc" 
+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = `$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value` AND 
+		     depth = '1'"
+        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+
+<outcome value='success'>
+<set>
+<parameter name='prop.thirdpartySdnc-found' value='true' />
+<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+</set></outcome><outcome value='not-found'>
+<set>
+<parameter name='prop.thirdpartySdnc-found' value='false' />
+</set></outcome><outcome value='Other'>
+<set>
+<parameter name='prop.thirdpartySdnc-found' value='false' />
+</set></outcome></get-resource></outcome><outcome value='false'>
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`"/>
+    <parameter name="target" value="templateFileName"/>
+<outcome value='true'>
+<set>
+<parameter name='tmp.templateFileName' value="`$prop.restapi.templateDir + '/' + $network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value`" />
+<parameter name='tmp.templateFileName-found' value='true' /></set></outcome><outcome value='false'>
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`"/>
+    <parameter name="target" value="restapiUrl"/>
+<outcome value='true'>
+<set>
+<parameter name='tmp.restapiUrl' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value`' />
+<parameter name='tmp.restapiUrl-found' value='true' /></set></outcome></execute></outcome></execute></outcome></execute><set>
+<parameter name='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value`' /></set></block></for><return status='success'>
+<parameter name="ack-final-indicator" value="Y" />
+<parameter name="error-code" value="200" />
+<parameter name="error-message" value="`$error-message`" />
+</return><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+<parameter name="templateFileName" value="`$tmp.templateFileName`" />
+<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + $tmp.restapiUrl`" />
+<parameter name="restapiUser" value="admin" />
+<parameter name="restapiPassword" value="admin" />
+<parameter name="format" value="json"/>
+<parameter name="httpMethod" value="post"/>
+<parameter name="responsePrefix" value="restApi-result"/><outcome value='success'>
+<for index='sIdx' start='0' end='`$service-data.networks.network_length`' >
+<switch test='`$service-data.networks.network[$sIdx].network-id == $network-topology-operation-input.network-information.network-id`'>
+<outcome value='true'>
+<block atomic="true"><set>
+<parameter name='paraIndx' value='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param_length`' /></set><set>
+<parameter name='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param[$paraIndx].name`' value='localServiceId' />
+<parameter name='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param[$paraIndx].value`' value='`$restApi-result.output.service.uuid`' /></set></block></outcome></switch></for></outcome><outcome value='failure'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Error calling ' + $tmp.restapiUrl`" />
+</return></outcome><outcome value='not-found'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Error calling ' + $tmp.restapiUrl`" />
+</return></outcome></execute></block></outcome><outcome value='false'>
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.network-information.onap-model-information.model-name`"/>
+    <parameter name="target" value="FcPort"/>
+<outcome value='true'>
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.network-information.onap-model-information.model-name`"/>
+    <parameter name="target" value="sitewan"/>
+<outcome value='true'>
+<block atomic="true"><set>
+<parameter name='tmp.restapiUrl-found' value='false' />
+<parameter name='tmp.restapiUser-found' value='false' />
+<parameter name='tmp.restapiPassword-found' value='false' />
+<parameter name='tmp.templateFileName-found' value='false' />
+<parameter name='tmp.thirdPartyAdaptorRpc-found' value='false' /></set><for index='cxid' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
+<block atomic="true"><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`"/>
+    <parameter name="target" value="thirdPartySdncId"/>
+<outcome value='true'>
+<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="esr-thirdparty-sdnc" 
+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = `$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value` AND 
+		     depth = '1'"
+        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+
+<outcome value='success'>
+<set>
+<parameter name='prop.thirdpartySdnc-found' value='true' />
+<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+</set></outcome><outcome value='not-found'>
+<set>
+<parameter name='prop.thirdpartySdnc-found' value='false' />
+</set></outcome><outcome value='Other'>
+<set>
+<parameter name='prop.thirdpartySdnc-found' value='false' />
+</set></outcome></get-resource></outcome><outcome value='false'>
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`"/>
+    <parameter name="target" value="templateFileName"/>
+<outcome value='true'>
+<set>
+<parameter name='tmp.templateFileName' value="`$prop.restapi.templateDir + '/' + $network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value`" />
+<parameter name='tmp.templateFileName-found' value='true' /></set></outcome><outcome value='false'>
+<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+    <parameter name="source" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`"/>
+    <parameter name="target" value="restapiUrl"/>
+<outcome value='true'>
+<set>
+<parameter name='tmp.restapiUrl' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value`' />
+<parameter name='tmp.restapiUrl-found' value='true' /></set></outcome></execute></outcome></execute></outcome></execute><set>
+<parameter name='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].name`' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$cxid].value`' /></set></block></for><return status='success'>
+<parameter name="ack-final-indicator" value="Y" />
+<parameter name="error-code" value="200" />
+<parameter name="error-message" value="`$error-message`" />
+</return><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+<parameter name="templateFileName" value="`$tmp.templateFileName`" />
+<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + $tmp.restapiUrl`" />
+<parameter name="restapiUser" value="admin" />
+<parameter name="restapiPassword" value="admin" />
+<parameter name="format" value="json"/>
+<parameter name="httpMethod" value="post"/>
+<parameter name="responsePrefix" value="restApi-result"/><outcome value='success'>
+<for index='sIdx' start='0' end='`$service-data.networks.network_length`' >
+<switch test='`$service-data.networks.network[$sIdx].network-id == $network-topology-operation-input.network-information.network-id`'>
+<outcome value='true'>
+<block atomic="true"><set>
+<parameter name='paraIndx' value='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param_length`' /></set><set>
+<parameter name='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param[$paraIndx].name`' value='localServiceId' />
+<parameter name='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param[$paraIndx].value`' value='`$restApi-result.output.service.uuid`' /></set></block></outcome></switch></for></outcome><outcome value='failure'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Error calling ' + $tmp.restapiUrl`" />
+</return></outcome><outcome value='not-found'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Error calling ' + $tmp.restapiUrl`" />
+</return></outcome></execute></block></outcome><outcome value='false'>
+<block>
+<return status='success'>
+<parameter name="ack-final-indicator" value="Y" />
+<parameter name="error-code" value="200" />
+<parameter name="error-message" value="`$error-message`" />
+</return></block></outcome></execute></outcome><outcome value='false'>
+<block>
+<return status='success'>
+<parameter name="ack-final-indicator" value="Y" />
+<parameter name="error-code" value="200" />
+<parameter name="error-message" value="`$error-message`" />
+</return></block></outcome></execute></outcome></execute></outcome></execute></block></outcome></execute></method></service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-create.xml
index 61453eaf..ba1deb1e 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-create.xml
@@ -1,68 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
+<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'><method rpc='wan-connection-topology-operation-create' mode='sync'>
+<block atomic="true"><switch test='`$network-topology-operation-input.network-information.network-id`'>
+<outcome value=''><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+<parameter name="ctx-destination" value="network-topology-operation-input.network-information.network-id"/>
+<outcome value='Other'>
+<return status='failure'>
+<parameter name='error-code' value='' />
+<parameter name='error-message' value="An error occured while generation allotted resource ID" />
+</return></outcome><outcome value='success'>
+<block>
+<set>
+<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />
+<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/'` " /></set></block></outcome></execute></outcome></switch><execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+    <parameter name='contextPrefix' value='prop' />
+</execute><block atomic="true"><switch test='`$service-data.networks.network_length`'>
+<outcome value=''>
+<set>
+<parameter name='nidx' value='0' /></set></outcome><outcome value='Other'>
+<set>
+<parameter name='nidx' value='`$service-data.networks.network_length`' /></set></outcome></switch><set>
+<parameter name='service-data.networks.network[$nidx].network-id' value='`$network-topology-operation-input.network-information.network-id`' />
+<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />
+<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />
+<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />
+<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />
+<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.' value='`$network-topology-operation-input.network-request-input.`' />
+<parameter name='service-data.networks.network_length' value='`$nidx+1`' />
 
-<service-logic xmlns="http://www.onap.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">
-  <method rpc="wan-connection-topology-operation-create" mode="sync"> 
-    <block atomic="true">
-      <switch test="`$network-topology-operation-input.network-information.network-id`"> 
-        <outcome value="">
-          <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID"> 
-            <parameter name="ctx-destination" value="network-topology-operation-input.network-information.network-id"/>  
-            <outcome value="failure"> 
-              <return status="failure"> 
-                <parameter name="error-code" value=""/>  
-                <parameter name="error-message" value="An error occured while generation allotted resource ID"/> 
-              </return>
-            </outcome>
-          </execute>
-        </outcome>
-        <outcome value="Other"></outcome>
-      </switch>
-      <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties"> 
-        <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties"/>  
-        <parameter name="contextPrefix" value="prop"/> 
-      </execute>
-      <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="contains"> 
-        <parameter name="source" value="`$network-topology-operation-input.network-information.onap-model-information.model-name`"/>  
-        <parameter name="target" value="specification"/>  
-        <outcome value="true"> 
-          <call module="GENERIC-RESOURCE-API" rpc="wan-connection-save-specification" mode="sync"></call>
-        </outcome>
-        <outcome value="false"> 
-          <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="contains"> 
-            <parameter name="source" value="`$network-topology-operation-input.network-information.onap-model-information.model-name`"/>  
-            <parameter name="target" value="FC"/>  
-            <outcome value="true"> 
-              <call module="GENERIC-RESOURCE-API" rpc="wan-connection-find-specifications" mode="sync"></call>
-            </outcome>
-            <outcome value="false"> 
-              <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="contains"> 
-                <parameter name="source" value="`$network-topology-operation-input.network-information.onap-model-information.model-name`"/>  
-                <parameter name="target" value="FD"/>  
-                <outcome value="true"> 
-                  <call module="GENERIC-RESOURCE-API" rpc="wan-connection-find-specifications" mode="sync"></call>
-                </outcome>
-                <outcome value="false"> 
-                  <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="contains"> 
-                    <parameter name="source" value="`$network-topology-operation-input.network-information.onap-model-information.model-name`"/>  
-                    <parameter name="target" value="Link"/>  
-                    <outcome value="true"> 
-                      <call module="GENERIC-RESOURCE-API" rpc="wan-connection-route-calculation" mode="sync"></call>
-                    </outcome>
-                    <outcome value="false"> 
-                      <block></block>
-                    </outcome>
-                  </execute>
-                </outcome>
-              </execute>
-            </outcome>
-          </execute>
-        </outcome>
-      </execute>
-      <return status="success"> 
-        <parameter name="ack-final-indicator" value="Y"/>  
-        <parameter name="error-code" value="200"/>  
-        <parameter name="error-message" value="`$error-message`"/> 
-      </return>
-    </block>
-  </method>
-</service-logic>
+</set></block><return status='success'>
+<parameter name="ack-final-indicator" value="Y" />
+<parameter name="error-code" value="200" />
+<parameter name="error-message" value="`$error-message`" />
+</return></block></method></service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-deactivate.xml
index 592fb65d..c2830615 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-deactivate.xml
@@ -1,215 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
+<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'><method rpc='wan-connection-topology-operation-deactivate' mode='sync'>
+<block atomic="true"><execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+    <parameter name='contextPrefix' value='prop' />
+</execute><set>
+<parameter name='tmp.found-network-input' value='false' /></set><for index='pidx' start='0' end='`$service-data.networks.network_length`' >
+<switch test="`$service-data.networks.network[$pidx].network-id == $network-topology-operation-input.network-information.network-id`">
 
-<service-logic xmlns="http://www.onap.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">
-  <method rpc="wan-connection-topology-operation-deactivate" mode="sync"> 
-    <block atomic="true">
-      <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties"> 
-        <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties"/>  
-        <parameter name="contextPrefix" value="prop"/> 
-      </execute>
-      <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace"> 
-        <parameter name="source" value="`$prop.network-provided-resource`"/>  
-        <parameter name="outputPath" value="tmp.services-url"/>  
-        <parameter name="target" value="{service-instance-id}"/>  
-        <parameter name="replacement" value="`$network-topology-operation-input.service-information.service-id`"/> 
-      </execute>
-      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> 
-        <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.services-url`"/>  
-        <parameter name="restapiUser" value="`$prop.controller.user`"/>  
-        <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>  
-        <parameter name="format" value="json"/>  
-        <parameter name="httpMethod" value="GET"/>  
-        <parameter name="responsePrefix" value="mdsal-psd"/>  
-        <outcome value="success"> 
-          <block></block>
-        </outcome>
-        <outcome value="Other"> 
-          <return status="failure"> 
-            <parameter name="ack-final" value="Y"/>  
-            <parameter name="error-code" value="404"/>  
-            <parameter name="error-message" value="Error: Parent service data not available"/> 
-          </return>
-        </outcome>
-      </execute>
-      <set> 
-        <parameter name="tmp.found-network-input" value="false"/>
-      </set>
-      <for index="pidx" start="0" end="`$mdsal-psd.service-data.networks.network_length`"> 
-        <switch test="`$mdsal-psd.service-data.networks.network[$pidx].network-id == $network-topology-operation-input.network-information.network-id`"> 
-          <outcome value="true"> 
-            <block atomic="true">
-              <set> 
-                <parameter name="tmp.pidx" value="`$pidx`"/>  
-                <parameter name="tmp.network." value="`$mdsal-psd.service-data.networks.network[$pidx].`"/>  
-                <parameter name="tmp.network-input-parameters" value="`$mdsal-psd.service-data.networks.network[$pidx].network-data.network-request-input.network-input-parameters`"/>  
-                <parameter name="tmp.found-network-input" value="true"/>
-              </set>
-            </block>
-          </outcome>
-        </switch>
-      </for>
-      <switch test="`$found-network-input`"> 
-        <outcome value="false"> 
-          <return status="failure"> 
-            <parameter name="ack-final" value="Y"/>  
-            <parameter name="error-code" value="404"/>  
-            <parameter name="error-message" value="Error: Network input parameters not found"/> 
-          </return>
-        </outcome>
-        <outcome value="true"> 
-          <block atomic="true">
-            <set> 
-              <parameter name="tmp.restapiUrl-found" value="false"/>  
-              <parameter name="tmp.restapiUser-found" value="false"/>  
-              <parameter name="tmp.restapiPassword-found" value="false"/>  
-              <parameter name="tmp.thirdPartyAdaptorRpc-found" value="false"/>  
-              <parameter name="tmp.actualId-found" value="false"/>
-            </set>
-            <for index="cidx" start="0" end="`$tmp.network.network-data.network-topology.network-parameters.network-parameter_length`"> 
-              <block> 
-                <switch test="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiUrl-deactivate'`"> 
-                  <outcome value="true"> 
-                    <set> 
-                      <parameter name="tmp.restapiUrl" value="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`"/>  
-                      <parameter name="tmp.restapiUrl-found" value="true"/>
-                    </set>
-                  </outcome>
-                </switch>
-                <switch test="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiUser'`"> 
-                  <outcome value="true"> 
-                    <set> 
-                      <parameter name="tmp.restapiUser" value="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`"/>  
-                      <parameter name="tmp.restapiUser-found" value="true"/>
-                    </set>
-                  </outcome>
-                </switch>
-                <switch test="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiPassword'`"> 
-                  <outcome value="true"> 
-                    <set> 
-                      <parameter name="tmp.restapiPassword" value="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`"/>  
-                      <parameter name="tmp.restapiPassword-found" value="true"/>
-                    </set>
-                  </outcome>
-                </switch>
-                <switch test="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'actualId'`"> 
-                  <outcome value="true"> 
-                    <set> 
-                      <parameter name="tmp.actualId" value="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`"/>  
-                      <parameter name="tmp.actualId-found" value="true"/>
-                    </set>
-                  </outcome>
-                </switch>
-                <switch test="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'thirdPartyAdaptorRpc-deactivate'`"> 
-                  <outcome value="true"> 
-                    <set> 
-                      <parameter name="tmp.thirdPartyAdaptorRpc" value="`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`"/>  
-                      <parameter name="tmp.thirdPartyAdaptorRpc-found" value="true"/>
-                    </set>
-                  </outcome>
-                </switch>
-              </block>
-            </for>
-            <switch test="`$tmp.thirdPartyAdaptorRpc-found == 'true'`"> 
-              <outcome value="true"> 
-                <call module="GENERIC-RESOURCE-API" rpc="`$tmp.thirdPartyAdaptorRpc`" mode="sync"> 
-                  <outcome value="success"> 
-                    <block></block>
-                  </outcome>
-                  <outcome value="failure"> 
-                    <return status="failure"> 
-                      <parameter name="ack-final" value="Y"/>  
-                      <parameter name="error-code" value="500"/>  
-                      <parameter name="error-message" value="`'Error calling ' + $tmp.thirdPartyAdaptorRpc`"/> 
-                    </return>
-                  </outcome>
-                  <outcome value="not-found"> 
-                    <return status="failure"> 
-                      <parameter name="ack-final" value="Y"/>  
-                      <parameter name="error-code" value="500"/>  
-                      <parameter name="error-message" value="`'Error calling ' + $tmp.thirdPartyAdaptorRpc`"/> 
-                    </return>
-                  </outcome>
-                </call>
-              </outcome>
-              <outcome value="false"> 
-                <switch test="`$tmp.restapiUrl-found == 'true'`"> 
-                  <outcome value="false"> 
-                    <return status="failure"> 
-                      <parameter name="ack-final" value="Y"/>  
-                      <parameter name="error-code" value="404"/>  
-                      <parameter name="error-message" value="Error: 3rd party controller restapiUrl not found"/> 
-                    </return>
-                  </outcome>
-                  <outcome value="true"> 
-                    <switch test="`$tmp.restapiUser-found == 'true'`"> 
-                      <outcome value="false"> 
-                        <return status="failure"> 
-                          <parameter name="ack-final" value="Y"/>  
-                          <parameter name="error-code" value="404"/>  
-                          <parameter name="error-message" value="Error: 3rd party controller restapiUser not found"/> 
-                        </return>
-                      </outcome>
-                      <outcome value="true"> 
-                        <switch test="`$tmp.restapiPassword-found == 'true'`"> 
-                          <outcome value="false"> 
-                            <return status="failure"> 
-                              <parameter name="ack-final" value="Y"/>  
-                              <parameter name="error-code" value="404"/>  
-                              <parameter name="error-message" value="Error: 3rd party controller restapiPassword not found"/> 
-                            </return>
-                          </outcome>
-                          <outcome value="true"> 
-                            <switch test="`$tmp.actualId-found == 'true'`"> 
-                              <outcome value="false"> 
-                                <return status="failure"> 
-                                  <parameter name="ack-final" value="Y"/>  
-                                  <parameter name="error-code" value="404"/>  
-                                  <parameter name="error-message" value="Error: Wan Connection actualId not found"/> 
-                                </return>
-                              </outcome>
-                              <outcome value="true"> 
-                                <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> 
-                                  <parameter name="restapiUrl" value="`$tmp.restapiUrl + $tmp.actualId`"/>  
-                                  <parameter name="restapiUser" value="`$tmp.restapiUser`"/>  
-                                  <parameter name="restapiPassword" value="`$tmp.restapiPassword`"/>  
-                                  <parameter name="format" value="json"/>  
-                                  <parameter name="httpMethod" value="delete"/>
-                                  <outcome value="success"> 
-                                    <block></block>
-                                  </outcome>
-                                  <outcome value="failure"> 
-                                    <return status="failure"> 
-                                      <parameter name="ack-final" value="Y"/>  
-                                      <parameter name="error-code" value="500"/>  
-                                      <parameter name="error-message" value="`'Error calling ' + $tmp.restapiUrl`"/> 
-                                    </return>
-                                  </outcome>
-                                  <outcome value="not-found"> 
-                                    <return status="failure"> 
-                                      <parameter name="ack-final" value="Y"/>  
-                                      <parameter name="error-code" value="500"/>  
-                                      <parameter name="error-message" value="`'Error calling ' + $tmp.restapiUrl`"/> 
-                                    </return>
-                                  </outcome>
-                                </execute>
-                              </outcome>
-                            </switch>
-                          </outcome>
-                        </switch>
-                      </outcome>
-                    </switch>
-                  </outcome>
-                </switch>
-              </outcome>
-            </switch>
-          </block>
-        </outcome>
-      </switch>
-      <return status="success"> 
-        <parameter name="ack-final-indicator" value="Y"/>  
-        <parameter name="error-code" value="200"/>  
-        <parameter name="error-message" value="`$error-message`"/> 
-      </return>
-    </block>
-  </method>
-</service-logic>
+<outcome value='true'>
+<set>
+<parameter name='tmp.pidx' value='`$pidx`' />
+<parameter name='tmp.network.' value='`$service-data.networks.network[$pidx].`' />
+<parameter name='tmp.network-input-parameters' value='`$service-data.networks.network[$pidx].network-data.network-request-input.network-input-parameters`' />
+<parameter name='tmp.found-network-input' value='true' /></set></outcome></switch></for><return status='success'>
+<parameter name="ack-final-indicator" value="Y" />
+<parameter name="error-code" value="200" />
+<parameter name="error-message" value="`$error-message`" />
+</return><block atomic="true"><set>
+<parameter name='isLocalIdFound' value='false' /></set><for index='paidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >
+<switch test="`$tmp.network.network-data.network-request-input.network-input-parameters.param[$paidx].name == 'localServiceId'`">
+<outcome value='true'>
+<set>
+<parameter name='localServiceId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$paidx].value`' />
+<parameter name='isLocalIdFound' value='true' /></set></outcome></switch></for><switch test="`$isLocalIdFound`">
+<outcome value='false'>
+<set>
+<parameter name='sotnServiceId' value='73aa6033-a43e-3162-9bc9-085edc2b5a10' /></set></outcome></switch><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn_get_zte_template.json' `" />
+<parameter name="restapiUrl" value="http://10.80.80.21:8443/restconf/operations/ZTE-API-ConnectivityService:get-service-details" />
+<parameter name="restapiUser" value="admin" />
+<parameter name="restapiPassword" value="admin" />
+<parameter name="format" value="json"/>
+<parameter name="httpMethod" value="post"/>
+<parameter name="responsePrefix" value="restApiResult"/><outcome value='success'>
+<block atomic="true"><set>
+<parameter name='localId' value='`$restApiResult.output.normal-service.name[0].value`' /></set><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn_delete_zte_template.json' `" />
+<parameter name="restapiUrl" value="http://10.80.80.21:8443/restconf/operations/ZTE-API-ConnectivityService:delete-connectivity-service" />
+<parameter name="restapiUser" value="admin" />
+<parameter name="restapiPassword" value="admin" />
+<parameter name="format" value="json"/>
+<parameter name="httpMethod" value="post"/>
+<parameter name="responsePrefix" value="restApiResult"/><outcome value='success'>
+<block>
+</block></outcome><outcome value='failure'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Error calling ' + $tmp.restapiUrl`" />
+</return></outcome><outcome value='not-found'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Error calling ' + $tmp.restapiUrl`" />
+</return></outcome></execute></block></outcome><outcome value='failure'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Error calling ' + $tmp.restapiUrl`" />
+</return></outcome><outcome value='not-found'>
+<return status='failure'>
+	<parameter name='ack-final' value='Y'/>
+	<parameter name="error-code" value="500" />
+    <parameter name="error-message" value="`'Error calling ' + $tmp.restapiUrl`" />
+</return></outcome></execute></block></block></method></service-logic>
\ No newline at end of file