From e605656999c6062db5d11c38ea40dbf73b2fb34f Mon Sep 17 00:00:00 2001
From: "ramu.n" <ramu.n@huawei.com>
Date: Sun, 8 Oct 2017 15:55:10 +0530
Subject: Underlay delete flow DGs modification for VoLTE

*overlay delete operation validate network-id is received in the request and get network-topology-operation-input from this network-id
*set oper-status

Change-Id: I22291fbb34ca0d2ae51403ea27e5ca413141cb32
Issue-Id: SDNC-111
Signed-off-by: Ramu N <ramu.n@huawei.com>

Former-commit-id: a8e7d59abcc55950e76f36cf4c2d280f55a38381
---
 ...URCE-API_network-topology-operation-create.json | 1372 ++++++++---------
 ...URCE-API_network-topology-operation-delete.json |  505 +++++--
 ...URCE-API_validate-network-input-parameters.json | 1578 ++++++++++----------
 ...OURCE-API_network-topology-operation-create.xml |    5 +
 ...OURCE-API_network-topology-operation-delete.xml |   64 +-
 ...OURCE-API_validate-network-input-parameters.xml |   55 +-
 6 files changed, 1922 insertions(+), 1657 deletions(-)

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
index 1c01a518..fd04a766 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "e82c66ea.44e898",
+    "id": "697cab81.51512c",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 85,
-    "y": 59.999969482421875,
-    "z": "b93007d5.c3e538",
+    "x": 84,
+    "y": 53.999969482421875,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "556d5856.28fc28"
+        "1ae693ee.c03974"
       ]
     ]
   },
   {
-    "id": "556d5856.28fc28",
+    "id": "1ae693ee.c03974",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1965 +22,1977 @@
     "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": 297.00000381469727,
-    "y": 131.99998664855957,
-    "z": "b93007d5.c3e538",
+    "x": 296.00000381469727,
+    "y": 125.99998664855957,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "c0cc5c39.3c0f6"
+        "f0d914e3.9a2588"
       ]
     ]
   },
   {
-    "id": "c0cc5c39.3c0f6",
+    "id": "f0d914e3.9a2588",
     "type": "method",
     "name": "method network-topology-operation-create",
     "xml": "<method rpc='network-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 285.0001220703125,
-    "y": 219.99996948242188,
-    "z": "b93007d5.c3e538",
+    "x": 284.0001220703125,
+    "y": 213.99996948242188,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "c2983d8a.5f39f"
+        "ce9e8119.8976c"
       ]
     ]
   },
   {
-    "id": "c2983d8a.5f39f",
+    "id": "ce9e8119.8976c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 371,
-    "y": 369.99998474121094,
-    "z": "b93007d5.c3e538",
+    "x": 360,
+    "y": 612,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "67d30637.3060a8",
-        "84c05eba.3e71e8",
-        "68069c64.8e3b94",
-        "701cd9ce.0eed7",
-        "2eb49ba6.65da24",
-        "7b077cdc.2f71b4",
-        "b4f42ae7.52446",
-        "ddb7afb8.346658",
-        "1ca86563.d30703",
-        "200a1605.cf89a2",
-        "8739cde1.57a17",
-        "d21a23d8.b0bee",
-        "1ae283a6.1cae6c",
-        "1e4e53c1.72218c",
-        "881693df.98a5b",
-        "8aae558c.098818"
+        "47fba1f5.640898",
+        "c605463b.774db8",
+        "7b59e079.3d22b8",
+        "5c8ba0bf.2e98f8",
+        "c7ad74ad.27add8",
+        "b2d33596.d59c1",
+        "c00ac3fa.32f9e",
+        "3cc192be.0780ae",
+        "74f090f.f41e0f",
+        "54853363.a6cb2c",
+        "5411c45f.3ab70c",
+        "af24f51b.e33eb",
+        "98d8796c.a3bbc",
+        "64964558.e55ee4",
+        "8ea2eceb.3de538",
+        "da8e6fe4.5c07a8",
+        "51c60b4c.2a6944"
       ]
     ]
   },
   {
-    "id": "65abf066.8e6488",
+    "id": "8c395a0a.a246c8",
     "type": "execute",
     "name": "execute RestApiCallNode Create IPWAN L3VPN",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l3smvpntemplate.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1163.0001831054688,
-    "y": 990.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1162.0001831054688,
+    "y": 984.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       []
     ]
   },
   {
-    "id": "67d30637.3060a8",
+    "id": "47fba1f5.640898",
     "type": "set",
     "name": "set controller data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`\" />\n",
     "comments": "",
-    "x": 786.0000610351562,
-    "y": 274.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 785.0000610351562,
+    "y": 268.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "2eb49ba6.65da24",
+    "id": "c7ad74ad.27add8",
     "type": "for",
     "name": "for each network-input-parameters",
     "xml": "<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 846.6666259765625,
-    "y": 396.6666259765625,
-    "z": "b93007d5.c3e538",
+    "x": 845.6666259765625,
+    "y": 390.6666259765625,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "9e4b7826.78998"
+        "680d9a64.4950bc"
       ]
     ]
   },
   {
-    "id": "cc196265.e16a88",
+    "id": "771a98af.5ed45",
     "type": "execute",
     "name": "execute RestApiCallNode Create SPTN L3VPN",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l3smsitetemplate.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1134.6668701171875,
-    "y": 1193.6666564941406,
-    "z": "b93007d5.c3e538",
+    "x": 1133.6668701171875,
+    "y": 1187.6666564941406,
+    "z": "4d931804.43f9f",
     "wires": [
       []
     ]
   },
   {
-    "id": "701cd9ce.0eed7",
+    "id": "5c8ba0bf.2e98f8",
     "type": "execute",
     "name": "execute vpn-policy1-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vpn-policy1-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 806.6666259765625,
-    "y": 453.6666564941406,
-    "z": "b93007d5.c3e538",
+    "x": 805.6666259765625,
+    "y": 447.6666564941406,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "cf63dd64.867b68"
+        "d81f8c27.c89ff8"
       ]
     ]
   },
   {
-    "id": "cf63dd64.867b68",
+    "id": "d81f8c27.c89ff8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1031.6666259765625,
-    "y": 456.6666259765625,
-    "z": "b93007d5.c3e538",
+    "x": 1030.6666259765625,
+    "y": 450.6666259765625,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "f95a4c37.7f2c98"
+        "90acf08b.06d308"
       ]
     ]
   },
   {
-    "id": "f95a4c37.7f2c98",
+    "id": "90acf08b.06d308",
     "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 vpn policy ID\" />\n",
     "comments": "",
-    "x": 1212.6666259765625,
-    "y": 454.6666259765625,
-    "z": "b93007d5.c3e538",
+    "x": 1211.6666259765625,
+    "y": 448.6666259765625,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "84c05eba.3e71e8",
+    "id": "c605463b.774db8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 858.5,
-    "y": 96.99996948242188,
-    "z": "b93007d5.c3e538",
+    "x": 857.5,
+    "y": 90.99996948242188,
+    "z": "4d931804.43f9f",
     "wires": [
       []
     ]
   },
   {
-    "id": "68069c64.8e3b94",
+    "id": "7b59e079.3d22b8",
     "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": 828.5,
-    "y": 213.99996948242188,
-    "z": "b93007d5.c3e538",
+    "x": 827.5,
+    "y": 207.99996948242188,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "48d88da3.bdd66c",
-        "303d5a7b.9089e6",
-        "b6a02d9b.506dd"
+        "97dc2002.c660f8",
+        "4f41ca53.5d5914",
+        "b70bb66f.267f38"
       ]
     ]
   },
   {
-    "id": "48d88da3.bdd66c",
+    "id": "97dc2002.c660f8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1153.5,
-    "y": 144.99996948242188,
-    "z": "b93007d5.c3e538",
+    "x": 1152.5,
+    "y": 138.99996948242188,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "343e112c.24c07e"
+        "ef5fb88a.6f28b8"
       ]
     ]
   },
   {
-    "id": "303d5a7b.9089e6",
+    "id": "4f41ca53.5d5914",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1156.990966796875,
-    "y": 192.57400512695312,
-    "z": "b93007d5.c3e538",
+    "x": 1155.990966796875,
+    "y": 186.57400512695312,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "cabe423d.4d49c8"
+        "3b62b821.ac8e7"
       ]
     ]
   },
   {
-    "id": "b6a02d9b.506dd",
+    "id": "b70bb66f.267f38",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1152.323974609375,
-    "y": 233.90731811523438,
-    "z": "b93007d5.c3e538",
+    "x": 1151.323974609375,
+    "y": 227.90731811523438,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "e0986396.153c08"
+        "b99bfa59.2cb0a8"
       ]
     ]
   },
   {
-    "id": "cabe423d.4d49c8",
+    "id": "3b62b821.ac8e7",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Network model is_bound_to_vpn=true but no vpn_binding is present\" />\n\n",
     "comments": "",
-    "x": 1333.5623779296875,
-    "y": 180.8597412109375,
-    "z": "b93007d5.c3e538",
+    "x": 1332.5623779296875,
+    "y": 174.8597412109375,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "e0986396.153c08",
+    "id": "b99bfa59.2cb0a8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Unexpected error retrieving vpn binding\" />\n\n",
     "comments": "",
-    "x": 1340.0965309143066,
-    "y": 229.346510887146,
-    "z": "b93007d5.c3e538",
+    "x": 1339.0965309143066,
+    "y": 223.346510887146,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "343e112c.24c07e",
+    "id": "ef5fb88a.6f28b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1331.705322265625,
-    "y": 137.57400512695312,
-    "z": "b93007d5.c3e538",
+    "x": 1330.705322265625,
+    "y": 131.57400512695312,
+    "z": "4d931804.43f9f",
     "wires": [
       []
     ]
   },
   {
-    "id": "9e4b7826.78998",
+    "id": "680d9a64.4950bc",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1245.5,
-    "y": 402.9999694824219,
-    "z": "b93007d5.c3e538",
-    "wires": [
-      [
-        "17cd2ff8.9cd04",
-        "a903bca7.693f38",
-        "b7d18627.7a1f98",
-        "e4de9a3d.119a9",
-        "606af827.bd45c",
-        "a21fe544.7750b",
-        "311c3df3.7afe92",
-        "70cc5270.0c11f4",
-        "4839bb76.6231f4",
-        "e9c22fe.7f5eb5",
-        "adf442a.303dcc",
-        "79aa13b9.189d24",
-        "5695b46b.d185b4",
-        "bace9104.ae1848",
-        "9a7061af.ca17e",
-        "659d155a.7369ac",
-        "f05ff602.95c57",
-        "fdb0c240.c67158",
-        "e5e0041.ae72a78",
-        "ee6f82cf.48e768",
-        "d210b6.498b1f48",
-        "a99d9f30.66196",
-        "4a49e3e6.b4823c",
-        "b21efe21.6a6f38",
-        "7e49a5fe.54752c"
-      ]
-    ]
-  },
-  {
-    "id": "17cd2ff8.9cd04",
+    "x": 1244.5,
+    "y": 396.9999694824219,
+    "z": "4d931804.43f9f",
+    "wires": [
+      [
+        "e3908f6a.c4c398",
+        "be9e77b7.873ff",
+        "7a5cf18f.b317f8",
+        "35389645.393b9a",
+        "d348a96f.1822f8",
+        "be3b730d.7e954",
+        "b3c5e265.deb178",
+        "7d1094cd.bc6bbc",
+        "8d88db5d.e1f338",
+        "aaeb2956.e246f8",
+        "4cf00d90.a548a4",
+        "8f9bdfe5.d2a3d8",
+        "7d72ad7e.5e03ac",
+        "79f918.475996e8",
+        "c4791db3.7410b",
+        "2fb7f830.a142c",
+        "9253ced1.f2cee8",
+        "fc940e44.bb799",
+        "f5993a9c.9252b",
+        "dc6166fe.43d058",
+        "596289d7.f6ddc8",
+        "ff3cab94.0ba1d",
+        "10aaaff3.858108",
+        "1a3c9b5d.13700d",
+        "18c39015.325968"
+      ]
+    ]
+  },
+  {
+    "id": "e3908f6a.c4c398",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1596.5,
-    "y": 27,
-    "z": "b93007d5.c3e538",
+    "x": 1595.5,
+    "y": 21,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "942d2fd8.72ef78"
+        "a0c30c9b.5ab5d"
       ]
     ]
   },
   {
-    "id": "a903bca7.693f38",
+    "id": "be9e77b7.873ff",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1600.4999389648438,
-    "y": 88.5999755859375,
-    "z": "b93007d5.c3e538",
+    "x": 1599.4999389648438,
+    "y": 82.5999755859375,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "b16a7f85.9ec09"
+        "bd7dc877.f559d8"
       ]
     ]
   },
   {
-    "id": "942d2fd8.72ef78",
+    "id": "a0c30c9b.5ab5d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1783.5,
-    "y": 27,
-    "z": "b93007d5.c3e538",
+    "x": 1782.5,
+    "y": 21,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "13aca61b.d25bc2"
+        "4d6d01e9.6c7218"
       ]
     ]
   },
   {
-    "id": "b16a7f85.9ec09",
+    "id": "bd7dc877.f559d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1785.4999389648438,
-    "y": 86.5999755859375,
-    "z": "b93007d5.c3e538",
+    "x": 1784.4999389648438,
+    "y": 80.5999755859375,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "bc8204d0.6f0a4"
+        "d36de49f.f68a6"
       ]
     ]
   },
   {
-    "id": "13aca61b.d25bc2",
+    "id": "4d6d01e9.6c7218",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.l3vpn.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1951.5,
-    "y": 27.600006103515625,
-    "z": "b93007d5.c3e538",
+    "x": 1950.5,
+    "y": 21.600006103515625,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "bc8204d0.6f0a4",
+    "id": "d36de49f.f68a6",
     "type": "set",
     "name": "set service-type",
     "xml": "<set>\n<parameter name='prop.l3vpn.service-type' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1954.4999389648438,
-    "y": 84.5999755859375,
-    "z": "b93007d5.c3e538",
+    "x": 1953.4999389648438,
+    "y": 78.5999755859375,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "b7d18627.7a1f98",
+    "id": "7a5cf18f.b317f8",
     "type": "switchNode",
     "name": "switch topology",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'topology'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1599.5,
-    "y": 149.99996948242188,
-    "z": "b93007d5.c3e538",
+    "x": 1598.5,
+    "y": 143.99996948242188,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "3a89d54d.40dfe2"
+        "68b9f582.2430d4"
       ]
     ]
   },
   {
-    "id": "e4de9a3d.119a9",
+    "id": "35389645.393b9a",
     "type": "switchNode",
     "name": "switch technology",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'technology'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1602.5,
-    "y": 202.99996948242188,
-    "z": "b93007d5.c3e538",
+    "x": 1601.5,
+    "y": 196.99996948242188,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "38e8aa2.2d9e456"
+        "5cda61be.c753d8"
       ]
     ]
   },
   {
-    "id": "606af827.bd45c",
+    "id": "d348a96f.1822f8",
     "type": "switchNode",
     "name": "switch site1_name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1607.5,
-    "y": 264.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1606.5,
+    "y": 258.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "21372c50.4a9ebc"
+        "d7b076fd.372c4"
       ]
     ]
   },
   {
-    "id": "a21fe544.7750b",
+    "id": "be3b730d.7e954",
     "type": "switchNode",
     "name": "switch site2_name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1602.5,
-    "y": 327.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1601.5,
+    "y": 321.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "8bf3fb5b.75eb5"
+        "5b648810.dd844"
       ]
     ]
   },
   {
-    "id": "311c3df3.7afe92",
+    "id": "b3c5e265.deb178",
     "type": "switchNode",
     "name": "switch sna1_name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'sna1_name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1607.5,
-    "y": 387.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1606.5,
+    "y": 381.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "23a5acb5.f27f04"
+        "d0d57f1c.8c8bf8"
       ]
     ]
   },
   {
-    "id": "70cc5270.0c11f4",
+    "id": "7d1094cd.bc6bbc",
     "type": "switchNode",
     "name": "switch sna2_name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'sna2_name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1602.5,
-    "y": 451.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1601.5,
+    "y": 445.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "6950f2b5.16d88c"
+        "6e174e25.5f3d78"
       ]
     ]
   },
   {
-    "id": "4839bb76.6231f4",
+    "id": "8d88db5d.e1f338",
     "type": "switchNode",
     "name": "switch pe1_id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'pe1_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1607.5,
-    "y": 513.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1606.5,
+    "y": 507.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "b7f7be54.bb917"
+        "ebb8fa90.99fc4"
       ]
     ]
   },
   {
-    "id": "e9c22fe.7f5eb5",
+    "id": "aaeb2956.e246f8",
     "type": "switchNode",
     "name": "switch pe2_id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'pe2_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1622.5,
-    "y": 573.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1621.5,
+    "y": 567.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "a5648f25.d106a"
+        "52d74051.7b6e58"
       ]
     ]
   },
   {
-    "id": "adf442a.303dcc",
+    "id": "4cf00d90.a548a4",
     "type": "switchNode",
     "name": "switch ac1_id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1617.5,
-    "y": 645.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1616.5,
+    "y": 639.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "18fc875b.805949"
+        "9ef12bf7.50569"
       ]
     ]
   },
   {
-    "id": "79aa13b9.189d24",
+    "id": "8f9bdfe5.d2a3d8",
     "type": "switchNode",
     "name": "switch ac2_id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1616.5,
-    "y": 704.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1615.5,
+    "y": 698.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "ff7ff5eb.cfefc8"
+        "62d558d2.f880e8"
       ]
     ]
   },
   {
-    "id": "5695b46b.d185b4",
+    "id": "7d72ad7e.5e03ac",
     "type": "switchNode",
     "name": "switch ac1_ip",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_ip'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1593.5,
-    "y": 767.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1592.5,
+    "y": 761.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "3a3dab2d.a5bb8c"
+        "bf3182f6.a9ab1"
       ]
     ]
   },
   {
-    "id": "bace9104.ae1848",
+    "id": "79f918.475996e8",
     "type": "switchNode",
     "name": "switch ac2_ip",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_ip'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1596.5,
-    "y": 824.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1595.5,
+    "y": 818.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "cdd1eefe.5b85b8"
+        "f2b94cc1.85afb"
       ]
     ]
   },
   {
-    "id": "9a7061af.ca17e",
+    "id": "c4791db3.7410b",
     "type": "switchNode",
     "name": "switch ac1_peer_ip",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_peer_ip'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1602.5,
-    "y": 876.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1601.5,
+    "y": 870.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "1ca2f399.06573c"
+        "acf4ab48.24e14"
       ]
     ]
   },
   {
-    "id": "659d155a.7369ac",
+    "id": "2fb7f830.a142c",
     "type": "switchNode",
     "name": "switch ac2_peer_ip",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_peer_ip'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1603.5,
-    "y": 931.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1602.5,
+    "y": 925.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "cd2ff907.e5a52"
+        "d9b315dd.3141e"
       ]
     ]
   },
   {
-    "id": "f05ff602.95c57",
+    "id": "9253ced1.f2cee8",
     "type": "switchNode",
     "name": "switch ac1_svlan",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_svlan'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1615.5,
-    "y": 980.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1614.5,
+    "y": 974.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "3cb8f25c.dbdcf6"
+        "cf0b48ac.5ee088"
       ]
     ]
   },
   {
-    "id": "fdb0c240.c67158",
+    "id": "fc940e44.bb799",
     "type": "switchNode",
     "name": "switch ac2_svlan",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_svlan'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1608.5,
-    "y": 1031.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1607.5,
+    "y": 1025.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "f4a0fc3d.931818"
+        "e277ffaa.d760f"
       ]
     ]
   },
   {
-    "id": "e5e0041.ae72a78",
+    "id": "f5993a9c.9252b",
     "type": "switchNode",
     "name": "switch ac1_protocol",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_protocol'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1601.5,
-    "y": 1089.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1600.5,
+    "y": 1083.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "9232191b.5a644"
+        "77a12f7f.4e9878"
       ]
     ]
   },
   {
-    "id": "ee6f82cf.48e768",
+    "id": "dc6166fe.43d058",
     "type": "switchNode",
     "name": "switch ac2_protocol",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_protocol'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1602.5,
-    "y": 1149.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1601.5,
+    "y": 1143.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "2ac6f78c.3593"
+        "cee26b03.9d9c08"
       ]
     ]
   },
   {
-    "id": "d210b6.498b1f48",
+    "id": "596289d7.f6ddc8",
     "type": "switchNode",
     "name": "switch ac1_protocol_bgp_as",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_protocol_bgp_as'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1596.5,
-    "y": 1335.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1595.5,
+    "y": 1329.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "26258b64.f3c8fc"
+        "16e14c45.8f7a9c"
       ]
     ]
   },
   {
-    "id": "a99d9f30.66196",
+    "id": "ff3cab94.0ba1d",
     "type": "switchNode",
     "name": "switch ac2_protocol_bgp_as",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_protocol_bgp_as'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1602.5,
-    "y": 1386.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1601.5,
+    "y": 1380.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "beea3693.1fcab"
+        "c5269182.01e42"
       ]
     ]
   },
   {
-    "id": "4a49e3e6.b4823c",
+    "id": "10aaaff3.858108",
     "type": "switchNode",
     "name": "switch af_type",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'af_type'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1569.5,
-    "y": 1477.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1568.5,
+    "y": 1471.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "498b6cd0.790624"
+        "f174a3e.2e99c6"
       ]
     ]
   },
   {
-    "id": "3a89d54d.40dfe2",
+    "id": "68b9f582.2430d4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1774.5,
-    "y": 145.99996948242188,
-    "z": "b93007d5.c3e538",
+    "x": 1773.5,
+    "y": 139.99996948242188,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "d4ecb14d.0a54a8"
+        "8b63a167.2125c8"
       ]
     ]
   },
   {
-    "id": "38e8aa2.2d9e456",
+    "id": "5cda61be.c753d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1780.5,
-    "y": 198.99996948242188,
-    "z": "b93007d5.c3e538",
+    "x": 1779.5,
+    "y": 192.99996948242188,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "f3fb2ed6.50a728"
+        "97ed26f3.136da8"
       ]
     ]
   },
   {
-    "id": "21372c50.4a9ebc",
+    "id": "d7b076fd.372c4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1789.5,
-    "y": 260.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1788.5,
+    "y": 254.99996948242188,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "884fbf7d.a8726"
+        "9b2f5bce.e2493"
       ]
     ]
   },
   {
-    "id": "8bf3fb5b.75eb5",
+    "id": "5b648810.dd844",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1787.5,
-    "y": 323.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1786.5,
+    "y": 317.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "3abb6840.ee26b"
+        "ca017dc5.e6b6a"
       ]
     ]
   },
   {
-    "id": "23a5acb5.f27f04",
+    "id": "d0d57f1c.8c8bf8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1792.5,
-    "y": 385.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1791.5,
+    "y": 379.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "f20a7e76.25a3f"
+        "7a5a1e9.b76ff6"
       ]
     ]
   },
   {
-    "id": "6950f2b5.16d88c",
+    "id": "6e174e25.5f3d78",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1784.5,
-    "y": 443.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1783.5,
+    "y": 437.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "d97cdc10.bd96d8"
+        "9b74f8ad.ece11"
       ]
     ]
   },
   {
-    "id": "b7f7be54.bb917",
+    "id": "ebb8fa90.99fc4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1785.5,
-    "y": 506.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1784.5,
+    "y": 500.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "427ba533.f11984"
+        "de03ade1.de45c8"
       ]
     ]
   },
   {
-    "id": "a5648f25.d106a",
+    "id": "52d74051.7b6e58",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1784.5,
-    "y": 575.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1783.5,
+    "y": 569.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "62408467.62a084"
+        "7788fc94.c4a214"
       ]
     ]
   },
   {
-    "id": "18fc875b.805949",
+    "id": "9ef12bf7.50569",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1781.5,
-    "y": 643.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1780.5,
+    "y": 637.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "85e36dea.0819c8"
+        "cc439e5e.959be"
       ]
     ]
   },
   {
-    "id": "ff7ff5eb.cfefc8",
+    "id": "62d558d2.f880e8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1780.5,
-    "y": 707.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1779.5,
+    "y": 701.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "58007bf7.116274"
+        "7f607ee6.048328"
       ]
     ]
   },
   {
-    "id": "3a3dab2d.a5bb8c",
+    "id": "bf3182f6.a9ab1",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1753.5,
-    "y": 765.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1752.5,
+    "y": 759.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "9deb79b0.29029"
+        "82ba67e9.3e3948"
       ]
     ]
   },
   {
-    "id": "cdd1eefe.5b85b8",
+    "id": "f2b94cc1.85afb",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1755.5,
-    "y": 822.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1754.5,
+    "y": 816.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "8f458f7.ed1937"
+        "78aa250c.4c86dc"
       ]
     ]
   },
   {
-    "id": "1ca2f399.06573c",
+    "id": "acf4ab48.24e14",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1791.5,
-    "y": 873.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1790.5,
+    "y": 867.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "33671733.0dc5e"
+        "fed7f529.21c158"
       ]
     ]
   },
   {
-    "id": "cd2ff907.e5a52",
+    "id": "d9b315dd.3141e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1796.5,
-    "y": 936.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1795.5,
+    "y": 930.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "a34e89a8.ee1828"
+        "1e28306.dccb65"
       ]
     ]
   },
   {
-    "id": "3cb8f25c.dbdcf6",
+    "id": "cf0b48ac.5ee088",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1792.5,
-    "y": 985.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1791.5,
+    "y": 979.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "886acd80.98921"
+        "7587d056.b8eff8"
       ]
     ]
   },
   {
-    "id": "f4a0fc3d.931818",
+    "id": "e277ffaa.d760f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1776.5,
-    "y": 1034.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1775.5,
+    "y": 1028.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "2a432c87.a87a1c"
+        "ec48bf2e.e56588"
       ]
     ]
   },
   {
-    "id": "9232191b.5a644",
+    "id": "77a12f7f.4e9878",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1773.5,
-    "y": 1087.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1772.5,
+    "y": 1081.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "5eed1069.6712b8"
+        "a9616742.2a0ca"
       ]
     ]
   },
   {
-    "id": "2ac6f78c.3593",
+    "id": "cee26b03.9d9c08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1786.5,
-    "y": 1146.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1785.5,
+    "y": 1140.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "ef8da568.fd8118"
+        "65101682.4139e"
       ]
     ]
   },
   {
-    "id": "26258b64.f3c8fc",
+    "id": "16e14c45.8f7a9c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1804.5,
-    "y": 1332.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1803.5,
+    "y": 1326.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "7d4dc212.e3372c"
+        "5a2356b9.ace14"
       ]
     ]
   },
   {
-    "id": "beea3693.1fcab",
+    "id": "c5269182.01e42",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1811.5,
-    "y": 1382.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1810.5,
+    "y": 1376.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "e0f4fa02.db48e"
+        "35f9d54c.a32492"
       ]
     ]
   },
   {
-    "id": "498b6cd0.790624",
+    "id": "f174a3e.2e99c6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1773.5,
-    "y": 1486.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1772.5,
+    "y": 1480.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "5ce422b3.c65204"
+        "7b317e34.63e888"
       ]
     ]
   },
   {
-    "id": "d4ecb14d.0a54a8",
+    "id": "8b63a167.2125c8",
     "type": "set",
     "name": "set topology",
     "xml": "<set>\n<parameter name='prop.l3vpn.topology' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1969.5,
-    "y": 146.99996948242188,
-    "z": "b93007d5.c3e538",
+    "x": 1968.5,
+    "y": 140.99996948242188,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "f3fb2ed6.50a728",
+    "id": "97ed26f3.136da8",
     "type": "set",
     "name": "set technology",
     "xml": "<set>\n<parameter name='prop.l3vpn.technology' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1959.5,
-    "y": 200.99996948242188,
-    "z": "b93007d5.c3e538",
+    "x": 1958.5,
+    "y": 194.99996948242188,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "884fbf7d.a8726",
+    "id": "9b2f5bce.e2493",
     "type": "set",
     "name": "set site1_name",
     "xml": "<set>\n<parameter name='prop.l3vpn.site1_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1963.5,
-    "y": 257.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1962.5,
+    "y": 251.99996948242188,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "3abb6840.ee26b",
+    "id": "ca017dc5.e6b6a",
     "type": "set",
     "name": "set site2_name",
     "xml": "<set>\n<parameter name='prop.l3vpn.site2_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1966.5,
-    "y": 316.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1965.5,
+    "y": 310.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "f20a7e76.25a3f",
+    "id": "7a5a1e9.b76ff6",
     "type": "set",
     "name": "set sna1_name",
     "xml": "<set>\n<parameter name='prop.l3vpn.sna1_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1974.5,
-    "y": 378.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1973.5,
+    "y": 372.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "d97cdc10.bd96d8",
+    "id": "9b74f8ad.ece11",
     "type": "set",
     "name": "set sna2_name",
     "xml": "<set>\n<parameter name='prop.l3vpn.sna2_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1966.5,
-    "y": 438.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1965.5,
+    "y": 432.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "427ba533.f11984",
+    "id": "de03ade1.de45c8",
     "type": "set",
     "name": "set pe1_id",
     "xml": "<set>\n<parameter name='prop.l3vpn.pe1_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1963.5,
-    "y": 498.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1962.5,
+    "y": 492.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "62408467.62a084",
+    "id": "7788fc94.c4a214",
     "type": "set",
     "name": "set pe2_id",
     "xml": "<set>\n<parameter name='prop.l3vpn.pe2_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1959.5,
-    "y": 569.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1958.5,
+    "y": 563.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "85e36dea.0819c8",
+    "id": "cc439e5e.959be",
     "type": "set",
     "name": "set ac1_id",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1952.5,
-    "y": 635.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1951.5,
+    "y": 629.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "58007bf7.116274",
+    "id": "7f607ee6.048328",
     "type": "set",
     "name": "set ac2_id",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1955.5,
-    "y": 702.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1954.5,
+    "y": 696.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "9deb79b0.29029",
+    "id": "82ba67e9.3e3948",
     "type": "set",
     "name": "set ac1_ip",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1931.5,
-    "y": 768.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1930.5,
+    "y": 762.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "8f458f7.ed1937",
+    "id": "78aa250c.4c86dc",
     "type": "set",
     "name": "set ac2_ip",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1935.5,
-    "y": 822.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1934.5,
+    "y": 816.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "33671733.0dc5e",
+    "id": "fed7f529.21c158",
     "type": "set",
     "name": "set ac1_peer_ip",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_peer_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1983.5,
-    "y": 877.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1982.5,
+    "y": 871.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "a34e89a8.ee1828",
+    "id": "1e28306.dccb65",
     "type": "set",
     "name": "set ac2_peer_ip",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_peer_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1979.5,
-    "y": 932.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1978.5,
+    "y": 926.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "886acd80.98921",
+    "id": "7587d056.b8eff8",
     "type": "set",
     "name": "set ac1_svlan",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_svlan' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1973.5,
-    "y": 987.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1972.5,
+    "y": 981.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "2a432c87.a87a1c",
+    "id": "ec48bf2e.e56588",
     "type": "set",
     "name": "set ac2_svlan",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_svlan' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1970.5,
-    "y": 1040.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1969.5,
+    "y": 1034.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "5eed1069.6712b8",
+    "id": "a9616742.2a0ca",
     "type": "set",
     "name": "set ac1_protocol",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_protocol' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1968.5,
-    "y": 1097.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1967.5,
+    "y": 1091.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "ef8da568.fd8118",
+    "id": "65101682.4139e",
     "type": "set",
     "name": "set ac2_protocol",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_protocol' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1977.5,
-    "y": 1149.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1976.5,
+    "y": 1143.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "7d4dc212.e3372c",
+    "id": "5a2356b9.ace14",
     "type": "set",
     "name": "set ac1_protocol_bgp_as",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_protocol_bgp_as' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n<parameter name='prop.l3vpn.peer1-ip' value='`$prop.l3vpn.ac1_ip`' />\n",
     "comments": "",
-    "x": 2071.5,
-    "y": 1353.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 2070.5,
+    "y": 1347.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "e0f4fa02.db48e",
+    "id": "35f9d54c.a32492",
     "type": "set",
     "name": "set ac2_protocol_bgp_as",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_protocol_bgp_as' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n<parameter name='prop.l3vpn.peer2-ip' value='`$prop.l3vpn.ac2_ip`' />\n",
     "comments": "",
-    "x": 2083.5,
-    "y": 1402.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 2082.5,
+    "y": 1396.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "5ce422b3.c65204",
+    "id": "7b317e34.63e888",
     "type": "set",
     "name": "set af_type",
     "xml": "<set>\n<parameter name='prop.l3vpn.af_type' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1967.5,
-    "y": 1496.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1966.5,
+    "y": 1490.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "7b077cdc.2f71b4",
+    "id": "b2d33596.d59c1",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"Time\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"Method\" value=\"network-topology-operation-create\"/>\n<parameter name=\"SubMethod\" value=\"L3VPN-Config\"/>\n<parameter name=\"l3vpn_name\" value=\"`$prop.l3vpn.name`\"/>\n<parameter name=\"topology\" value=\"`$prop.l3vpn.topology`\"/>\n<parameter name=\"site1_name\" value=\"`$prop.l3vpn.site1_name`\"/>\n<parameter name=\"vpn-policy1-id\" value=\"`$prop.l3vpn.vpn-policy1-id}`\"/>\n<parameter name=\"l3vpn.entry1-id\" value=\"`$prop.l3vpn.entry1-id`\"/>\n<parameter name=\"sna1_name\" value=\"`$prop.l3vpn.sna1_name`\"/>\n<parameter name=\"pe1_id\" value=\"`$prop.l3vpn.pe1_id`\"/>\n<parameter name=\"ac1_id\" value=\"`$prop.l3vpn.ac1_id`\"/>\n<parameter name=\"sna1_svlan\" value=\"`$prop.l3vpn.sna1_svlan`\"/>\n<parameter name=\"ac1-peer-ip\" value=\"`$prop.l3vpn.ac1-peer-ip`\"/>\n<parameter name=\"ac1-ip\" value=\"`$prop.l3vpn.ac1-ip`\"/>\n<parameter name=\"ac1_protocol\" value=\"`$prop.l3vpn.ac1_protocol`\"/>\n<parameter name=\"sna1-route-ip-prefix\" value=\"`$prop.l3vpn.sna1-route-ip-prefix`\"/>\n<parameter name=\"sna1-route-next-hop\" value=\"`$prop.l3vpn.sna1-route-next-hop`\"/>\n<parameter name=\"peer2-ip\" value=\"`$prop.l3vpn.peer2-ip`\"/>\n<parameter name=\"ac2_protocol_bgp_as\" value=\"`$prop.l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"vrf1-id\" value=\"`$prop.l3vpn.vrf1-id`\"/>\n<parameter name=\"site2_name\" value=\"`$prop.l3vpn.site2_name`\"/>\n<parameter name=\"vpn-policy2-id\" value=\"`$prop.l3vpn.vpn-policy2-id}`\"/>\n<parameter name=\"l3vpn.entry2-id\" value=\"`$prop.l3vpn.entry2-id`\"/>\n<parameter name=\"sna2_name\" value=\"`$prop.l3vpn.sna2_name`\"/>\n<parameter name=\"pe2_id\" value=\"`$prop.l3vpn.pe2_id`\"/>\n<parameter name=\"ac2_id\" value=\"`$prop.l3vpn.ac2_id`\"/>\n<parameter name=\"sna2_svlan\" value=\"`$prop.l3vpn.sna2_svlan`\"/>\n<parameter name=\"ac2-peer-ip\" value=\"`$prop.l3vpn.ac2-peer-ip`\"/>\n<parameter name=\"ac2-ip\" value=\"`$prop.l3vpn.ac2-ip`\"/>\n<parameter name=\"ac2_protocol\" value=\"`$prop.l3vpn.ac2_protocol`\"/>\n<parameter name=\"sna2-route-ip-prefix\" value=\"`$prop.l3vpn.sna2-route-ip-prefix`\"/>\n<parameter name=\"sna2-route-next-hop\" value=\"`$prop.l3vpn.sna2-route-next-hop`\"/>\n<parameter name=\"peer2-ip\" value=\"`$prop.l3vpn.peer2-ip`\"/>\n<parameter name=\"ac2_protocol_bgp_as\" value=\"`$prop.l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"vrf2-id\" value=\"`$prop.l3vpn.vrf2-id`\"/>\n<parameter name=\"af_type\" value=\"`$prop.l3vpn.af_type`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 718,
-    "y": 988,
-    "z": "b93007d5.c3e538",
+    "x": 717,
+    "y": 982,
+    "z": "4d931804.43f9f",
     "wires": [
       []
     ]
   },
   {
-    "id": "b4f42ae7.52446",
+    "id": "c00ac3fa.32f9e",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 699,
-    "y": 1134,
-    "z": "b93007d5.c3e538",
+    "x": 698,
+    "y": 1128,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "ccafc029.2ca668",
-        "83222ede.275488",
-        "9be175a2.890088"
+        "c698b222.502b88",
+        "db8a34f.58a0b48",
+        "56357348.8f579c"
       ]
     ]
   },
   {
-    "id": "ccafc029.2ca668",
+    "id": "c698b222.502b88",
     "type": "outcomeTrue",
     "name": "l3vpn-ipwan",
     "xml": "<outcome value='l3vpn-ipwan'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 685,
-    "y": 1059,
-    "z": "b93007d5.c3e538",
+    "x": 684,
+    "y": 1053,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "86e0641c.9378b8"
+        "2087b578.62417a"
       ]
     ]
   },
   {
-    "id": "83222ede.275488",
+    "id": "db8a34f.58a0b48",
     "type": "outcomeTrue",
     "name": "l3vpn-sptn",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 841,
-    "y": 1202.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 840,
+    "y": 1196.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "cc196265.e16a88"
+        "771a98af.5ed45"
       ]
     ]
   },
   {
-    "id": "9be175a2.890088",
+    "id": "56357348.8f579c",
     "type": "outcomeTrue",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 839,
-    "y": 1281.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 838,
+    "y": 1275.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "a80e67f6.8ddf08"
+        "6d9cbcbd.3f88e4"
       ]
     ]
   },
   {
-    "id": "a80e67f6.8ddf08",
+    "id": "6d9cbcbd.3f88e4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Unexpected error retrieving vpn binding\" />\n\n",
     "comments": "",
-    "x": 1022,
-    "y": 1280.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1021,
+    "y": 1274.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "ddb7afb8.346658",
+    "id": "3cc192be.0780ae",
     "type": "execute",
     "name": "execute vpn-policy2-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vpn-policy2-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 807,
-    "y": 511.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 806,
+    "y": 505.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "41865338.ad795c"
+        "302083c7.ac3dac"
       ]
     ]
   },
   {
-    "id": "41865338.ad795c",
+    "id": "302083c7.ac3dac",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1032,
-    "y": 514.9999389648438,
-    "z": "b93007d5.c3e538",
+    "x": 1031,
+    "y": 508.99993896484375,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "983244e.df934b8"
+        "54073616.bf22b8"
       ]
     ]
   },
   {
-    "id": "983244e.df934b8",
+    "id": "54073616.bf22b8",
     "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 vpn policy ID\" />\n",
     "comments": "",
-    "x": 1213,
-    "y": 512.9999389648438,
-    "z": "b93007d5.c3e538",
+    "x": 1212,
+    "y": 506.99993896484375,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "1ca86563.d30703",
+    "id": "74f090f.f41e0f",
     "type": "set",
     "name": "set policy entry",
     "xml": "<set>\n<parameter name='prop.l3vpn.entry1-id' value='1' />\n<parameter name='prop.l3vpn.entry2-id' value='1' />\n\n",
     "comments": "",
-    "x": 793,
-    "y": 559.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 792,
+    "y": 553.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "2b5f5542.fd958a",
+    "id": "b8ee366a.f0394",
     "type": "execute",
     "name": "execute split ac1-route",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.l3vpn.ac1-route`'/>\n<parameter name=\"regex\" value=\" ## \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route1\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2197,
-    "y": 1209.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 2196,
+    "y": 1203.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "59c48fa4.84884",
-        "d90a37bb.c237f"
+        "ddb4705.fd9691",
+        "68d6fb06.f03804"
       ]
     ]
   },
   {
-    "id": "7e49a5fe.54752c",
+    "id": "18c39015.325968",
     "type": "switchNode",
     "name": "switch ac2_route",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_route'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1598,
-    "y": 1257.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1597,
+    "y": 1251.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "8fa0374a.f95938"
+        "3ccf3bc3.3e11b4"
       ]
     ]
   },
   {
-    "id": "b21efe21.6a6f38",
+    "id": "1a3c9b5d.13700d",
     "type": "switchNode",
     "name": "switch ac1_route",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_route'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1599,
-    "y": 1208.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1598,
+    "y": 1202.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "338cff27.30b9f8"
+        "2acb832d.497074"
       ]
     ]
   },
   {
-    "id": "338cff27.30b9f8",
+    "id": "2acb832d.497074",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1771,
-    "y": 1206.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1770,
+    "y": 1200.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "a82ee394.90f61"
+        "7a26ed2f.516504"
       ]
     ]
   },
   {
-    "id": "8fa0374a.f95938",
+    "id": "3ccf3bc3.3e11b4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1784,
-    "y": 1265.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1783,
+    "y": 1259.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "bf41117.64398f"
+        "7a2c30da.6c0ff8"
       ]
     ]
   },
   {
-    "id": "ebb40fd1.a6e278",
+    "id": "e6f43c15.04d7d8",
     "type": "set",
     "name": "set ac1_route",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_route' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2168,
-    "y": 1157.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 2167,
+    "y": 1151.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "1ebecf9.6d9703",
+    "id": "d68e6b1e.3b7a88",
     "type": "set",
     "name": "set ac2_route",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_route' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2166,
-    "y": 1257.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 2165,
+    "y": 1251.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "2c643f9e.330d9",
+    "id": "e330304a.7683b8",
     "type": "execute",
     "name": "execute split ac2-route",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.l3vpn.ac2-route`'/>\n<parameter name=\"regex\" value=\" ## \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route2\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2190,
-    "y": 1302.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 2189,
+    "y": 1296.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "353346ad.e73b3a",
-        "90a1b8e5.de4168"
+        "74434b75.2c92cc",
+        "15dee51f.f19993"
       ]
     ]
   },
   {
-    "id": "a82ee394.90f61",
+    "id": "7a26ed2f.516504",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1922,
-    "y": 1206.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1921,
+    "y": 1200.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "ebb40fd1.a6e278",
-        "2b5f5542.fd958a"
+        "e6f43c15.04d7d8",
+        "b8ee366a.f0394"
       ]
     ]
   },
   {
-    "id": "bf41117.64398f",
+    "id": "7a2c30da.6c0ff8",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1923,
-    "y": 1265.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1922,
+    "y": 1259.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "1ebecf9.6d9703",
-        "2c643f9e.330d9"
+        "d68e6b1e.3b7a88",
+        "e330304a.7683b8"
       ]
     ]
   },
   {
-    "id": "200a1605.cf89a2",
+    "id": "54853363.a6cb2c",
     "type": "execute",
     "name": "execute vrf1-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vrf1-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 792,
-    "y": 613,
-    "z": "b93007d5.c3e538",
+    "x": 791,
+    "y": 607,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "ccc1c7cc.dfb0f"
+        "9116d057.5fc3b8"
       ]
     ]
   },
   {
-    "id": "8739cde1.57a17",
+    "id": "5411c45f.3ab70c",
     "type": "execute",
     "name": "execute vrf2-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vrf2-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 789.3333740234375,
-    "y": 670.333251953125,
-    "z": "b93007d5.c3e538",
+    "x": 788.3333740234375,
+    "y": 664.333251953125,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "6487397b.1e3fb"
+        "b4142046.58a198"
       ]
     ]
   },
   {
-    "id": "6487397b.1e3fb",
+    "id": "b4142046.58a198",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1039.3333740234375,
-    "y": 676.333251953125,
-    "z": "b93007d5.c3e538",
+    "x": 1038.3333740234375,
+    "y": 670.333251953125,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "612da958.138ff"
+        "bc6dd7fc.1f785"
       ]
     ]
   },
   {
-    "id": "ccc1c7cc.dfb0f",
+    "id": "9116d057.5fc3b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1039,
-    "y": 617.9999389648438,
-    "z": "b93007d5.c3e538",
+    "x": 1038,
+    "y": 611.9999389648438,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "27463d60.ad91ba"
+        "180eaafe.c7ddcd"
       ]
     ]
   },
   {
-    "id": "27463d60.ad91ba",
+    "id": "180eaafe.c7ddcd",
     "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 vpn policy ID\" />\n",
     "comments": "",
-    "x": 1220,
-    "y": 615.9999389648438,
-    "z": "b93007d5.c3e538",
+    "x": 1219,
+    "y": 609.9999389648438,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "612da958.138ff",
+    "id": "bc6dd7fc.1f785",
     "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 vpn policy ID\" />\n",
     "comments": "",
-    "x": 1220.3333740234375,
-    "y": 674.333251953125,
-    "z": "b93007d5.c3e538",
+    "x": 1219.3333740234375,
+    "y": 668.333251953125,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "86e0641c.9378b8",
+    "id": "2087b578.62417a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 864,
-    "y": 1059,
-    "z": "b93007d5.c3e538",
+    "x": 863,
+    "y": 1053,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "65abf066.8e6488",
-        "5c181e9f.160958",
-        "5af1a08.5be54e"
+        "8c395a0a.a246c8",
+        "684d1f56.45dbc",
+        "b745c53.90938b8"
       ]
     ]
   },
   {
-    "id": "5c181e9f.160958",
+    "id": "684d1f56.45dbc",
     "type": "execute",
     "name": "execute RestApiCallNode IPWAN Site Config",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l3smvpntemplate.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1170,
-    "y": 1054.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1169,
+    "y": 1048.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       []
     ]
   },
   {
-    "id": "5af1a08.5be54e",
+    "id": "b745c53.90938b8",
     "type": "execute",
     "name": "execute RestApiCallNode IPWAN VRF Config",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l3smvpntemplate.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1168,
-    "y": 1125.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 1167,
+    "y": 1119.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       []
     ]
   },
   {
-    "id": "59c48fa4.84884",
+    "id": "ddb4705.fd9691",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2415,
-    "y": 1201.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 2414,
+    "y": 1195.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "a2f6539a.f13e48"
+        "f772d637.96bc1"
       ]
     ]
   },
   {
-    "id": "a2f6539a.f13e48",
+    "id": "f772d637.96bc1",
     "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 splitting sna1_route\" />\n",
     "comments": "",
-    "x": 2596,
-    "y": 1199.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 2595,
+    "y": 1193.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "353346ad.e73b3a",
+    "id": "74434b75.2c92cc",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2413,
-    "y": 1303.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 2412,
+    "y": 1297.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "64606169.f340a"
+        "96d44573.8b1e"
       ]
     ]
   },
   {
-    "id": "64606169.f340a",
+    "id": "96d44573.8b1e",
     "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 splitting sna1_route\" />\n",
     "comments": "",
-    "x": 2594,
-    "y": 1301.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 2593,
+    "y": 1295.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "d90a37bb.c237f",
+    "id": "68d6fb06.f03804",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2414,
-    "y": 1135.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 2413,
+    "y": 1129.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "9b121e11.8e6548"
+        "1ff92161.8fff2f"
       ]
     ]
   },
   {
-    "id": "90a1b8e5.de4168",
+    "id": "15dee51f.f19993",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2410,
-    "y": 1255.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 2409,
+    "y": 1249.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "798e96d1.dbe14"
+        "7cd46973.7a534"
       ]
     ]
   },
   {
-    "id": "9b121e11.8e6548",
+    "id": "1ff92161.8fff2f",
     "type": "set",
     "name": "set route1 ip-prefix next-hop",
     "xml": "<set>\n<parameter name='prop.l3vpn.sna1-route.ip-prefix' value='`$route1[0]`' />\n<parameter name='prop.l3vpn.sna1-route.next-hop' value='`$route1[1]`' />\n",
     "comments": "",
-    "x": 2621,
-    "y": 1129.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 2620,
+    "y": 1123.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "798e96d1.dbe14",
+    "id": "7cd46973.7a534",
     "type": "set",
     "name": "set route2 ip-prefix next-hop",
     "xml": "<set>\n<parameter name='prop.l3vpn.sna2-route.ip-prefix' value='`$route2[0]`' />\n<parameter name='prop.l3vpn.sna2-route.next-hop' value='`$route2[1]`' />",
     "comments": "",
-    "x": 2621,
-    "y": 1248.9999694824219,
-    "z": "b93007d5.c3e538",
+    "x": 2620,
+    "y": 1242.9999694824219,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "d21a23d8.b0bee",
+    "id": "af24f51b.e33eb",
     "type": "execute",
     "name": "execute generate-underlay-network-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.network-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 848,
-    "y": 764,
-    "z": "b93007d5.c3e538",
+    "x": 847,
+    "y": 758,
+    "z": "4d931804.43f9f",
     "wires": [
       []
     ]
   },
   {
-    "id": "1ae283a6.1cae6c",
+    "id": "98d8796c.a3bbc",
     "type": "switchNode",
     "name": "switch service-data.networks_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 806,
-    "y": 845,
-    "z": "b93007d5.c3e538",
+    "x": 805,
+    "y": 839,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "2049b18f.3dcc96",
-        "f048277d.a89e68"
+        "6ea3b109.b3364",
+        "5169eb5.4d74c94"
       ]
     ]
   },
   {
-    "id": "2049b18f.3dcc96",
+    "id": "6ea3b109.b3364",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1079.8095703125,
-    "y": 813.952392578125,
-    "z": "b93007d5.c3e538",
+    "x": 1078.8095703125,
+    "y": 807.952392578125,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "a9b3eba7.b952d"
+        "19b6c967.f095e7"
       ]
     ]
   },
   {
-    "id": "f048277d.a89e68",
+    "id": "5169eb5.4d74c94",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1074.666748046875,
-    "y": 859.6666870117188,
-    "z": "b93007d5.c3e538",
+    "x": 1073.666748046875,
+    "y": 853.6666870117188,
+    "z": "4d931804.43f9f",
     "wires": [
       [
-        "7b2cabce.1a9454"
+        "ea699e67.4bd718"
       ]
     ]
   },
   {
-    "id": "a9b3eba7.b952d",
+    "id": "19b6c967.f095e7",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='0' />\n",
     "comments": "",
-    "x": 1232.8095703125,
-    "y": 813.5238037109375,
-    "z": "b93007d5.c3e538",
+    "x": 1231.8095703125,
+    "y": 807.5238037109375,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "7b2cabce.1a9454",
+    "id": "ea699e67.4bd718",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments": "",
-    "x": 1234.2381591796875,
-    "y": 858.5238647460938,
-    "z": "b93007d5.c3e538",
+    "x": 1233.2381591796875,
+    "y": 852.5238647460938,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "1e4e53c1.72218c",
+    "id": "64964558.e55ee4",
     "type": "set",
     "name": "set network in service-data",
     "xml": "<set>\n<parameter name=\"service-data.networks.network[$nidx].network-id\" value='`$prop.l3vpn.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": 788,
-    "y": 908,
-    "z": "b93007d5.c3e538",
+    "x": 787,
+    "y": 902,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "881693df.98a5b",
+    "id": "8ea2eceb.3de538",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$prop.l3vpn.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/'  + $prop.l3vpn.network-id  + '/network-data/'` \" />",
     "comments": "",
-    "x": 772,
-    "y": 1338,
-    "z": "b93007d5.c3e538",
+    "x": 771,
+    "y": 1332,
+    "z": "4d931804.43f9f",
     "wires": []
   },
   {
-    "id": "8aae558c.098818",
+    "id": "da8e6fe4.5c07a8",
     "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": 688,
-    "y": 1395,
-    "z": "b93007d5.c3e538",
+    "x": 686,
+    "y": 1457,
+    "z": "4d931804.43f9f",
+    "wires": []
+  },
+  {
+    "id": "51c60b4c.2a6944",
+    "type": "set",
+    "name": "set network-level-oper-status",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.networks.network[$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[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
+    "comments": "",
+    "x": 743,
+    "y": 1391,
+    "z": "4d931804.43f9f",
     "wires": []
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json
index b2343d8f..fd3f15cc 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "2db23fe0.b16e38",
+    "id": "827d7697.e161a8",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 100,
-    "y": 152,
-    "z": "e28e0974.bf7d98",
+    "x": 93,
+    "y": 84,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "ef877c4e.31bde"
+        "6fb89758.08cae8"
       ]
     ]
   },
   {
-    "id": "ef877c4e.31bde",
+    "id": "6fb89758.08cae8",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,343 +22,600 @@
     "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.00000381469727,
-    "y": 224.0000171661377,
-    "z": "e28e0974.bf7d98",
+    "x": 305.00000381469727,
+    "y": 156.0000171661377,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "b072980d.888498"
+        "c0e8cad3.da0c8"
       ]
     ]
   },
   {
-    "id": "b072980d.888498",
+    "id": "c0e8cad3.da0c8",
     "type": "method",
     "name": "method network-topology-operation-delete",
     "xml": "<method rpc='network-topology-operation-delete' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 300.0001220703125,
-    "y": 312,
-    "z": "e28e0974.bf7d98",
+    "x": 293.0001220703125,
+    "y": 244,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "f8af1418.cc8ab"
+        "a6f45139.fa877"
       ]
     ]
   },
   {
-    "id": "f8af1418.cc8ab",
+    "id": "a6f45139.fa877",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 576.0000305175781,
-    "y": 320.00001335144043,
-    "z": "e28e0974.bf7d98",
+    "x": 569.0000305175781,
+    "y": 252.00001335144043,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "17c4f39b.027bc4",
-        "e45c0fc3.d713c",
-        "627b018f.f2a78",
-        "54181c1f.692d04",
-        "8e12230b.25a0e"
+        "30175b96.175abc",
+        "ecfd60c5.b2e578",
+        "cfff2d7f.0d80f8",
+        "dc355ee1.94a83",
+        "6101a41d.088144",
+        "d633fa40.e632f",
+        "c7fcf65d.3267e",
+        "a8af32f0.52f9a"
       ]
     ]
   },
   {
-    "id": "17c4f39b.027bc4",
+    "id": "30175b96.175abc",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 897,
-    "y": 146,
-    "z": "e28e0974.bf7d98",
+    "x": 890,
+    "y": 35,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       []
     ]
   },
   {
-    "id": "e45c0fc3.d713c",
+    "id": "ecfd60c5.b2e578",
     "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": 854,
-    "y": 446,
-    "z": "e28e0974.bf7d98",
+    "x": 847,
+    "y": 378,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "ae751a67.af5318",
-        "286e1ce2.b1b734",
-        "381203c2.6a9ed4"
+        "f7a8fca4.b3ad",
+        "aa0ec94f.00fa6",
+        "1ecf0d2.4909473"
       ]
     ]
   },
   {
-    "id": "ae751a67.af5318",
+    "id": "f7a8fca4.b3ad",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1170,
-    "y": 390,
-    "z": "e28e0974.bf7d98",
+    "x": 1163,
+    "y": 322,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "1faac458.f1d3d4"
+        "f83a9763.b4b58"
       ]
     ]
   },
   {
-    "id": "286e1ce2.b1b734",
+    "id": "aa0ec94f.00fa6",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1173.490966796875,
-    "y": 437.57403564453125,
-    "z": "e28e0974.bf7d98",
+    "x": 1166.490966796875,
+    "y": 369.57403564453125,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "9ef4deef.91afd8"
+        "b04696c4.58fe88"
       ]
     ]
   },
   {
-    "id": "381203c2.6a9ed4",
+    "id": "1ecf0d2.4909473",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1168.823974609375,
-    "y": 478.9073486328125,
-    "z": "e28e0974.bf7d98",
+    "x": 1161.823974609375,
+    "y": 410.9073486328125,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "44d4a0f0.d6bf98"
+        "479ab3c0.7b5764"
       ]
     ]
   },
   {
-    "id": "9ef4deef.91afd8",
+    "id": "b04696c4.58fe88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Network model is_bound_to_vpn=true but no vpn_binding is present\" />\n\n",
     "comments": "",
-    "x": 1350.0623779296875,
-    "y": 425.8597717285156,
-    "z": "e28e0974.bf7d98",
+    "x": 1343.0623779296875,
+    "y": 357.8597717285156,
+    "z": "2b9e11cc.456d3e",
     "wires": []
   },
   {
-    "id": "44d4a0f0.d6bf98",
+    "id": "479ab3c0.7b5764",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Unexpected error retrieving vpn binding\" />\n\n",
     "comments": "",
-    "x": 1356.5965309143066,
-    "y": 474.3465414047241,
-    "z": "e28e0974.bf7d98",
+    "x": 1349.5965309143066,
+    "y": 406.3465414047241,
+    "z": "2b9e11cc.456d3e",
     "wires": []
   },
   {
-    "id": "1faac458.f1d3d4",
+    "id": "f83a9763.b4b58",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1348.205322265625,
-    "y": 382.57403564453125,
-    "z": "e28e0974.bf7d98",
+    "x": 1341.205322265625,
+    "y": 314.57403564453125,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       []
     ]
   },
   {
-    "id": "627b018f.f2a78",
+    "id": "cfff2d7f.0d80f8",
     "type": "for",
     "name": "for each network-input-parameters",
-    "xml": "<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n",
+    "xml": "<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 859,
-    "y": 281,
-    "z": "e28e0974.bf7d98",
+    "x": 852,
+    "y": 213,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "55bd9517.8a2a3c"
+        "8482cde8.2496f8"
       ]
     ]
   },
   {
-    "id": "55bd9517.8a2a3c",
+    "id": "8482cde8.2496f8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1140.8333740234375,
-    "y": 259.3333435058594,
-    "z": "e28e0974.bf7d98",
+    "x": 1133.8333740234375,
+    "y": 191.33334350585938,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "aaca6566.847a28",
-        "58c4c980.63f76"
+        "f44089bc.f2b86",
+        "bd431753.a4c8f"
       ]
     ]
   },
   {
-    "id": "aaca6566.847a28",
+    "id": "f44089bc.f2b86",
     "type": "switchNode",
     "name": "switch name",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
+    "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1349,
-    "y": 220,
-    "z": "e28e0974.bf7d98",
+    "x": 1342,
+    "y": 152,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "e38f6b1e.d2dbc"
+        "a1e5b819.cd782"
       ]
     ]
   },
   {
-    "id": "e38f6b1e.d2dbc",
+    "id": "a1e5b819.cd782",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1536,
-    "y": 220,
-    "z": "e28e0974.bf7d98",
+    "x": 1529,
+    "y": 152,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "ce711958.0f3dd8"
+        "8d993f14.d7c67"
       ]
     ]
   },
   {
-    "id": "ce711958.0f3dd8",
+    "id": "8d993f14.d7c67",
     "type": "set",
     "name": "set name",
-    "xml": "<set>\n<parameter name='prop.l3vpn.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "xml": "<set>\n<parameter name='prop.l3vpn.name' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1704,
-    "y": 220.60000610351562,
-    "z": "e28e0974.bf7d98",
+    "x": 1697,
+    "y": 152.60000610351562,
+    "z": "2b9e11cc.456d3e",
     "wires": []
   },
   {
-    "id": "58c4c980.63f76",
+    "id": "bd431753.a4c8f",
     "type": "switchNode",
     "name": "switch service-type",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`\">\n",
+    "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1352.9999389648438,
-    "y": 281.5999755859375,
-    "z": "e28e0974.bf7d98",
+    "x": 1345.9999389648438,
+    "y": 213.5999755859375,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "416447eb.c5c02"
+        "264d1797.9d01f8"
       ]
     ]
   },
   {
-    "id": "416447eb.c5c02",
+    "id": "264d1797.9d01f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1537.9999389648438,
-    "y": 279.5999755859375,
-    "z": "e28e0974.bf7d98",
+    "x": 1530.9999389648438,
+    "y": 211.5999755859375,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "a89b0168.c64988"
+        "b160eb3c.cbb848"
       ]
     ]
   },
   {
-    "id": "a89b0168.c64988",
+    "id": "b160eb3c.cbb848",
     "type": "set",
     "name": "set service-type",
-    "xml": "<set>\n<parameter name='prop.l3vpn.service-type' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "xml": "<set>\n<parameter name='prop.l3vpn.service-type' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1706.9999389648438,
-    "y": 277.5999755859375,
-    "z": "e28e0974.bf7d98",
+    "x": 1699.9999389648438,
+    "y": 209.5999755859375,
+    "z": "2b9e11cc.456d3e",
     "wires": []
   },
   {
-    "id": "54181c1f.692d04",
+    "id": "dc355ee1.94a83",
     "type": "set",
     "name": "set controller data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`\" />\n",
     "comments": "",
-    "x": 819,
-    "y": 557,
-    "z": "e28e0974.bf7d98",
+    "x": 812,
+    "y": 489,
+    "z": "2b9e11cc.456d3e",
     "wires": []
   },
   {
-    "id": "cd353a.555cb2c8",
+    "id": "cb586993.f0a33",
     "type": "execute",
     "name": "execute REST DELETE VPN",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l3smvpntemplate.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services/vpnservice='+$prop.l3vpn.name'\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1330,
-    "y": 634,
-    "z": "e28e0974.bf7d98",
+    "x": 1323,
+    "y": 566,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       []
     ]
   },
   {
-    "id": "8e12230b.25a0e",
+    "id": "6101a41d.088144",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$prop.l3vpn.service-type`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 800,
-    "y": 652,
-    "z": "e28e0974.bf7d98",
+    "x": 793,
+    "y": 584,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "ecc26c17.c6fc7"
+        "4afcdb87.e97234"
       ]
     ]
   },
   {
-    "id": "ecc26c17.c6fc7",
+    "id": "4afcdb87.e97234",
     "type": "outcomeTrue",
     "name": "l3vpn-ipwan",
     "xml": "<outcome value='l3vpn-ipwan'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1050,
-    "y": 636,
-    "z": "e28e0974.bf7d98",
+    "x": 1043,
+    "y": 568,
+    "z": "2b9e11cc.456d3e",
+    "wires": [
+      [
+        "cb586993.f0a33"
+      ]
+    ]
+  },
+  {
+    "id": "d633fa40.e632f",
+    "type": "switchNode",
+    "name": "switch service-data.networks.network_length",
+    "xml": "<switch test='`$service-data.networks.network_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 832,
+    "y": 108,
+    "z": "2b9e11cc.456d3e",
+    "wires": [
+      [
+        "cd115f81.9765",
+        "8c843586.ed486"
+      ]
+    ]
+  },
+  {
+    "id": "cd115f81.9765",
+    "type": "other",
+    "name": "outcome Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1277,
+    "y": 34.00006103515625,
+    "z": "2b9e11cc.456d3e",
     "wires": [
       [
-        "cd353a.555cb2c8"
+        "9468f013.3839a8"
       ]
     ]
+  },
+  {
+    "id": "9468f013.3839a8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"network-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
+    "comments": "",
+    "x": 1467.7774658203125,
+    "y": 20.889007568359375,
+    "z": "2b9e11cc.456d3e",
+    "wires": []
+  },
+  {
+    "id": "8c843586.ed486",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1161.0003662109375,
+    "y": 99.00007629394531,
+    "z": "2b9e11cc.456d3e",
+    "wires": [
+      [
+        "c38355cb.b91f58"
+      ]
+    ]
+  },
+  {
+    "id": "c38355cb.b91f58",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1332.2698974609375,
+    "y": 82.55461120605469,
+    "z": "2b9e11cc.456d3e",
+    "wires": [
+      [
+        "da8d2eef.9ecfc8",
+        "2abc9e2a.3b6932"
+      ]
+    ]
+  },
+  {
+    "id": "da8d2eef.9ecfc8",
+    "type": "for",
+    "name": "for nidx..service-data.networks.network[]",
+    "xml": "<for index='nidx' start='0' end='`$service-data.networks.network_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1630.285888671875,
+    "y": 63.428619384765625,
+    "z": "2b9e11cc.456d3e",
+    "wires": [
+      [
+        "788ddd9c.802654"
+      ]
+    ]
+  },
+  {
+    "id": "2abc9e2a.3b6932",
+    "type": "switchNode",
+    "name": "switch tmp.nidx ",
+    "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1551.5872802734375,
+    "y": 106.41180419921875,
+    "z": "2b9e11cc.456d3e",
+    "wires": [
+      [
+        "d0a99363.1c30e"
+      ]
+    ]
+  },
+  {
+    "id": "d0a99363.1c30e",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1752.015869140625,
+    "y": 111.98321533203125,
+    "z": "2b9e11cc.456d3e",
+    "wires": [
+      [
+        "ea14dde0.93393"
+      ]
+    ]
+  },
+  {
+    "id": "788ddd9c.802654",
+    "type": "switchNode",
+    "name": "switch networkid found",
+    "xml": "<switch test=\"`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1940.7144775390625,
+    "y": 61.6787109375,
+    "z": "2b9e11cc.456d3e",
+    "wires": [
+      [
+        "c02919ae.22f7c"
+      ]
+    ]
+  },
+  {
+    "id": "ea14dde0.93393",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"network-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
+    "comments": "",
+    "x": 1923.4443359375,
+    "y": 112.12606811523438,
+    "z": "2b9e11cc.456d3e",
+    "wires": []
+  },
+  {
+    "id": "c02919ae.22f7c",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2146.666748046875,
+    "y": 60.571441650390625,
+    "z": "2b9e11cc.456d3e",
+    "wires": [
+      [
+        "64769a39.b95ddc"
+      ]
+    ]
+  },
+  {
+    "id": "64769a39.b95ddc",
+    "type": "set",
+    "name": "set tmp.nidx and ctx.network-data",
+    "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].`' />\n",
+    "comments": "",
+    "x": 2385.198486328125,
+    "y": 56.321441650390625,
+    "z": "2b9e11cc.456d3e",
+    "wires": []
+  },
+  {
+    "id": "c7fcf65d.3267e",
+    "type": "block",
+    "name": "block : saveNetworkData",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 811,
+    "y": 674,
+    "z": "2b9e11cc.456d3e",
+    "wires": [
+      [
+        "90f2187a.a0ed98",
+        "d97a2187.fc0188",
+        "8edd5656.7d422",
+        "8bc5ebfa.1b543"
+      ]
+    ]
+  },
+  {
+    "id": "a8af32f0.52f9a",
+    "type": "returnSuccess",
+    "name": "return success",
+    "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+    "comments": "",
+    "x": 771.6665802001953,
+    "y": 807.3332815170288,
+    "z": "2b9e11cc.456d3e",
+    "wires": []
+  },
+  {
+    "id": "8edd5656.7d422",
+    "type": "set",
+    "name": "copy input to service-data",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n",
+    "comments": "",
+    "x": 1104.0000076293945,
+    "y": 654.3333120346069,
+    "z": "2b9e11cc.456d3e",
+    "wires": []
+  },
+  {
+    "id": "90f2187a.a0ed98",
+    "type": "set",
+    "name": "set networkId",
+    "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
+    "comments": "",
+    "x": 1068.2895622253418,
+    "y": 698.0511589050293,
+    "z": "2b9e11cc.456d3e",
+    "wires": []
+  },
+  {
+    "id": "d97a2187.fc0188",
+    "type": "set",
+    "name": "set object-path",
+    "xml": "<set>\n<parameter name='network-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/'\n + $networkId\n + '/network-data/'` \" />\n \n",
+    "comments": "",
+    "x": 1074.0039291381836,
+    "y": 735.1940507888794,
+    "z": "2b9e11cc.456d3e",
+    "wires": []
+  },
+  {
+    "id": "8bc5ebfa.1b543",
+    "type": "set",
+    "name": "set network-level-oper-status",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Deleted' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n",
+    "comments": "",
+    "x": 1117.9999389648438,
+    "y": 782.333270072937,
+    "z": "2b9e11cc.456d3e",
+    "wires": []
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
index f76a824a..f4f96055 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
@@ -1,1086 +1,1026 @@
 [
   {
-    "id":"fa4ef6c1.4eb578",
-    "type":"dgstart",
-    "name":"DGSTART",
-    "outputs":1,
-    "x":79.66666412353516,
-    "y":118.0478286743164,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "a6c81f95.1fa118",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 100.99998092651367,
+    "y": 142.0476369857788,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "ca5f7f5c.05d2"
+        "a7b8fbd6.6571b8"
       ]
     ]
   },
   {
-    "id":"ca5f7f5c.05d2",
-    "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":324.95237731933594,
-    "y":117.28590774536133,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "a7b8fbd6.6571b8",
+    "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": 346.28569412231445,
+    "y": 141.28571605682373,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "8645455c.b98c28"
+        "45cf957f.7d2f24"
       ]
     ]
   },
   {
-    "id":"8645455c.b98c28",
-    "type":"method",
-    "name":"method validate-network-input-parameters",
-    "xml":"<method rpc='validate-network-input-parameters' mode='sync'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":282.5833511352539,
-    "y":192.30084609985352,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "45cf957f.7d2f24",
+    "type": "method",
+    "name": "method validate-network-input-parameters",
+    "xml": "<method rpc='validate-network-input-parameters' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 303.9166679382324,
+    "y": 216.30065441131592,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "9b7f7c48.ea161"
+        "c3df6ec7.366e"
       ]
     ]
   },
   {
-    "id":"9b7f7c48.ea161",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":566.5833587646484,
-    "y":180.30087089538574,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "c3df6ec7.366e",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 587.916675567627,
+    "y": 204.30067920684814,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "e6ff88ab.904e18",
-        "ddfba2e8.a63b3"
+        "3e0f268c.78cbaa",
+        "5d08a6e7.19c55"
       ]
     ]
   },
   {
-    "id":"e6ff88ab.904e18",
-    "type":"switchNode",
-    "name":"switch  svc-action",
-    "xml":"<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":847.5833587646484,
-    "y":175.300856590271,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "3e0f268c.78cbaa",
+    "type": "switchNode",
+    "name": "switch  svc-action",
+    "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 868.916675567627,
+    "y": 199.3006649017334,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "4f39bff8.da67"
+        "8c7d88cf.19c588"
       ]
     ]
   },
   {
-    "id":"4f39bff8.da67",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":1038.2976608276367,
-    "y":176.3008575439453,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "8c7d88cf.19c588",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1059.6309776306152,
+    "y": 200.30066585540771,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "a348b04f.fc644"
+        "a12c30e5.545f9"
       ]
     ]
   },
   {
-    "id":"a348b04f.fc644",
-    "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-request-id is a required input\" />\n",
-    "comments":"",
-    "x":1212.7262115478516,
-    "y":175.30084991455078,
-    "z":"85858cc8.f3e21",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ddfba2e8.a63b3",
-    "type":"switchNode",
-    "name":"switch svc-action",
-    "xml":"<switch test='`$service-topology-operation-input.sdnc-request-header.svc-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":148.58330535888672,
-    "y":451.30087089538574,
-    "z":"85858cc8.f3e21",
-    "wires":[
-      [
-        "6e77eb2e.738e04",
-        "e71878f5.f29958",
-        "9addc920.903ef8",
-        "428444e0.ca842c",
-        "55e08239.49f15c"
-      ]
-    ]
-  },
-  {
-    "id":"6e77eb2e.738e04",
-    "type":"outcome",
-    "name":"create",
-    "xml":"<outcome value='create'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":350.08338928222656,
-    "y":451.30087089538574,
-    "z":"85858cc8.f3e21",
-    "wires":[
-      [
-        "89568ddf.5b471"
-      ]
-    ]
-  },
-  {
-    "id":"89568ddf.5b471",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":516.0833969116211,
-    "y":451.30087089538574,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "a12c30e5.545f9",
+    "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-request-id is a required input\" />\n",
+    "comments": "",
+    "x": 1234.05952835083,
+    "y": 199.30065822601318,
+    "z": "65c9aaba.d47f7c",
+    "wires": []
+  },
+  {
+    "id": "5d08a6e7.19c55",
+    "type": "switchNode",
+    "name": "switch svc-action",
+    "xml": "<switch test='`$service-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 169.91662216186523,
+    "y": 475.30067920684814,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "f6c08df5.6fb1"
+        "7698d5c.1143dac",
+        "c834ebc1.b37db",
+        "280a1dfa.b0ef12",
+        "40cce0a9.5132b8",
+        "5ba97181.5ecc78"
       ]
     ]
   },
   {
-    "id":"6c4b1b37.01f564",
-    "type":"for",
-    "name":"for loop i - Network input parameters",
-    "xml":"<for index=\"i\" start=\"0\" end=\"`$network-topology-information.network-request-input.network-input-parameters.param_length`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1715.2975387573242,
-    "y":115.01514053344727,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "7698d5c.1143dac",
+    "type": "outcome",
+    "name": "create",
+    "xml": "<outcome value='create'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 371.4167060852051,
+    "y": 475.30067920684814,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "e6126a8f.3bd648"
+        "1379c979.4ffbd7"
       ]
     ]
   },
   {
-    "id":"29338172.3d043e",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$tmp.value`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2568.8688888549805,
-    "y":369.01511573791504,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "1379c979.4ffbd7",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 537.4167137145996,
+    "y": 475.30067920684814,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "612b673.300ba98"
+        "97127fcd.491ca8"
       ]
     ]
   },
   {
-    "id":"612b673.300ba98",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":2785.8688621520996,
-    "y":368.01512145996094,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "9bc1551b.7cbc08",
+    "type": "for",
+    "name": "for loop i - Network input parameters",
+    "xml": "<for index=\"i\" start=\"0\" end=\"`$network-topology-information.network-request-input.network-input-parameters.param_length`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1736.6308555603027,
+    "y": 139.01494884490967,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "7afa06c2.9e5448"
+        "5138f56a.465374"
       ]
     ]
   },
   {
-    "id":"7afa06c2.9e5448",
-    "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-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'\" />\n",
-    "comments":"",
-    "x":2964.297576904297,
-    "y":369.01512145996094,
-    "z":"85858cc8.f3e21",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"e71878f5.f29958",
-    "type":"outcome",
-    "name":"deactivate",
-    "xml":"<outcome value='deactivate'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":352.38094329833984,
-    "y":609.4763984680176,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "4640e206.76b664",
+    "type": "switchNode",
+    "name": "switch value",
+    "xml": "<switch test=\"`$tmp.value`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2590.202205657959,
+    "y": 393.01492404937744,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "239b0e93.1dcdc2"
+        "134be211.73f7be"
       ]
     ]
   },
   {
-    "id":"9addc920.903ef8",
-    "type":"outcome",
-    "name":"delete",
-    "xml":"<outcome value='delete'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":356.0953254699707,
-    "y":780.1909561157227,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "134be211.73f7be",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2807.202178955078,
+    "y": 392.01492977142334,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "f1a885d0.8cce28"
+        "d41b48b9.7616f8"
       ]
     ]
   },
   {
-    "id":"428444e0.ca842c",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":353.85720443725586,
-    "y":734.6192245483398,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "d41b48b9.7616f8",
+    "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-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'\" />\n",
+    "comments": "",
+    "x": 2985.6308937072754,
+    "y": 393.01492977142334,
+    "z": "65c9aaba.d47f7c",
+    "wires": []
+  },
+  {
+    "id": "c834ebc1.b37db",
+    "type": "outcome",
+    "name": "deactivate",
+    "xml": "<outcome value='deactivate'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 373.71426010131836,
+    "y": 633.47620677948,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "e64ba27d.4c375"
+        "2303dff.d38ae2"
       ]
     ]
   },
   {
-    "id":"e64ba27d.4c375",
-    "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.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
-    "comments":"",
-    "x":507.4287796020508,
-    "y":737.2383685112,
-    "z":"85858cc8.f3e21",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"e6126a8f.3bd648",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1593.3809127807617,
-    "y":261.76208877563477,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "280a1dfa.b0ef12",
+    "type": "outcome",
+    "name": "delete",
+    "xml": "<outcome value='delete'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 377.4286422729492,
+    "y": 804.1907644271851,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "ccd87bc0.9164f8",
-        "cb2894ec.bd74d8",
-        "6058dc0f.f41074"
+        "389ea1d5.79e916"
       ]
     ]
   },
   {
-    "id":"f6c08df5.6fb1",
-    "type":"switchNode",
-    "name":"switch request-action",
-    "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":841.6666793823242,
-    "y":340.71449851989746,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "40cce0a9.5132b8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 375.1905212402344,
+    "y": 758.6190328598022,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "a05b6ee5.e1145",
-        "5ba95b98.5de334"
+        "1a84f642.1ab022"
       ]
     ]
   },
   {
-    "id":"a05b6ee5.e1145",
-    "type":"other",
-    "name":"CreateNetworkInstance",
-    "xml":"<outcome value='CreateNetworkInstance'>",
-    "comments":"",
-    "outputs":1,
-    "x":1107.6666793823242,
-    "y":299.71449851989746,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "1a84f642.1ab022",
+    "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.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
+    "comments": "",
+    "x": 528.7620964050293,
+    "y": 761.2381768226624,
+    "z": "65c9aaba.d47f7c",
+    "wires": []
+  },
+  {
+    "id": "5138f56a.465374",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1614.7142295837402,
+    "y": 285.76189708709717,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "90527be5.0854c8"
+        "29c502b.740c77e",
+        "6b4d7b55.4c2ff4",
+        "9b824272.4adc6"
       ]
     ]
   },
   {
-    "id":"5ba95b98.5de334",
-    "type":"other",
-    "name":"Other",
-    "xml":"<outcome value='Other'>",
-    "comments":"",
-    "outputs":1,
-    "x":1061.6666793823242,
-    "y":349.71449851989746,
-    "z":"85858cc8.f3e21",
-    "wires":[
-      [
-        "df81cf43.83855"
-      ]
-    ]
-  },
-  {
-    "id":"df81cf43.83855",
-    "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=\"request-information.request-action is required to be CreateNetworkInstance for svc-action=create\" />\n",
-    "comments":"",
-    "x":1230.6666793823242,
-    "y":349.71449851989746,
-    "z":"85858cc8.f3e21",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"90527be5.0854c8",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":1332.6666793823242,
-    "y":288.71449851989746,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "97127fcd.491ca8",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 862.9999961853027,
+    "y": 364.71430683135986,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "6c4b1b37.01f564"
+        "b86df3ce.626b8",
+        "ff7737a8.55111"
       ]
     ]
   },
   {
-    "id":"ccd87bc0.9164f8",
-    "type":"set",
-    "name":"clear tmp-data",
-    "xml":"<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",
-    "comments":"",
-    "x":1785.380973815918,
-    "y":216.00018692016602,
-    "z":"85858cc8.f3e21",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"cb2894ec.bd74d8",
-    "type":"set",
-    "name":"set tmp-data",
-    "xml":"<set>\n<parameter name='tmp.name' value=\"'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].name'\"/>\n<parameter name='tmp.value' value=\"'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].value'\"/>\n",
-    "comments":"",
-    "x":1774.380973815918,
-    "y":306.000186920166,
-    "z":"85858cc8.f3e21",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"6058dc0f.f41074",
-    "type":"switchNode",
-    "name":"switch name",
-    "xml":"<switch test=\"'$tmp.name'\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1753.380973815918,
-    "y":400.000186920166,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "b86df3ce.626b8",
+    "type": "other",
+    "name": "CreateNetworkInstance",
+    "xml": "<outcome value='CreateNetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1128.9999961853027,
+    "y": 323.71430683135986,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "225fa6e2.e42a6a",
-        "b1cea899.45bb78",
-        "b9c18c6.d77387",
-        "3d722919.f81306",
-        "7b7495f0.75885c",
-        "588a0bcd.6eb034",
-        "c510015f.64592",
-        "2187bd96.9aa5b2",
-        "10a4fa76.533046",
-        "f5abb1ff.c1ae",
-        "a7b43175.17a1e",
-        "7088b07a.e19a",
-        "6b511ebf.25f2b",
-        "77d1b8f5.2028a8",
-        "e96ec4f5.f46868",
-        "25d82e93.97f172",
-        "2c0ed5ac.b6f0aa"
+        "b782b5c0.64daa8"
       ]
     ]
   },
   {
-    "id":"225fa6e2.e42a6a",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":2292.952262878418,
-    "y":903.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "ff7737a8.55111",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1082.9999961853027,
+    "y": 373.71430683135986,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "9eb7590.5f32fa8"
+        "64b48b9c.6474c4"
       ]
     ]
   },
   {
-    "id":"9eb7590.5f32fa8",
-    "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.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
-    "comments":"",
-    "x":2467.952262878418,
-    "y":902.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"b1cea899.45bb78",
-    "type":"other",
-    "name":"name",
-    "xml":"<outcome value='name'>",
-    "comments":"",
-    "outputs":1,
-    "x":2269.952262878418,
-    "y":25.00016212463379,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "64b48b9c.6474c4",
+    "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=\"request-information.request-action is required to be CreateNetworkInstance for svc-action=create\" />\n",
+    "comments": "",
+    "x": 1251.9999961853027,
+    "y": 373.71430683135986,
+    "z": "65c9aaba.d47f7c",
+    "wires": []
+  },
+  {
+    "id": "b782b5c0.64daa8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1353.9999961853027,
+    "y": 312.71430683135986,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "9bc1551b.7cbc08"
       ]
     ]
   },
   {
-    "id":"b9c18c6.d77387",
-    "type":"other",
-    "name":"service-type",
-    "xml":"<outcome value='service-type'>",
-    "comments":"",
-    "outputs":1,
-    "x":2272.952262878418,
-    "y":92.00016212463379,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "29c502b.740c77e",
+    "type": "set",
+    "name": "clear tmp-data",
+    "xml": "<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",
+    "comments": "",
+    "x": 1806.7142906188965,
+    "y": 239.99999523162842,
+    "z": "65c9aaba.d47f7c",
+    "wires": []
+  },
+  {
+    "id": "6b4d7b55.4c2ff4",
+    "type": "set",
+    "name": "set tmp-data",
+    "xml": "<set>\n<parameter name='tmp.name' value=\"'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].name'\"/>\n<parameter name='tmp.value' value=\"'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].value'\"/>\n",
+    "comments": "",
+    "x": 1795.7142906188965,
+    "y": 329.9999952316284,
+    "z": "65c9aaba.d47f7c",
+    "wires": []
+  },
+  {
+    "id": "9b824272.4adc6",
+    "type": "switchNode",
+    "name": "switch name",
+    "xml": "<switch test=\"'$tmp.name'\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1774.7142906188965,
+    "y": 423.9999952316284,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "9dc924e4.d5eee8",
+        "d40dab22.2110d",
+        "d21b9753.5ddc7",
+        "eb828f46.725928",
+        "26f6f12.444ae0e",
+        "79521d4d.d066fc",
+        "ea7a9601.54836",
+        "fcdaea7c.60c75",
+        "dd18a79d.ddd94",
+        "a1177f41.e35148",
+        "73ed196f.9f7c8",
+        "3464140a.8cc06c",
+        "87259f41.87e1c8",
+        "41479001.27e018",
+        "19083ff5.a4af58",
+        "d82aab4b.d86238",
+        "b73417db.a46ef8"
       ]
     ]
   },
   {
-    "id":"c510015f.64592",
-    "type":"other",
-    "name":"sna2_name",
-    "xml":"<outcome value='sna2_name'>",
-    "comments":"",
-    "outputs":1,
-    "x":2276.952262878418,
-    "y":321.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "9dc924e4.d5eee8",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2314.2855796813965,
+    "y": 926.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "fd7cd54b.6b7b6"
       ]
     ]
   },
   {
-    "id":"3d722919.f81306",
-    "type":"other",
-    "name":"site1-name",
-    "xml":"<outcome value='site1-name'>",
-    "comments":"",
-    "outputs":1,
-    "x":2273.952262878418,
-    "y":153.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "fd7cd54b.6b7b6",
+    "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.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
+    "comments": "",
+    "x": 2489.2855796813965,
+    "y": 925.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": []
+  },
+  {
+    "id": "d40dab22.2110d",
+    "type": "other",
+    "name": "name",
+    "xml": "<outcome value='name'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2291.2855796813965,
+    "y": 48.99997043609619,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"7b7495f0.75885c",
-    "type":"other",
-    "name":"site2-name",
-    "xml":"<outcome value='site2-name'>",
-    "comments":"",
-    "outputs":1,
-    "x":2269.952262878418,
-    "y":210.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "d21b9753.5ddc7",
+    "type": "other",
+    "name": "service-type",
+    "xml": "<outcome value='service-type'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2294.2855796813965,
+    "y": 115.99997043609619,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"588a0bcd.6eb034",
-    "type":"other",
-    "name":"sna1_name",
-    "xml":"<outcome value='sna1_name'>",
-    "comments":"",
-    "outputs":1,
-    "x":2272.952262878418,
-    "y":267.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "ea7a9601.54836",
+    "type": "other",
+    "name": "sna2_name",
+    "xml": "<outcome value='sna2_name'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2298.2855796813965,
+    "y": 344.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"2187bd96.9aa5b2",
-    "type":"other",
-    "name":"pe1_id",
-    "xml":"<outcome value='pe1_id'>",
-    "comments":"",
-    "outputs":1,
-    "x":2276.952262878418,
-    "y":372.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "eb828f46.725928",
+    "type": "other",
+    "name": "site1-name",
+    "xml": "<outcome value='site1-name'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2295.2855796813965,
+    "y": 176.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"10a4fa76.533046",
-    "type":"other",
-    "name":"pe2_id",
-    "xml":"<outcome value='pe2_id'>",
-    "comments":"",
-    "outputs":1,
-    "x":2279.952262878418,
-    "y":420.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "26f6f12.444ae0e",
+    "type": "other",
+    "name": "site2-name",
+    "xml": "<outcome value='site2-name'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2291.2855796813965,
+    "y": 233.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"f5abb1ff.c1ae",
-    "type":"other",
-    "name":"ac1-id",
-    "xml":"<outcome value='ac1-id'>",
-    "comments":"",
-    "outputs":1,
-    "x":2284.952262878418,
-    "y":469.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "79521d4d.d066fc",
+    "type": "other",
+    "name": "sna1_name",
+    "xml": "<outcome value='sna1_name'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2294.2855796813965,
+    "y": 290.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"a7b43175.17a1e",
-    "type":"other",
-    "name":"ac2-id",
-    "xml":"<outcome value='ac2-id'>",
-    "comments":"",
-    "outputs":1,
-    "x":2286.952262878418,
-    "y":524.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "fcdaea7c.60c75",
+    "type": "other",
+    "name": "pe1_id",
+    "xml": "<outcome value='pe1_id'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2298.2855796813965,
+    "y": 395.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"7088b07a.e19a",
-    "type":"other",
-    "name":"ac1-ip",
-    "xml":"<outcome value='ac1-ip'>",
-    "comments":"",
-    "outputs":1,
-    "x":2286.952262878418,
-    "y":576.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "dd18a79d.ddd94",
+    "type": "other",
+    "name": "pe2_id",
+    "xml": "<outcome value='pe2_id'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2301.2855796813965,
+    "y": 443.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"6b511ebf.25f2b",
-    "type":"other",
-    "name":"ac2-ip",
-    "xml":"<outcome value='ac2-ip'>",
-    "comments":"",
-    "outputs":1,
-    "x":2288.952262878418,
-    "y":637.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "a1177f41.e35148",
+    "type": "other",
+    "name": "ac1-id",
+    "xml": "<outcome value='ac1-id'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2306.2855796813965,
+    "y": 492.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"77d1b8f5.2028a8",
-    "type":"other",
-    "name":"ac1_peer_ip",
-    "xml":"<outcome value='ac1_peer_ip'>",
-    "comments":"",
-    "outputs":1,
-    "x":2290.952262878418,
-    "y":687.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "73ed196f.9f7c8",
+    "type": "other",
+    "name": "ac2-id",
+    "xml": "<outcome value='ac2-id'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2308.2855796813965,
+    "y": 547.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"e96ec4f5.f46868",
-    "type":"other",
-    "name":"ac2_peer_ip",
-    "xml":"<outcome value='ac2_peer_ip'>",
-    "comments":"",
-    "outputs":1,
-    "x":2286.952262878418,
-    "y":735.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "3464140a.8cc06c",
+    "type": "other",
+    "name": "ac1-ip",
+    "xml": "<outcome value='ac1-ip'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2308.2855796813965,
+    "y": 599.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"25d82e93.97f172",
-    "type":"other",
-    "name":"ac1_svlan",
-    "xml":"<outcome value='ac1_svlan'>",
-    "comments":"",
-    "outputs":1,
-    "x":2288.952262878418,
-    "y":788.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "87259f41.87e1c8",
+    "type": "other",
+    "name": "ac2-ip",
+    "xml": "<outcome value='ac2-ip'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2310.2855796813965,
+    "y": 660.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"2c0ed5ac.b6f0aa",
-    "type":"other",
-    "name":"ac2_svlan",
-    "xml":"<outcome value='ac2_svlan'>",
-    "comments":"",
-    "outputs":1,
-    "x":2290.952262878418,
-    "y":849.0001621246338,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "41479001.27e018",
+    "type": "other",
+    "name": "ac1_peer_ip",
+    "xml": "<outcome value='ac1_peer_ip'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2312.2855796813965,
+    "y": 710.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "29338172.3d043e"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"f1a885d0.8cce28",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":287.23809814453125,
-    "y":861.8574056625366,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "19083ff5.a4af58",
+    "type": "other",
+    "name": "ac2_peer_ip",
+    "xml": "<outcome value='ac2_peer_ip'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2308.2855796813965,
+    "y": 758.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "53246327.3f169c",
-        "4ad8f670.2e7cb8"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"53246327.3f169c",
-    "type":"other",
-    "name":"DeleteNetworkInstance",
-    "xml":"<outcome value='DeleteNetworkInstance'>",
-    "comments":"",
-    "outputs":1,
-    "x":302.95238876342773,
-    "y":917.8573694229126,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "d82aab4b.d86238",
+    "type": "other",
+    "name": "ac1_svlan",
+    "xml": "<outcome value='ac1_svlan'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2310.2855796813965,
+    "y": 811.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "b6255d3e.ce53d"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"4ad8f670.2e7cb8",
-    "type":"other",
-    "name":"Other",
-    "xml":"<outcome value='Other'>",
-    "comments":"",
-    "outputs":1,
-    "x":256.95238876342773,
-    "y":967.8573694229126,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "b73417db.a46ef8",
+    "type": "other",
+    "name": "ac2_svlan",
+    "xml": "<outcome value='ac2_svlan'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2312.2855796813965,
+    "y": 872.9999704360962,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "5f2c6750.3bbae8"
+        "4640e206.76b664"
       ]
     ]
   },
   {
-    "id":"5f2c6750.3bbae8",
-    "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=\"request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete\" />\n",
-    "comments":"",
-    "x":425.95238876342773,
-    "y":967.8573694229126,
-    "z":"85858cc8.f3e21",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"b6255d3e.ce53d",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":527.9523887634277,
-    "y":906.8573694229126,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "389ea1d5.79e916",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 308.57141494750977,
+    "y": 885.857213973999,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "6d8480b4.bbdb8"
+        "54c12db0.6590dc"
       ]
     ]
   },
   {
-    "id":"6d8480b4.bbdb8",
-    "type":"for",
-    "name":"for each network-input-parameters",
-    "xml":"<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":349.95238876342773,
-    "y":1061.8573694229126,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "1f448cd7.9ac43b",
+    "type": "other",
+    "name": "DeleteNetworkInstance",
+    "xml": "<outcome value='DeleteNetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 775.2857055664062,
+    "y": 798.857177734375,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "30a4ecd8.0d1034"
+        "a7e9fd9d.eefae8"
       ]
     ]
   },
   {
-    "id":"30a4ecd8.0d1034",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":342.95238876342773,
-    "y":1146.8573694229126,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "bd139dc0.9ef408",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 835.2857055664062,
+    "y": 928.857177734375,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "c6454200.70fda"
+        "c3650164.8f94"
       ]
     ]
   },
   {
-    "id":"c6454200.70fda",
-    "type":"switchNode",
-    "name":"switch name",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":525.9523887634277,
-    "y":1139.8573694229126,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "c3650164.8f94",
+    "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=\"request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete\" />\n",
+    "comments": "",
+    "x": 1022.2857055664062,
+    "y": 929.857177734375,
+    "z": "65c9aaba.d47f7c",
+    "wires": []
+  },
+  {
+    "id": "a7e9fd9d.eefae8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 730.2857055664062,
+    "y": 998.857177734375,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "f7a7412d.0d646"
+        "374f47e5.09a2f",
+        "8ad81c32.d34b9"
       ]
     ]
   },
   {
-    "id":"f7a7412d.0d646",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":706.9523887634277,
-    "y":1138.8573694229126,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "374f47e5.09a2f",
+    "type": "switchNode",
+    "name": "switch network-id",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-information.network-id`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 884.28564453125,
+    "y": 1098.857177734375,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "8bfc5d6c.baf0e"
+        "3a8b9cb2.91ca2c"
       ]
     ]
   },
   {
-    "id":"8bfc5d6c.baf0e",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":870.9523887634277,
-    "y":1138.8573694229126,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "3a8b9cb2.91ca2c",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1068.28564453125,
+    "y": 1101.857177734375,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "6c6337cf.113798"
+        "ed90dada.d01dc8"
       ]
     ]
   },
   {
-    "id":"6c6337cf.113798",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":739.9523887634277,
-    "y":1262.8573694229126,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "ed90dada.d01dc8",
+    "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-request-input.network-input-parameters.name is a required input\" />\n",
+    "comments": "",
+    "x": 1224.71435546875,
+    "y": 1100.857177734375,
+    "z": "65c9aaba.d47f7c",
+    "wires": []
+  },
+  {
+    "id": "5ba97181.5ecc78",
+    "type": "outcome",
+    "name": "activate",
+    "xml": "<outcome value='activate'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 372.42855072021484,
+    "y": 567.7619495391846,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "e60613b0.6ba12"
+        "3c576c37.cacc9c"
       ]
     ]
   },
   {
-    "id":"e60613b0.6ba12",
-    "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-request-input.network-input-parameters.name is a required input\" />\n",
-    "comments":"",
-    "x":918.381103515625,
-    "y":1263.8573694229126,
-    "z":"85858cc8.f3e21",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"55e08239.49f15c",
-    "type":"outcome",
-    "name":"activate",
-    "xml":"<outcome value='activate'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":351.0952339172363,
-    "y":543.7621412277222,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "3c576c37.cacc9c",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 555.285717010498,
+    "y": 564.9047994613647,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "b69a14cd.1d3d68"
+        "9ef27dfb.32967",
+        "47a1d56.952aa2c"
       ]
     ]
   },
   {
-    "id":"b69a14cd.1d3d68",
-    "type":"switchNode",
-    "name":"switch request-action",
-    "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":533.9524002075195,
-    "y":540.9049911499023,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "9ef27dfb.32967",
+    "type": "other",
+    "name": "ActivateDCINetworkInstance",
+    "xml": "<outcome value='ActivateDCINetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 821.285717010498,
+    "y": 523.9047994613647,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "d54c9f22.ae97d",
-        "b12bd94e.696e48"
+        "b568716c.746398"
       ]
     ]
   },
   {
-    "id":"d54c9f22.ae97d",
-    "type":"other",
-    "name":"ActivateDCINetworkInstance",
-    "xml":"<outcome value='ActivateDCINetworkInstance'>",
-    "comments":"",
-    "outputs":1,
-    "x":799.9524002075195,
-    "y":499.90499114990234,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "47a1d56.952aa2c",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 775.285717010498,
+    "y": 573.9047994613647,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "cf772b80.a4cba8"
+        "66c486ba.242f98"
       ]
     ]
   },
   {
-    "id":"b12bd94e.696e48",
-    "type":"other",
-    "name":"Other",
-    "xml":"<outcome value='Other'>",
-    "comments":"",
-    "outputs":1,
-    "x":753.9524002075195,
-    "y":549.9049911499023,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "66c486ba.242f98",
+    "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=\"request-information.request-action is required to be ActivateNetworkInstance for svc-action=activate\" />\n",
+    "comments": "",
+    "x": 944.285717010498,
+    "y": 573.9047994613647,
+    "z": "65c9aaba.d47f7c",
+    "wires": []
+  },
+  {
+    "id": "b568716c.746398",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1046.285717010498,
+    "y": 512.9047994613647,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "bef2ee40.874af"
+        "f1391d7b.3f3618"
       ]
     ]
   },
   {
-    "id":"bef2ee40.874af",
-    "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=\"request-information.request-action is required to be ActivateNetworkInstance for svc-action=activate\" />\n",
-    "comments":"",
-    "x":922.9524002075195,
-    "y":549.9049911499023,
-    "z":"85858cc8.f3e21",
-    "wires":[
-
+    "id": "ab14b358.9b8f7",
+    "type": "other",
+    "name": "DeActivateDCINetworkInstance",
+    "xml": "<outcome value='DeActivateDCINetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 817.1428871154785,
+    "y": 635.1906003952026,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
+      []
     ]
   },
   {
-    "id":"cf772b80.a4cba8",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":1024.9524002075195,
-    "y":488.90499114990234,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "afd0efcd.371a1",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 732.142879486084,
+    "y": 704.1906080245972,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "36dbd61d.c5357a"
+        "b6887a7a.63ca6"
       ]
     ]
   },
   {
-    "id":"8b8b3296.f79f8",
-    "type":"other",
-    "name":"DeActivateDCINetworkInstance",
-    "xml":"<outcome value='DeActivateDCINetworkInstance'>",
-    "comments":"",
-    "outputs":1,
-    "x":795.8095703125,
-    "y":611.1907920837402,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "b6887a7a.63ca6",
+    "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=\"request-information.request-action is required to be DeactivateNetworkInstance for svc-action=deactivate\" />\n",
+    "comments": "",
+    "x": 913.142894744873,
+    "y": 705.1906080245972,
+    "z": "65c9aaba.d47f7c",
+    "wires": []
+  },
+  {
+    "id": "f1391d7b.3f3618",
+    "type": "call",
+    "name": "call validate-overlay-network-input-parameters",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-overlay-network-input-parameters' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1354.151050567627,
+    "y": 514.3333225250244,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2303dff.d38ae2",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 553.999942779541,
+    "y": 635.6664342880249,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-
+        "ab14b358.9b8f7",
+        "afd0efcd.371a1"
       ]
     ]
   },
   {
-    "id":"c54688aa.82e958",
-    "type":"other",
-    "name":"Other",
-    "xml":"<outcome value='Other'>",
-    "comments":"",
-    "outputs":1,
-    "x":710.8095626831055,
-    "y":680.1907997131348,
-    "z":"85858cc8.f3e21",
-    "wires":[
+    "id": "54c12db0.6590dc",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 544,
+    "y": 886,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
       [
-        "d62ac2c7.17544"
+        "1f448cd7.9ac43b",
+        "bd139dc0.9ef408"
       ]
     ]
   },
   {
-    "id":"d62ac2c7.17544",
-    "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=\"request-information.request-action is required to be DeactivateNetworkInstance for svc-action=deactivate\" />\n",
-    "comments":"",
-    "x":891.8095779418945,
-    "y":681.1907997131348,
-    "z":"85858cc8.f3e21",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"36dbd61d.c5357a",
-    "type":"call",
-    "name":"call validate-overlay-network-input-parameters",
-    "xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-overlay-network-input-parameters' mode='sync' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":1332.8177337646484,
-    "y":490.333514213562,
-    "z":"85858cc8.f3e21",
-    "wires":[
-      [
-
-      ]
-    ]
-  },
-  {
-    "id":"239b0e93.1dcdc2",
-    "type":"switchNode",
-    "name":"switch request-action",
-    "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":532.6666259765625,
-    "y":611.6666259765625,
-    "z":"85858cc8.f3e21",
-    "wires":[
-      [
-        "8b8b3296.f79f8",
-        "c54688aa.82e958"
-      ]
+    "id": "8ad81c32.d34b9",
+    "type": "execute",
+    "name": "execute requiredParameters",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"$network-topology-operation-input.network-information.network-id\" value=\"\"/>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1017,
+    "y": 995,
+    "z": "65c9aaba.d47f7c",
+    "wires": [
+      []
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
index 06cb3a32..81ddee29 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
@@ -405,6 +405,11 @@
                 <parameter name="networkId" value="`$prop.l3vpn.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/'  + $prop.l3vpn.network-id  + '/network-data/'` " />
             </set>
+            <set>
+                <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status" value="Created" />
+                <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action" value="`$network-topology-operation-input.sdnc-request-header.svc-action`" />
+                <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action" value="`$network-topology-operation-input.request-information.request-action`" />
+            </set>
             <return status="success">
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
index 019f4dab..8d9dac1b 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
@@ -3,19 +3,51 @@
     <method rpc="network-topology-operation-delete" mode="sync">
         <block atomic="true">
             <call module="GENERIC-RESOURCE-API" rpc="validate-network-input-parameters" mode="sync" />
-            <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
+            <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="ctx.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>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+            <for index="idx" start="0" end="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`">
                 <block>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
+                    <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
                         <outcome value="true">
                             <set>
-                                <parameter name="prop.l3vpn.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                <parameter name="prop.l3vpn.name" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" />
                             </set>
                         </outcome>
                     </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`">
+                    <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`">
                         <outcome value="true">
                             <set>
-                                <parameter name="prop.l3vpn.service-type" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                <parameter name="prop.l3vpn.service-type" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" />
                             </set>
                         </outcome>
                     </switch>
@@ -59,6 +91,28 @@
                     </execute>
                 </outcome>
             </switch>
+            <block atomic="true">
+                <set>
+                    <parameter name="service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header." value="`$network-topology-operation-input.sdnc-request-header.`" />
+                    <parameter name="service-data.networks.network[$tmp.nidx].network-data.request-information." value="`$network-topology-operation-input.request-information.`" />
+                </set>
+                <set>
+                    <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`" />
+                </set>
+                <set>
+                    <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/'  + $networkId  + '/network-data/'` " />
+                </set>
+                <set>
+                    <parameter name="service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status" value="Deleted" />
+                    <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`" />
+                    <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`" />
+                </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>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
index 6ba9d230..e54026dc 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
@@ -263,37 +263,34 @@
                 </outcome>
                 <outcome value="delete">
                     <block atomic="true">
-                        <outcome value="DeleteNetworkInstance">
-                            <block atomic="true">
-                                <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
-                                    <block>
-                                        <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
-                                            <outcome value="true">
-                                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">
-                                                    <outcome value="">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
-                                                        </return>
-                                                    </outcome>
-                                                </switch>
-                                            </outcome>
-                                        </switch>
-                                    </block>
-                                </for>
-                            </block>
-                        </outcome>
-                        <outcome value="Other">
-                            <return status="failure">
-                                <parameter name="ack-final" value="Y" />
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete" />
-                            </return>
-                        </outcome>
+                        <switch test="`$network-topology-operation-input.request-information.request-action`">
+                            <outcome value="DeleteNetworkInstance">
+                                <block atomic="true">
+                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">
+                                        <parameter name="$network-topology-operation-input.network-information.network-id" value="" />
+                                    </execute>
+                                    <switch test="`$network-topology-operation-input.network-information.network-id`">
+                                        <outcome value="">
+                                            <return status="failure">
+                                                <parameter name="ack-final" value="Y" />
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                </block>
+                            </outcome>
+                            <outcome value="Other">
+                                <return status="failure">
+                                    <parameter name="ack-final" value="Y" />
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete" />
+                                </return>
+                            </outcome>
+                        </switch>
                     </block>
                 </outcome>
             </switch>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>
-- 
cgit 1.2.3-korg