wan-connection bug fix for ccvpn integration test

Issue-ID: SDNC-354

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

Former-commit-id: 3a149df679e4cb13ca0f045d254b250fffdddab7

2 files changed, 1100 insertions, 639 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.json
index 7c050769..7d5d288b 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.json
@@ -1,16 +1,16 @@
 [{
-	"id": "dbc4ca7a.fecf48",
+	"id": "4110cdc5.03a094",
 	"type": "dgstart",
 	"name": "DGSTART",
 	"outputs": 1,
-	"x": 134.03125,
-	"y": 92.03125,
-	"z": "926fea0b.1d3458",
+	"x": 169,
+	"y": 138,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["72a66a2c.06a7e4"]
+		["904886a7.b08018"]
 	]
 }, {
-	"id": "72a66a2c.06a7e4",
+	"id": "904886a7.b08018",
 	"type": "service-logic",
 	"name": "GENERIC-RESOURCE-API ${project.version}",
 	"module": "GENERIC-RESOURCE-API",
@@ -18,1659 +18,2046 @@
 	"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.03125381469727,
-	"y": 164.0312671661377,
-	"z": "926fea0b.1d3458",
+	"x": 381.00000381469727,
+	"y": 210.0000171661377,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["95bab60a.026fe8"]
+		["4527ae0f.69568"]
 	]
 }, {
-	"id": "95bab60a.026fe8",
+	"id": "4527ae0f.69568",
 	"type": "method",
 	"name": "wan-connection-topology-operation-activate",
 	"xml": "<method rpc='wan-connection-topology-operation-activate' mode='sync'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 334.0313720703125,
-	"y": 252.03125,
-	"z": "926fea0b.1d3458",
+	"x": 369.0001220703125,
+	"y": 298,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["a72b1cb5.05f3c"]
+		["63d4748f.399dec"]
 	]
 }, {
-	"id": "4e7970ad.4b5bd",
+	"id": "bb133aed.b21f18",
 	"type": "execute",
 	"name": "execute Properties",
 	"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1104.031894683838,
-	"y": 341.0314643383026,
-	"z": "926fea0b.1d3458",
+	"x": 1139.000644683838,
+	"y": 387.0002143383026,
+	"z": "1ade981f.b4cb28",
 	"wires": [
 		[]
 	]
 }, {
-	"id": "bb98003a.a46ad",
+	"id": "cc6c7f5a.7e34c",
 	"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": 944.0314121246338,
-	"y": 2076.0316499471664,
-	"z": "926fea0b.1d3458",
+	"x": 979.0001621246338,
+	"y": 2122.0003999471664,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "11b701bb.2b820e",
+	"id": "aa52cb31.40b778",
 	"type": "block",
 	"name": "general-activate-block : atomic",
 	"xml": "<block atomic=\"true\">",
 	"atomic": "true",
 	"comments": "",
 	"outputs": 1,
-	"x": 728.5315265655518,
-	"y": 1887.0314840078354,
-	"z": "926fea0b.1d3458",
+	"x": 763.5002765655518,
+	"y": 1933.0002340078354,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["1aae4fc1.2393a", "bb98003a.a46ad"]
+		["bf6ec8e6.08c4d8", "cc6c7f5a.7e34c"]
 	]
 }, {
-	"id": "c812a520.767f78",
+	"id": "4c8314e9.4920ec",
 	"type": "for",
 	"name": "for pidx..service-data.networks.network[]",
 	"xml": "<for index='pidx' start='0' end='`$service-data.networks.network_length`' >\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1210.5319442749023,
-	"y": 508.0316289663315,
-	"z": "926fea0b.1d3458",
+	"x": 1245.5006942749023,
+	"y": 554.0003789663315,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["3dac3b05.9ea764"]
+		["d57afc63.19108"]
 	]
 }, {
-	"id": "3dac3b05.9ea764",
+	"id": "d57afc63.19108",
 	"type": "switchNode",
 	"name": "switch model-name",
 	"xml": "<switch test=\"`$service-data.networks.network[$pidx].network-data.network-information.onap-model-information.model-name == $network-topology-operation-input.network-information.onap-model-information.model-name`\">\n\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1563.5321006774902,
-	"y": 289.0316313505173,
-	"z": "926fea0b.1d3458",
+	"x": 1598.5008506774902,
+	"y": 335.0003813505173,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["bd71b64a.dfd5f8"]
+		["8b5b500.72af2b"]
 	]
 }, {
-	"id": "bd71b64a.dfd5f8",
+	"id": "8b5b500.72af2b",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1541.7822265625,
-	"y": 340.0317043066025,
-	"z": "926fea0b.1d3458",
+	"x": 1576.7509765625,
+	"y": 386.0004543066025,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["5d88b06.fe5a35"]
+		["6f1e2777.3dcac8"]
 	]
 }, {
-	"id": "5d88b06.fe5a35",
+	"id": "6f1e2777.3dcac8",
 	"type": "set",
 	"name": "set tmp.pidx and tmp.network-input-parameters",
 	"xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n<parameter name='tmp.network.' value='`$service-data.networks.network[$pidx].`' />\n<parameter name='tmp.network-input-parameters' value='`$service-data.networks.network[$pidx].network-data.network-request-input.network-input-parameters`' />\n<parameter name='tmp.found-network-input' value='true' />",
 	"comments": "",
-	"x": 1697.4006385803223,
-	"y": 399.46041905879974,
-	"z": "926fea0b.1d3458",
+	"x": 1732.3693885803223,
+	"y": 445.42916905879974,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "3bfb1023.2b523",
+	"id": "9dfc6949.aaeaa8",
 	"type": "set",
 	"name": "set tmp.found-network-input",
 	"xml": "<set>\n<parameter name='tmp.found-network-input' value='false' />",
 	"comments": "",
-	"x": 1135.5318870544434,
-	"y": 425.03159844875336,
-	"z": "926fea0b.1d3458",
+	"x": 1170.5006370544434,
+	"y": 471.00034844875336,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "1aae4fc1.2393a",
+	"id": "bf6ec8e6.08c4d8",
 	"type": "switchNode",
 	"name": "switch found-network-input",
 	"xml": "<switch test=\"`$found-network-input`\">\n\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1123.5316104888916,
-	"y": 1762.0316737890244,
-	"z": "926fea0b.1d3458",
+	"x": 1158.5003604888916,
+	"y": 1808.0004237890244,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["6ed44d2a.fb0594", "18c7f98e.b212a6"]
+		["6d1d565f.21fe58", "95e463a6.feab9"]
 	]
 }, {
-	"id": "6ed44d2a.fb0594",
+	"id": "6d1d565f.21fe58",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1355.531702041626,
-	"y": 1806.0318721532822,
-	"z": "926fea0b.1d3458",
+	"x": 1390.500452041626,
+	"y": 1852.0006221532822,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["84ec40e9.c2c32"]
+		["4ed7e3bb.9434ec"]
 	]
 }, {
-	"id": "18c7f98e.b212a6",
+	"id": "95e463a6.feab9",
 	"type": "outcomeTrue",
 	"name": "false",
 	"xml": "<outcome value='false'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1356.2816410064697,
-	"y": 1764.03176343441,
-	"z": "926fea0b.1d3458",
+	"x": 1391.2503910064697,
+	"y": 1810.00051343441,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["2811d502.22a33a"]
+		["ca1c26c0.e5e398"]
 	]
 }, {
-	"id": "2811d502.22a33a",
+	"id": "ca1c26c0.e5e398",
 	"type": "returnFailure",
 	"name": "return failure",
 	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: Network input parameters not found\" />\n    \n",
 	"comments": "",
-	"x": 1527.2816410064697,
-	"y": 1772.031732916832,
-	"z": "926fea0b.1d3458",
+	"x": 1562.2503910064697,
+	"y": 1818.000482916832,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "84ec40e9.c2c32",
+	"id": "4ed7e3bb.9434ec",
 	"type": "block",
 	"name": "block : atomic",
 	"xml": "<block atomic=\"true\">",
 	"atomic": "true",
 	"outputs": 1,
-	"x": 1093.031488418579,
-	"y": 1918.0316585302353,
-	"z": "926fea0b.1d3458",
+	"x": 1128.000238418579,
+	"y": 1964.0004085302353,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["61139e06.7aa2e", "8e8c51f4.d057d", "833ed1f4.d259"]
+		["bf73704a.746d9", "9605ef38.5bb42", "f609bc2c.d51d8"]
 	]
 }, {
-	"id": "61139e06.7aa2e",
+	"id": "bf73704a.746d9",
 	"type": "for",
 	"name": "for cidx..tmp.network.network-data.network-topology.network-parameters.network-parameter[]",
 	"xml": "<for index='cidx' start='0' end='`$tmp.network.network-data.network-topology.network-parameters.network-parameter_length`' >\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1542.031328201294,
-	"y": 2004.0315145254135,
-	"z": "926fea0b.1d3458",
+	"x": 1577.000078201294,
+	"y": 2050.0002645254135,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["d5a8b428.3ffe58"]
+		["c73fe8e7.e22538"]
 	]
 }, {
-	"id": "bb8655c6.320038",
+	"id": "cf42a640.4d0b48",
 	"type": "execute",
 	"name": "execute RestApiCallNode Create wan-connection",
 	"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$tmp.templateFileName`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + $tmp.restapiUrl`\" />\n<parameter name=\"restapiUser\" value=\"`$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": 1568.2813835144043,
-	"y": 2558.0317014455795,
-	"z": "926fea0b.1d3458",
+	"x": 1603.2501335144043,
+	"y": 2604.0004514455795,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["c0b7550d.f30fe8", "e19ff0cc.bd882", "9d57cbcd.803d08"]
+		["903e4526.97e3f8", "591a8fce.45987", "7a48c250.70b02c"]
 	]
 }, {
-	"id": "4089b1d1.8eda5",
+	"id": "ca6d877a.195b68",
 	"type": "switchNode",
 	"name": "switch network-parameter-name == 'templateFileName'",
 	"xml": "<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'templateFileName'`\">\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1670.2815914154053,
-	"y": 2109.031648993492,
-	"z": "926fea0b.1d3458",
+	"x": 1705.2503414154053,
+	"y": 2155.000398993492,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["80cfb20d.84134"]
+		["a93c61d6.37605"]
 	]
 }, {
-	"id": "80cfb20d.84134",
+	"id": "a93c61d6.37605",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2023.2817306518555,
-	"y": 2113.0317224264145,
-	"z": "926fea0b.1d3458",
+	"x": 2058.2504806518555,
+	"y": 2159.0004724264145,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["17b7664a.d3b9ca"]
+		["a75cc1ae.64a6b"]
 	]
 }, {
-	"id": "17b7664a.d3b9ca",
+	"id": "a75cc1ae.64a6b",
 	"type": "set",
 	"name": "set tmp.templateFileName",
 	"xml": "<set>\n<parameter name='tmp.templateFileName' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.templateFileName-found' value='true' />",
 	"comments": "",
-	"x": 2224.2817611694336,
-	"y": 2111.031723380089,
-	"z": "926fea0b.1d3458",
+	"x": 2259.2505111694336,
+	"y": 2157.000473380089,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "8e8c51f4.d057d",
+	"id": "9605ef38.5bb42",
 	"type": "set",
 	"name": "set paras flags",
 	"xml": "<set>\n<parameter name='tmp.restapiUrl-found' value='false' />\n<parameter name='tmp.restapiUser-found' value='false' />\n<parameter name='tmp.restapiPassword-found' value='false' />\n<parameter name='tmp.templateFileName-found' value='false' />\n<parameter name='tmp.thirdPartyAdaptorRpc-found' value='false' />",
 	"comments": "",
-	"x": 1329.0314960479736,
-	"y": 1919.0315116643906,
-	"z": "926fea0b.1d3458",
+	"x": 1364.0002460479736,
+	"y": 1965.0002616643906,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "833ed1f4.d259",
+	"id": "f609bc2c.d51d8",
 	"type": "switchNode",
 	"name": "switch thirdPartyAdaptorRpc-found == 'true'",
 	"xml": "<switch test=\"`$tmp.thirdPartyAdaptorRpc-found == 'true'`\">\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1321.0312728881836,
-	"y": 2365.031446814537,
-	"z": "926fea0b.1d3458",
+	"x": 1356.0000228881836,
+	"y": 2411.000196814537,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["575d5dfb.34fe94", "2377fd44.1eedc2"]
+		["64f1e318.370e9c", "4f71095a.31f4d8"]
 	]
 }, {
-	"id": "d5a8b428.3ffe58",
+	"id": "c73fe8e7.e22538",
 	"type": "block",
 	"name": "block",
 	"xml": "<block>\n",
 	"atomic": "false",
 	"comments": "",
 	"outputs": 1,
-	"x": 1307.031436920166,
-	"y": 2111.0313848257065,
-	"z": "926fea0b.1d3458",
+	"x": 1342.000186920166,
+	"y": 2157.0001348257065,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["4089b1d1.8eda5", "e7566aa5.849bc8", "e1dac9e1.6143b8", "43cfa6be.6eb688"]
+		["ca6d877a.195b68", "1ec8b52c.6e317b", "c5f7cd02.474b9", "e797233f.75da4"]
 	]
 }, {
-	"id": "575d5dfb.34fe94",
+	"id": "64f1e318.370e9c",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1583.03129196167,
-	"y": 2327.031383872032,
-	"z": "926fea0b.1d3458",
+	"x": 1618.00004196167,
+	"y": 2373.000133872032,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["4cc416ef.c63548"]
+		["f11a7e2d.52e71"]
 	]
 }, {
-	"id": "2377fd44.1eedc2",
+	"id": "4f71095a.31f4d8",
 	"type": "outcomeTrue",
 	"name": "false",
 	"xml": "<outcome value='false'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1584.0312423706055,
-	"y": 2393.0313485860825,
-	"z": "926fea0b.1d3458",
+	"x": 1618.9999923706055,
+	"y": 2439.0000985860825,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["9704be28.3f558"]
+		["21a5fcf7.8dd1d4"]
 	]
 }, {
-	"id": "4cc416ef.c63548",
+	"id": "f11a7e2d.52e71",
 	"type": "call",
 	"name": "call thirdPartyAdaptorRpc",
 	"xml": "<call module='GENERIC-RESOURCE-API' rpc='`$tmp.thirdPartyAdaptorRpc`' mode='sync' >\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1803.0313339233398,
-	"y": 2328.03144299984,
-	"z": "926fea0b.1d3458",
+	"x": 1838.0000839233398,
+	"y": 2374.00019299984,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["f46c32a6.383aa", "14327ee.aa1c281", "bbf59025.2f53"]
+		["ea575143.2c04a", "3e3c2a80.484366", "ef2e6c3b.b025c"]
 	]
 }, {
-	"id": "9704be28.3f558",
+	"id": "21a5fcf7.8dd1d4",
 	"type": "switchNode",
 	"name": "switch all-found == 'true'",
 	"xml": "<switch test=\"`$tmp.prop.thirdpartySdnc-found == 'true' and $tmp.templateFileName-found == 'true' and `$tmp.prop.restapiUrl-found == 'true'`\">\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1460.4821796417236,
-	"y": 2483.0379165410995,
-	"z": "926fea0b.1d3458",
+	"x": 1495.4509296417236,
+	"y": 2529.0066665410995,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["b0b06b48.a5b488", "aeb8dbbb.1a88b8"]
+		["a8f8778d.f670d8", "c2737900.cc91f8"]
 	]
 }, {
-	"id": "b0b06b48.a5b488",
+	"id": "a8f8778d.f670d8",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1711.4821643829346,
-	"y": 2481.037712454796,
-	"z": "926fea0b.1d3458",
+	"x": 1746.4509143829346,
+	"y": 2527.006462454796,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["bb8655c6.320038"]
+		["cf42a640.4d0b48"]
 	]
 }, {
-	"id": "e7566aa5.849bc8",
+	"id": "1ec8b52c.6e317b",
 	"type": "switchNode",
 	"name": "switch network-parameter-name == 'thirdPartyAdaptorRpc'",
 	"xml": "<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'thirdPartyAdaptorRpc'`\">\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1663.0378608703613,
-	"y": 2199.038031935692,
-	"z": "926fea0b.1d3458",
+	"x": 1698.0066108703613,
+	"y": 2245.006781935692,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["6b611a9.1a25de4"]
+		["e11ec51e.979328"]
 	]
 }, {
-	"id": "6b611a9.1a25de4",
+	"id": "e11ec51e.979328",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1996.03812789917,
-	"y": 2202.0380758047104,
-	"z": "926fea0b.1d3458",
+	"x": 2031.00687789917,
+	"y": 2248.0068258047104,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["af5f0328.41cb9"]
+		["f1275be5.5262e8"]
 	]
 }, {
-	"id": "af5f0328.41cb9",
+	"id": "f1275be5.5262e8",
 	"type": "set",
 	"name": "set tmp.thirdPartyAdaptorRpc",
 	"xml": "<set>\n<parameter name='tmp.thirdPartyAdaptorRpc' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.thirdPartyAdaptorRpc-found' value='true' />",
 	"comments": "",
-	"x": 2217.0380306243896,
-	"y": 2201.0381063222885,
-	"z": "926fea0b.1d3458",
+	"x": 2252.0067806243896,
+	"y": 2247.0068563222885,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "bbf59025.2f53",
+	"id": "ef2e6c3b.b025c",
 	"type": "not-found",
 	"name": "not-found",
 	"xml": "<outcome value='not-found'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2134.037733078003,
-	"y": 2368.3710893392563,
-	"z": "926fea0b.1d3458",
+	"x": 2169.006483078003,
+	"y": 2414.3398393392563,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["5e9bef51.b04f9"]
+		["13e37ad5.5d2675"]
 	]
 }, {
-	"id": "14327ee.aa1c281",
+	"id": "3e3c2a80.484366",
 	"type": "failure",
 	"name": "failure",
 	"xml": "<outcome value='failure'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2125.0377826690674,
-	"y": 2336.871115088463,
-	"z": "926fea0b.1d3458",
+	"x": 2160.0065326690674,
+	"y": 2382.839865088463,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["5e9bef51.b04f9"]
+		["13e37ad5.5d2675"]
 	]
 }, {
-	"id": "f46c32a6.383aa",
+	"id": "ea575143.2c04a",
 	"type": "success",
 	"name": "success",
 	"xml": "<outcome value='success'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2128.78782081604,
-	"y": 2307.22821996361,
-	"z": "926fea0b.1d3458",
+	"x": 2163.75657081604,
+	"y": 2353.19696996361,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["2554668a.ceb99a"]
+		["3bbe6a1e.769726"]
 	]
 }, {
-	"id": "5e9bef51.b04f9",
+	"id": "13e37ad5.5d2675",
 	"type": "returnFailure",
 	"name": "return failure",
 	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Error calling ' + $tmp.thirdPartyAdaptorRpc`\" />\n",
 	"comments": "",
-	"x": 2303.7878017425537,
-	"y": 2359.621233344078,
-	"z": "926fea0b.1d3458",
+	"x": 2338.7565517425537,
+	"y": 2405.589983344078,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "2554668a.ceb99a",
+	"id": "3bbe6a1e.769726",
 	"type": "block",
 	"name": "block",
 	"xml": "<block>\n",
 	"atomic": "false",
 	"comments": "",
 	"outputs": 1,
-	"x": 2270.4437885284424,
-	"y": 2303.4203891530633,
-	"z": "926fea0b.1d3458",
+	"x": 2305.4125385284424,
+	"y": 2349.3891391530633,
+	"z": "1ade981f.b4cb28",
 	"wires": [
 		[]
 	]
 }, {
-	"id": "9d57cbcd.803d08",
+	"id": "7a48c250.70b02c",
 	"type": "not-found",
 	"name": "not-found",
 	"xml": "<outcome value='not-found'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1898.0378074645996,
-	"y": 2593.370793700218,
-	"z": "926fea0b.1d3458",
+	"x": 1933.0065574645996,
+	"y": 2639.339543700218,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["a1110583.4c1b78"]
+		["9bf7f535.c6c4f8"]
 	]
 }, {
-	"id": "e19ff0cc.bd882",
+	"id": "591a8fce.45987",
 	"type": "failure",
 	"name": "failure",
 	"xml": "<outcome value='failure'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1889.037857055664,
-	"y": 2561.8708194494247,
-	"z": "926fea0b.1d3458",
+	"x": 1924.006607055664,
+	"y": 2607.8395694494247,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["a1110583.4c1b78"]
+		["9bf7f535.c6c4f8"]
 	]
 }, {
-	"id": "c0b7550d.f30fe8",
+	"id": "903e4526.97e3f8",
 	"type": "success",
 	"name": "success",
 	"xml": "<outcome value='success'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1892.7878952026367,
-	"y": 2532.227924324572,
-	"z": "926fea0b.1d3458",
+	"x": 1927.7566452026367,
+	"y": 2578.196674324572,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["723c84de.ada1cc"]
+		["d82c4ca9.ac8a4"]
 	]
 }, {
-	"id": "a1110583.4c1b78",
+	"id": "9bf7f535.c6c4f8",
 	"type": "returnFailure",
 	"name": "return failure",
 	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Error calling ' + $tmp.restapiUrl`\" />\n",
 	"comments": "",
-	"x": 2055.7879219055176,
-	"y": 2578.620891928673,
-	"z": "926fea0b.1d3458",
+	"x": 2090.7566719055176,
+	"y": 2624.589641928673,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "723c84de.ada1cc",
+	"id": "d82c4ca9.ac8a4",
 	"type": "block",
 	"name": "block",
 	"xml": "<block>\n",
 	"atomic": "false",
 	"comments": "",
 	"outputs": 1,
-	"x": 2034.443862915039,
-	"y": 2528.420093514025,
-	"z": "926fea0b.1d3458",
+	"x": 2069.412612915039,
+	"y": 2574.388843514025,
+	"z": "1ade981f.b4cb28",
 	"wires": [
 		[]
 	]
 }, {
-	"id": "aeb8dbbb.1a88b8",
+	"id": "c2737900.cc91f8",
 	"type": "outcomeTrue",
 	"name": "false",
 	"xml": "<outcome value='false'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1862.7043704986572,
-	"y": 2448.482018828392,
-	"z": "926fea0b.1d3458",
+	"x": 1897.6731204986572,
+	"y": 2494.450768828392,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["f8bc7d52.d6dd5"]
+		["dce9c722.79f6a8"]
 	]
 }, {
-	"id": "f8bc7d52.d6dd5",
+	"id": "dce9c722.79f6a8",
 	"type": "returnFailure",
 	"name": "return failure",
 	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n    <parameter name=\"error-message\" value=\"Error: 3rd party controller restapiUrl not found\" />\n    \n",
 	"comments": "",
-	"x": 2033.7043704986572,
-	"y": 2456.481988310814,
-	"z": "926fea0b.1d3458",
+	"x": 2068.673120498657,
+	"y": 2502.450738310814,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "a72b1cb5.05f3c",
+	"id": "63d4748f.399dec",
 	"type": "execute",
 	"name": "contains specification",
 	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"specification\"/>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 231.03120040893555,
-	"y": 374.03507936000824,
-	"z": "926fea0b.1d3458",
+	"x": 265.99995040893555,
+	"y": 420.00382936000824,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["889cb67a.4a45c8", "2194eb01.d99b44"]
+		["22e4d943.86b1e6", "70d7e113.9c46d"]
 	]
 }, {
-	"id": "889cb67a.4a45c8",
+	"id": "22e4d943.86b1e6",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 467.03123474121094,
-	"y": 372.03507125377655,
-	"z": "926fea0b.1d3458",
+	"x": 501.99998474121094,
+	"y": 418.00382125377655,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["ce0b82c8.e7218"]
+		["7e53c447.0e30ac"]
 	]
 }, {
-	"id": "2194eb01.d99b44",
+	"id": "70d7e113.9c46d",
 	"type": "outcomeTrue",
 	"name": "false",
 	"xml": "<outcome value='false'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 170.03128814697266,
-	"y": 597.035244345665,
-	"z": "926fea0b.1d3458",
+	"x": 205.00003814697266,
+	"y": 643.003994345665,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["f8dcacdf.a6eb7"]
+		["7f4bbff1.2aaa7"]
 	]
 }, {
-	"id": "e74616dd.2ed7f8",
+	"id": "83b81c57.91ce3",
 	"type": "execute",
 	"name": "contains FC",
 	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"FC\"/>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 501.03129959106445,
-	"y": 681.0351728200912,
-	"z": "926fea0b.1d3458",
+	"x": 536.0000495910645,
+	"y": 727.0039228200912,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["c1e8fe64.ca4a9", "c4d599f8.5e9608"]
+		["d65ac15e.7a488", "692b6949.18efe8"]
 	]
 }, {
-	"id": "c4d599f8.5e9608",
+	"id": "692b6949.18efe8",
 	"type": "outcomeTrue",
 	"name": "false",
 	"xml": "<outcome value='false'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 146.03127670288086,
-	"y": 1029.0352452993393,
-	"z": "926fea0b.1d3458",
+	"x": 181.00002670288086,
+	"y": 1075.0039952993393,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["321c63b.c8d039c"]
+		["90f6f6ce.1e8b98"]
 	]
 }, {
-	"id": "321c63b.c8d039c",
+	"id": "90f6f6ce.1e8b98",
 	"type": "execute",
 	"name": "contains FD",
 	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"FD\"/>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 355.03126525878906,
-	"y": 1025.0352238416672,
-	"z": "926fea0b.1d3458",
+	"x": 390.00001525878906,
+	"y": 1071.0039738416672,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["84b52686.b454a8", "95140b58.666a48"]
+		["3bc132e.15af7ce", "432ad954.7f9258"]
 	]
 }, {
-	"id": "95140b58.666a48",
+	"id": "432ad954.7f9258",
 	"type": "outcomeTrue",
 	"name": "false",
 	"xml": "<outcome value='false'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 137.99998092651367,
-	"y": 1101.0038818120956,
-	"z": "926fea0b.1d3458",
+	"x": 172.96873092651367,
+	"y": 1146.9726318120956,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["816059eb.09e168"]
+		["e6f20097.71282"]
 	]
 }, {
-	"id": "816059eb.09e168",
+	"id": "e6f20097.71282",
 	"type": "execute",
 	"name": "contains FcPort",
 	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"FcPort\"/>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 346.99997329711914,
-	"y": 1098.0039104223251,
-	"z": "926fea0b.1d3458",
+	"x": 381.96872329711914,
+	"y": 1143.9726604223251,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["4edca0e1.34768", "2171b9cc.48bf96"]
+		["fc88439c.c752a", "656c931c.a8531c"]
 	]
 }, {
-	"id": "c1e8fe64.ca4a9",
+	"id": "d65ac15e.7a488",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 683.0313034057617,
-	"y": 682.0351561307907,
-	"z": "926fea0b.1d3458",
+	"x": 718.0000534057617,
+	"y": 728.0039061307907,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["6e6cf945.de71a8"]
+		["549906bf.9f4d38"]
 	]
 }, {
-	"id": "84b52686.b454a8",
+	"id": "3bc132e.15af7ce",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 927.0314331054688,
-	"y": 1027.035410284996,
-	"z": "926fea0b.1d3458",
+	"x": 962.0001831054688,
+	"y": 1073.004160284996,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["11b701bb.2b820e"]
+		["aa52cb31.40b778"]
 	]
 }, {
-	"id": "4edca0e1.34768",
+	"id": "fc88439c.c752a",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 542.000057220459,
-	"y": 1100.003942847252,
-	"z": "926fea0b.1d3458",
+	"x": 576.968807220459,
+	"y": 1145.972692847252,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["1b21b11e.20ccaf"]
+		["f7dbd0fa.8d544"]
 	]
 }, {
-	"id": "2171b9cc.48bf96",
+	"id": "656c931c.a8531c",
 	"type": "outcomeTrue",
 	"name": "false",
 	"xml": "<outcome value='false'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 99.03140258789062,
-	"y": 1342.0355266332626,
-	"z": "926fea0b.1d3458",
+	"x": 134.00015258789062,
+	"y": 1388.0042766332626,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["9a67ff91.b1e45"]
+		["eedd7b52.20e6b8"]
 	]
 }, {
-	"id": "9a67ff91.b1e45",
+	"id": "eedd7b52.20e6b8",
 	"type": "block",
 	"name": "block",
 	"xml": "<block>\n",
 	"atomic": "false",
 	"comments": "",
 	"outputs": 1,
-	"x": 387.0001029968262,
-	"y": 1341.0042842626572,
-	"z": "926fea0b.1d3458",
+	"x": 421.9688529968262,
+	"y": 1386.9730342626572,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["7b057224.2aa75c"]
+		["b9067871.472118"]
 	]
 }, {
-	"id": "ce0b82c8.e7218",
+	"id": "7e53c447.0e30ac",
 	"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": 731.0585975646973,
-	"y": 368.06244599819183,
-	"z": "926fea0b.1d3458",
+	"x": 766.0273475646973,
+	"y": 414.03119599819183,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "7b057224.2aa75c",
+	"id": "b9067871.472118",
 	"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": 594.0587425231934,
-	"y": 1338.0627368688583,
-	"z": "926fea0b.1d3458",
+	"x": 629.0274925231934,
+	"y": 1384.0314868688583,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "1b21b11e.20ccaf",
+	"id": "f7dbd0fa.8d544",
 	"type": "execute",
 	"name": "contains sitewan",
 	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"sitewan\"/>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 735.0275611877441,
-	"y": 1101.031530737877,
-	"z": "926fea0b.1d3458",
+	"x": 769.9963111877441,
+	"y": 1147.000280737877,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["52df494.201adb8", "dbee71dc.d74f"]
+		["be49f900.18cbf8", "70ee59a7.22b018"]
 	]
 }, {
-	"id": "52df494.201adb8",
+	"id": "be49f900.18cbf8",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 930.027645111084,
-	"y": 1103.0315631628036,
-	"z": "926fea0b.1d3458",
+	"x": 964.996395111084,
+	"y": 1149.0003131628036,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["11b701bb.2b820e"]
+		["aa52cb31.40b778"]
 	]
 }, {
-	"id": "dbee71dc.d74f",
+	"id": "70ee59a7.22b018",
 	"type": "outcomeTrue",
 	"name": "false",
 	"xml": "<outcome value='false'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 483.02745056152344,
-	"y": 1255.0313781499863,
-	"z": "926fea0b.1d3458",
+	"x": 517.9962005615234,
+	"y": 1301.0001281499863,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["9a67ff91.b1e45"]
+		["eedd7b52.20e6b8"]
 	]
 }, {
-	"id": "6e6cf945.de71a8",
+	"id": "549906bf.9f4d38",
 	"type": "execute",
 	"name": "contains sotn",
 	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$network-topology-operation-input.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"sotn\"/>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 851.0312881469727,
-	"y": 682.035093665123,
-	"z": "926fea0b.1d3458",
+	"x": 886.0000381469727,
+	"y": 728.003843665123,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["b8e3e9e8.4dd418", "371abc25.a00424"]
+		["de1bc208.9497e", "5d7fa5e0.39608c"]
 	]
 }, {
-	"id": "b8e3e9e8.4dd418",
+	"id": "de1bc208.9497e",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1056.781349182129,
-	"y": 681.035072684288,
-	"z": "926fea0b.1d3458",
+	"x": 1091.750099182129,
+	"y": 727.003822684288,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["61103774.7c2958"]
+		["1cfbf782.e4af38"]
 	]
 }, {
-	"id": "371abc25.a00424",
+	"id": "5d7fa5e0.39608c",
 	"type": "outcomeTrue",
 	"name": "false",
 	"xml": "<outcome value='false'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 922.7814674377441,
-	"y": 970.0351947546005,
-	"z": "926fea0b.1d3458",
+	"x": 957.7502174377441,
+	"y": 1016.0039447546005,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["11b701bb.2b820e"]
+		["aa52cb31.40b778"]
 	]
 }, {
-	"id": "d0dc2867.7aac48",
+	"id": "3bef5187.6137be",
 	"type": "for",
 	"name": "for sIdx..service-data.networks.network[]",
 	"xml": "<for index='sIdx' start='0' end='`$service-data.networks.network_length`' >\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1968.059326171875,
-	"y": 729.0627163648605,
-	"z": "926fea0b.1d3458",
+	"x": 2003.028076171875,
+	"y": 775.0314663648605,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["10a3d4d5.ede31b"]
+		["fb47335d.1f11e"]
 	]
 }, {
-	"id": "8aee33e1.e59d9",
+	"id": "d0a23de4.adf92",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2503.0594062805176,
-	"y": 669.0628918409348,
-	"z": "926fea0b.1d3458",
+	"x": 2538.0281562805176,
+	"y": 715.0316418409348,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["9a9356f4.363c08"]
+		["80c623fb.b6c43"]
 	]
 }, {
-	"id": "fe450b4f.38cbb8",
+	"id": "7a6beaa5.cc1f44",
 	"type": "set",
 	"name": "set tmp.pidx and tmp.network-input-parameters",
 	"xml": "<set>\n<parameter name='tmp.sotnFcPortList[`$sotnFcPortListLength`]' value='`$sIdx`' />",
 	"comments": "",
-	"x": 2593.6787147521973,
-	"y": 838.4922603368759,
-	"z": "926fea0b.1d3458",
+	"x": 2987.6474952697754,
+	"y": 514.461019039154,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "10a3d4d5.ede31b",
+	"id": "fb47335d.1f11e",
 	"type": "execute",
 	"name": "contains sotn",
 	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$service-data.networks.network[$sIdx].network-data.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"sotn\"/>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2340.0593223571777,
-	"y": 670.0627735853195,
-	"z": "926fea0b.1d3458",
+	"x": 2375.0280723571777,
+	"y": 716.0315235853195,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["8aee33e1.e59d9"]
+		["d0a23de4.adf92"]
 	]
 }, {
-	"id": "9a9356f4.363c08",
+	"id": "80c623fb.b6c43",
 	"type": "execute",
 	"name": "contains FcPort",
 	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$service-data.networks.network[$sIdx].network-data.network-information.onap-model-information.model-name`\"/>\n    <parameter name=\"target\" value=\"FcPort\"/>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2344.059284210205,
-	"y": 724.0629585981369,
-	"z": "926fea0b.1d3458",
+	"x": 2379.028034210205,
+	"y": 770.0317085981369,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["2c54cd4f.4c8bf2"]
+		["2083ab14.dbd904"]
 	]
 }, {
-	"id": "f8dcacdf.a6eb7",
+	"id": "7f4bbff1.2aaa7",
 	"type": "block",
 	"name": "block : atomic",
 	"xml": "<block atomic=\"true\">",
 	"atomic": "true",
 	"outputs": 1,
-	"x": 333.0586624145508,
-	"y": 599.0624669790268,
-	"z": "926fea0b.1d3458",
+	"x": 368.0274124145508,
+	"y": 645.0312169790268,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["e74616dd.2ed7f8", "3a764e2f.ce3ce2"]
+		["83b81c57.91ce3", "15bbe5c6.df494a"]
 	]
 }, {
-	"id": "3a764e2f.ce3ce2",
+	"id": "15bbe5c6.df494a",
 	"type": "block",
 	"name": "find-network-data-block : atomic",
 	"xml": "<block atomic=\"true\">",
 	"atomic": "true",
 	"comments": "",
 	"outputs": 1,
-	"x": 609.027530670166,
-	"y": 510.6980298757553,
-	"z": "926fea0b.1d3458",
+	"x": 643.996280670166,
+	"y": 556.6667798757553,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["4e7970ad.4b5bd", "3bfb1023.2b523", "c812a520.767f78"]
+		["bb133aed.b21f18", "9dfc6949.aaeaa8", "4c8314e9.4920ec"]
 	]
 }, {
-	"id": "2c54cd4f.4c8bf2",
+	"id": "2083ab14.dbd904",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2512.0592079162598,
-	"y": 721.0627983808517,
-	"z": "926fea0b.1d3458",
+	"x": 2547.0279579162598,
+	"y": 767.0315483808517,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["c9838804.3271d8"]
+		["216cec92.6dac34"]
 	]
 }, {
-	"id": "f025ca00.b1be48",
+	"id": "8e022176.66adc",
 	"type": "block",
 	"name": "find-sotn-fc-port-block : atomic",
 	"xml": "<block atomic=\"true\">",
 	"atomic": "true",
 	"comments": "",
 	"outputs": 1,
-	"x": 1540.0592346191406,
-	"y": 680.0626581907272,
-	"z": "926fea0b.1d3458",
+	"x": 1575.0279846191406,
+	"y": 726.0314081907272,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["d0dc2867.7aac48", "3f4a3ecb.0378b2"]
+		["3bef5187.6137be", "a378da89.72c998"]
 	]
 }, {
-	"id": "3f4a3ecb.0378b2",
+	"id": "a378da89.72c998",
 	"type": "set",
 	"name": "set sotnFcPortListLength",
 	"xml": "<set>\n<parameter name='sotnFcPortListLength' value='0' />",
 	"comments": "",
-	"x": 1909.0587921142578,
-	"y": 621.0627483129501,
-	"z": "926fea0b.1d3458",
+	"x": 1944.0275421142578,
+	"y": 667.0314983129501,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "c9838804.3271d8",
+	"id": "216cec92.6dac34",
 	"type": "block",
 	"name": "find-OOF-input-block : atomic",
 	"xml": "<block atomic=\"true\">",
 	"atomic": "true",
 	"comments": "",
 	"outputs": 1,
-	"x": 2390.5591468811035,
-	"y": 775.0626882314682,
-	"z": "926fea0b.1d3458",
+	"x": 2425.5278968811035,
+	"y": 821.0314382314682,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["fe450b4f.38cbb8", "d2affa42.51fb78"]
+		["7a6beaa5.cc1f44", "b0957661.ae69b8"]
 	]
 }, {
-	"id": "d2affa42.51fb78",
+	"id": "b0957661.ae69b8",
 	"type": "for",
 	"name": "for sIdx..network-input-parameters[]",
 	"xml": "<for index='paramIdx' start='0' end='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param_length`' >\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2569.0589027404785,
-	"y": 890.0628179311752,
-	"z": "926fea0b.1d3458",
+	"x": 2963.0276832580566,
+	"y": 566.0315766334534,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["eb3ac434.e3fe48"]
+		["384fb18d.9c07de"]
 	]
 }, {
-	"id": "eb3ac434.e3fe48",
+	"id": "384fb18d.9c07de",
 	"type": "execute",
 	"name": "contains address",
 	"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n    <parameter name=\"source\" value=\"`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param[$paramIdx].name`\"/>\n    <parameter name=\"target\" value=\"address\"/>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2537.558811187744,
-	"y": 943.0626500844955,
-	"z": "926fea0b.1d3458",
+	"x": 2931.5275917053223,
+	"y": 619.0314087867737,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["7ce26fd1.8df38"]
+		["d4ace761.361c58"]
 	]
 }, {
-	"id": "7ce26fd1.8df38",
+	"id": "d4ace761.361c58",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2719.5589332580566,
-	"y": 943.0626500844955,
-	"z": "926fea0b.1d3458",
+	"x": 3113.5277137756348,
+	"y": 619.0314087867737,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["c085ea30.cd5968"]
+		["a50094bb.3c1258"]
 	]
 }, {
-	"id": "a47015e8.cb0ee8",
+	"id": "1a2e9905.591de7",
 	"type": "set",
 	"name": "set sotnFcPortAddress",
 	"xml": "<set>\n<parameter name='sotnFcPortAddress' value='`$service-data.networks.network[$sIdx].network-data.network-request-input.network-input-parameters.param[$paramIdx].value`' />",
 	"comments": "",
-	"x": 2777.5603942871094,
-	"y": 1056.0630768537521,
-	"z": "926fea0b.1d3458",
+	"x": 3171.5291748046875,
+	"y": 732.0318355560303,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "c085ea30.cd5968",
+	"id": "a50094bb.3c1258",
 	"type": "block",
 	"name": "get-OOF-input-block : atomic",
 	"xml": "<block atomic=\"true\">",
 	"atomic": "true",
 	"comments": "",
 	"outputs": 1,
-	"x": 2586.5589637756348,
-	"y": 1001.0628217458725,
-	"z": "926fea0b.1d3458",
+	"x": 2980.527744293213,
+	"y": 677.0315804481506,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["a47015e8.cb0ee8", "1e310231.0de11e"]
+		["1a2e9905.591de7", "cc79aa24.8a6038"]
 	]
 }, {
-	"id": "c68e0fa0.942c8",
+	"id": "80f5b219.f8df1",
 	"type": "success",
 	"name": "success",
 	"xml": "<outcome value='success'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2802.0600090026855,
-	"y": 1178.0625947713852,
-	"z": "926fea0b.1d3458",
+	"x": 3196.0287895202637,
+	"y": 854.0313534736633,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["87931697.ce9668"]
+		["f0282542.57ca38"]
 	]
 }, {
-	"id": "1e310231.0de11e",
+	"id": "cc79aa24.8a6038",
 	"type": "execute",
 	"name": "execute RestApiCallNode - get access Tp from OSS",
 	"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value=\"`$prop.oss.url + '/oss/inventory?location=' + $sotnFcPortAddress`\"/>\n    <parameter name='format' value='json' />\n    <parameter name='customHttpHeaders' value=\"X-FromAppId=MSO\" />\n    <parameter name='httpMethod' value='GET' />\n    <parameter name=\"responsePrefix\" value=\"temp.oss.accessTPs\" />\n\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2899.0589332580566,
-	"y": 1115.062528014183,
-	"z": "926fea0b.1d3458",
+	"x": 3293.0277137756348,
+	"y": 791.0312867164612,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["c68e0fa0.942c8"]
+		["80f5b219.f8df1"]
 	]
 }, {
-	"id": "87931697.ce9668",
+	"id": "f0282542.57ca38",
 	"type": "switchNode",
 	"name": "switch temp.oss.accessTPs_length",
 	"xml": "<switch test=\"`$temp.oss.accessTPs_length`\">\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 3098.0591163635254,
-	"y": 1177.0625051259995,
-	"z": "926fea0b.1d3458",
+	"x": 3492.0278968811035,
+	"y": 853.0312638282776,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["7d124bb0.ba2c74"]
+		["ede2d42a.5771f8"]
 	]
 }, {
-	"id": "7d124bb0.ba2c74",
+	"id": "ede2d42a.5771f8",
 	"type": "other",
 	"name": "other",
 	"xml": "<outcome value='Other'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 3362.560386657715,
-	"y": 1176.0627821683884,
-	"z": "926fea0b.1d3458",
+	"x": 3756.529167175293,
+	"y": 852.0315408706665,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["50e1d009.293c"]
+		["d976a313.c6a78"]
 	]
 }, {
-	"id": "c6383260.ec986",
+	"id": "41b6b534.71089c",
 	"type": "set",
 	"name": "set temp.accessTPs_length",
 	"xml": "<set>\n<parameter name='temp.accessTPs_length' value='`$temp.accessTPs_length + $temp.oss.accessTPs_length`' />\n\n",
 	"comments": "",
-	"x": 3308.060012817383,
-	"y": 1442.0589436292648,
-	"z": "926fea0b.1d3458",
+	"x": 3702.028793334961,
+	"y": 1118.027702331543,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "50e1d009.293c",
+	"id": "d976a313.c6a78",
 	"type": "block",
 	"name": "copy-accessTPs-block : atomic",
 	"xml": "<block atomic=\"true\">",
 	"atomic": "true",
 	"comments": "",
 	"outputs": 1,
-	"x": 2962.808380126953,
-	"y": 1265.058205485344,
-	"z": "926fea0b.1d3458",
+	"x": 3356.7771606445312,
+	"y": 941.0269641876221,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["c6383260.ec986", "9cdee8cd.2dbad8", "d76eb76d.375dc8"]
+		["41b6b534.71089c", "48fbd792.d1dde8", "d9a2823e.d5af7"]
 	]
 }, {
-	"id": "9cdee8cd.2dbad8",
+	"id": "48fbd792.d1dde8",
 	"type": "switchNode",
 	"name": "switch temp.accessTPs_length",
 	"xml": "<switch test='`$temp.accessTPs_length`'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 3346.558334350586,
-	"y": 1267.0580424070358,
-	"z": "926fea0b.1d3458",
+	"x": 3740.527114868164,
+	"y": 943.026801109314,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["ddd28ed8.0b65e", "1b7da2eb.0351cd"]
+		["51d201e6.7878", "89eda55d.e07398"]
 	]
 }, {
-	"id": "ddd28ed8.0b65e",
+	"id": "51d201e6.7878",
 	"type": "other",
 	"name": "Null",
 	"xml": "<outcome value=''>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 3572.5581855773926,
-	"y": 1242.0579699277878,
-	"z": "926fea0b.1d3458",
+	"x": 3966.5269660949707,
+	"y": 918.0267286300659,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["884aab61.79c368"]
+		["6bb067c5.523958"]
 	]
 }, {
-	"id": "884aab61.79c368",
+	"id": "6bb067c5.523958",
 	"type": "set",
 	"name": "set tp_length",
 	"xml": "<set>\n<parameter name='tp_length' value='0' />",
 	"comments": "",
-	"x": 3759.05802154541,
-	"y": 1240.0579756791703,
-	"z": "926fea0b.1d3458",
+	"x": 4153.026802062988,
+	"y": 916.0267343814485,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "1b7da2eb.0351cd",
+	"id": "89eda55d.e07398",
 	"type": "other",
 	"name": "other",
 	"xml": "<outcome value='Other'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 3568.558151245117,
-	"y": 1297.058015704155,
-	"z": "926fea0b.1d3458",
+	"x": 3962.5269317626953,
+	"y": 973.0267744064331,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["aab633d0.c1e13"]
+		["8294cd19.c83c6"]
 	]
 }, {
-	"id": "aab633d0.c1e13",
+	"id": "8294cd19.c83c6",
 	"type": "set",
 	"name": "set tp_length",
 	"xml": "<set>\n<parameter name='tp_length' value='`$temp.accessTPs_length`' />",
 	"comments": "",
-	"x": 3757.308090209961,
-	"y": 1297.058000445366,
-	"z": "926fea0b.1d3458",
+	"x": 4151.276870727539,
+	"y": 973.026759147644,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "d76eb76d.375dc8",
+	"id": "d9a2823e.d5af7",
 	"type": "for",
 	"name": "for each existing temp.oss.accessTPs",
 	"xml": "<for index='idx' start='0' end='`$temp.oss.accessTPs_length`' >\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 3348.3087768554688,
-	"y": 1365.0581473112106,
-	"z": "926fea0b.1d3458",
+	"x": 3742.277557373047,
+	"y": 1041.0269060134888,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["ee87558c.d153c8"]
+		["399f37b5.ff7f58"]
 	]
 }, {
-	"id": "ee87558c.d153c8",
+	"id": "399f37b5.ff7f58",
 	"type": "set",
 	"name": "set temp.accessTPs",
 	"xml": "<set>\n<parameter name='`temp.accessTPs[$idx + $tp_length].`' value='`$temp.oss.accessTPs[$idx].`' />",
 	"comments": "",
-	"x": 3716.3086700439453,
-	"y": 1366.0582951307297,
-	"z": "926fea0b.1d3458",
+	"x": 4110.277450561523,
+	"y": 1042.0270538330078,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "61103774.7c2958",
+	"id": "1cfbf782.e4af38",
 	"type": "block",
 	"name": "block",
 	"xml": "<block>\n",
 	"atomic": "false",
 	"comments": "",
 	"outputs": 1,
-	"x": 1226.0586776733398,
-	"y": 679.0624278783798,
-	"z": "926fea0b.1d3458",
+	"x": 1261.0274276733398,
+	"y": 725.0311778783798,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["f025ca00.b1be48", "45d2bc6f.d74144"]
+		["8e022176.66adc", "c5278c28.6a9b9"]
 	]
 }, {
-	"id": "3397eec.96a2812",
+	"id": "7dfbcd55.b6e1f4",
 	"type": "execute",
 	"name": "execute RestApiCallNode getPath from OOF",
 	"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
 	"comments": "",
 	"outputs": 1,
-	"x": 1952.5589714050293,
-	"y": 1317.0627564191818,
-	"z": "926fea0b.1d3458",
+	"x": 1580.5279350280762,
+	"y": 1623.0315318107605,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["44889bda.c6f5b4", "b5ee75d7.fdc598"]
+		["5d1a513b.14b57", "7d96f5c1.96471c"]
 	]
 }, {
-	"id": "b5ee75d7.fdc598",
+	"id": "7d96f5c1.96471c",
 	"type": "failure",
 	"name": "failure",
 	"xml": "<outcome value='failure'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2281.558624267578,
-	"y": 1297.0628241300583,
-	"z": "926fea0b.1d3458",
+	"x": 1909.527587890625,
+	"y": 1603.031599521637,
+	"z": "1ade981f.b4cb28",
 	"wires": [
 		[]
 	]
 }, {
-	"id": "44889bda.c6f5b4",
+	"id": "5d1a513b.14b57",
 	"type": "success",
 	"name": "success",
 	"xml": "<outcome value='success'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2282.558837890625,
-	"y": 1348.0627335309982,
-	"z": "926fea0b.1d3458",
+	"x": 1910.5278015136719,
+	"y": 1654.031508922577,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["a7b63c93.b232"]
+		["4f670fd0.408e3"]
 	]
 }, {
-	"id": "45d2bc6f.d74144",
+	"id": "c5278c28.6a9b9",
 	"type": "switchNode",
 	"name": "switch temp.accessTPs_length",
 	"xml": "<switch test=\"`$temp.accessTPs_length >= 2`\">\n\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1607.558650970459,
-	"y": 1072.0625962018967,
-	"z": "926fea0b.1d3458",
+	"x": 1642.527400970459,
+	"y": 1118.0313462018967,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["1fe1fd41.188173"]
+		["5300c3df.d2146c"]
 	]
 }, {
-	"id": "1fe1fd41.188173",
+	"id": "5300c3df.d2146c",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1839.0589485168457,
-	"y": 1071.0624426603317,
-	"z": "926fea0b.1d3458",
+	"x": 1874.0276985168457,
+	"y": 1117.0311926603317,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["6afbb95f.22fc18"]
+		["9f6bbb66.0909d8"]
 	]
 }, {
-	"id": "6afbb95f.22fc18",
+	"id": "9f6bbb66.0909d8",
 	"type": "block",
 	"name": "call-oof-block : atomic",
 	"xml": "<block atomic=\"true\">",
 	"atomic": "true",
 	"comments": "",
 	"outputs": 1,
-	"x": 1583.0585975646973,
-	"y": 1208.0625027418137,
-	"z": "926fea0b.1d3458",
+	"x": 1618.0273475646973,
+	"y": 1254.0312527418137,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["3397eec.96a2812", "3bd5ae29.6c4052"]
+		["7dfbcd55.b6e1f4", "238383dd.1820ac", "98b5510e.5eab2"]
 	]
 }, {
-	"id": "3bd5ae29.6c4052",
+	"id": "238383dd.1820ac",
 	"type": "set",
 	"name": "set oof input",
 	"xml": "<set>\n<parameter name='prop.connection-attachment.access-topology-id' value='`$temp.accessTPs[0].access-topology-id`' />\n<parameter name='prop.connection-attachment.access-client-id' value='`$temp.accessTPs[0].access-client-id`' />\n<parameter name='prop.connection-attachment.access-provider-id' value='`$temp.accessTPs[0].access-provider-id`' />\n<parameter name='prop.connection-attachment.access-node-id' value='`$temp.accessTPs[0].access-node-id`' />\n<parameter name='prop.connection-attachment.access-ltp-id' value='`$temp.accessTPs[0].access-ltp-id`' />\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$temp.accessTPs[1].access-topology-id`' />\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$temp.accessTPs[1].access-client-id`' />\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$temp.accessTPs[1].access-provider-id`' />\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$temp.accessTPs[1].access-node-id`' />\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$temp.accessTPs[1].access-ltp-id`' />",
 	"comments": "",
-	"x": 1839.5586738586426,
-	"y": 1212.0624779462814,
-	"z": "926fea0b.1d3458",
+	"x": 2134.5274658203125,
+	"y": 1124.03125,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "e5744234.46142",
+	"id": "973f9e55.898bc",
 	"type": "execute",
 	"name": "execute RestApiCallNode Create Sotn connectivity Service",
 	"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-api-ConnectivityService.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ZTE-API-ConnectivityService:create-connectivity-service'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
 	"comments": "",
 	"outputs": 1,
-	"x": 2808.694080352783,
-	"y": 1838.0313729047775,
-	"z": "926fea0b.1d3458",
+	"x": 2633.662841796875,
+	"y": 1980.0001220703125,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["535d5b4b.9b7f24", "2e0febd4.c0f1c4"]
+		["b8ecc278.863", "d2381931.d03fb8"]
 	]
 }, {
-	"id": "535d5b4b.9b7f24",
+	"id": "b8ecc278.863",
 	"type": "success",
 	"name": "success",
 	"xml": "<outcome value='success'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 3146.6938972473145,
-	"y": 1868.0314563512802,
-	"z": "926fea0b.1d3458",
+	"x": 2971.6626586914062,
+	"y": 2010.0002055168152,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["dd3310d7.09a74"]
+		["115b43d.4df70bc"]
 	]
 }, {
-	"id": "dd3310d7.09a74",
+	"id": "115b43d.4df70bc",
 	"type": "block",
 	"name": "block : atomic",
 	"xml": "<block atomic=\"true\">",
 	"atomic": "true",
 	"comments": "",
 	"outputs": 1,
-	"x": 3294.6938972473145,
-	"y": 1866.0313342809677,
-	"z": "926fea0b.1d3458",
+	"x": 3119.6626586914062,
+	"y": 2008.0000834465027,
+	"z": "1ade981f.b4cb28",
 	"wires": [
 		[]
 	]
 }, {
-	"id": "f9b75d98.9e7f2",
+	"id": "76c2039e.b4d43c",
 	"type": "returnFailure",
 	"name": "return failure",
 	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
 	"comments": "",
-	"x": 3276.6939277648926,
-	"y": 1813.0313943624496,
-	"z": "926fea0b.1d3458",
+	"x": 3101.6626892089844,
+	"y": 1955.0001435279846,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "2e0febd4.c0f1c4",
+	"id": "d2381931.d03fb8",
 	"type": "failure",
 	"name": "failure",
 	"xml": "<outcome value='failure'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 3137.693836212158,
-	"y": 1813.0313943624496,
-	"z": "926fea0b.1d3458",
+	"x": 2962.66259765625,
+	"y": 1955.0001435279846,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["f9b75d98.9e7f2"]
+		["76c2039e.b4d43c"]
 	]
 }, {
-	"id": "a7b63c93.b232",
+	"id": "4f670fd0.408e3",
 	"type": "for",
 	"name": "for vidx..oof.vpns_length[]",
 	"xml": "<for index='vidx' start='0' end='`$oof.vpns_length`' >",
 	"comments": "",
 	"outputs": 1,
-	"x": 2386.697696685791,
-	"y": 1526.5348581075668,
-	"z": "926fea0b.1d3458",
+	"x": 2211.666458129883,
+	"y": 1668.5036072731018,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["eeab1f45.5ad4e"]
+		["a77de42e.23ccc8"]
 	]
 }, {
-	"id": "eeab1f45.5ad4e",
+	"id": "a77de42e.23ccc8",
 	"type": "block",
 	"name": "block : atomic",
 	"xml": "<block atomic=\"true\">",
 	"atomic": "true",
 	"outputs": 1,
-	"x": 2499.8150596618652,
-	"y": 1626.3748730421066,
-	"z": "926fea0b.1d3458",
+	"x": 2324.783821105957,
+	"y": 1768.3436222076416,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["6c8bea50.c3a084", "c15d913b.304b6", "e5744234.46142", "410e9e0d.02dd6"]
+		["b994d4aa.e334a8", "a346cd87.8c958", "973f9e55.898bc", "98ff5f9a.496c"]
 	]
 }, {
-	"id": "cfda9d38.b58d3",
+	"id": "737c8c2f.9d62b4",
 	"type": "set",
 	"name": "set controller data",
 	"xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
 	"comments": "",
-	"x": 3141.25972366333,
-	"y": 1690.7080653905869,
-	"z": "926fea0b.1d3458",
+	"x": 2966.228485107422,
+	"y": 1832.6768145561218,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "c15d913b.304b6",
+	"id": "a346cd87.8c958",
 	"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": 2757.7596321105957,
-	"y": 1727.7080048322678,
-	"z": "926fea0b.1d3458",
+	"x": 2582.7283935546875,
+	"y": 1869.6767539978027,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["13cbf9b9.b81a66", "bc1574ec.7fa5e8", "ad0c242.b566ad8"]
+		["f2f70c7e.0eb7b", "956c9182.85d07", "827d9dba.eac7"]
 	]
 }, {
-	"id": "13cbf9b9.b81a66",
+	"id": "f2f70c7e.0eb7b",
 	"type": "success",
 	"name": "success",
 	"xml": "<outcome value='success'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2977.759567260742,
-	"y": 1691.7079738378525,
-	"z": "926fea0b.1d3458",
+	"x": 2802.728328704834,
+	"y": 1833.6767230033875,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["cfda9d38.b58d3"]
+		["737c8c2f.9d62b4"]
 	]
 }, {
-	"id": "bc1574ec.7fa5e8",
+	"id": "956c9182.85d07",
 	"type": "not-found",
 	"name": "not-found",
 	"xml": "<outcome value='not-found'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2987.2505073547363,
-	"y": 1732.28197991848,
-	"z": "926fea0b.1d3458",
+	"x": 2812.219268798828,
+	"y": 1874.250729084015,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["6527879e.b615e8"]
+		["83a276c3.17cb88"]
 	]
 }, {
-	"id": "ad0c242.b566ad8",
+	"id": "827d9dba.eac7",
 	"type": "other",
 	"name": "other",
 	"xml": "<outcome value='Other'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2982.583484649658,
-	"y": 1768.6152929067612,
-	"z": "926fea0b.1d3458",
+	"x": 2807.55224609375,
+	"y": 1910.5840420722961,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["85d611b.775aaf"]
+		["652e1f35.433fe"]
 	]
 }, {
-	"id": "6527879e.b615e8",
+	"id": "83a276c3.17cb88",
 	"type": "returnFailure",
 	"name": "return failure",
 	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
 	"comments": "",
-	"x": 3133.8218574523926,
-	"y": 1728.5678066015244,
-	"z": "926fea0b.1d3458",
+	"x": 2958.7906188964844,
+	"y": 1870.5365557670593,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "85d611b.775aaf",
+	"id": "652e1f35.433fe",
 	"type": "returnFailure",
 	"name": "return failure",
 	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
 	"comments": "",
-	"x": 3137.356128692627,
-	"y": 1770.05444085598,
-	"z": "926fea0b.1d3458",
+	"x": 2962.3248901367188,
+	"y": 1912.023190021515,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "6c8bea50.c3a084",
+	"id": "b994d4aa.e334a8",
 	"type": "get-resource",
 	"name": "get-resource pnf",
 	"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $oof.vpn.access-node-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2703.2595252990723,
-	"y": 1636.7076486349106,
-	"z": "926fea0b.1d3458",
+	"x": 2528.228286743164,
+	"y": 1778.6763978004456,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["361f5e9d.140af2", "4cf0f707.e6c778", "6db6cec3.b72d2"]
+		["b2dfe53c.d58c88", "5fb7b767.4ddd98", "86ac5eca.1f9de"]
 	]
 }, {
-	"id": "361f5e9d.140af2",
+	"id": "b2dfe53c.d58c88",
 	"type": "success",
 	"name": "success",
 	"xml": "<outcome value='success'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2885.2595710754395,
-	"y": 1581.7077587842941,
-	"z": "926fea0b.1d3458",
+	"x": 2710.2283325195312,
+	"y": 1723.676507949829,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["71ac1295.fb6b8c"]
+		["4c6bb0cf.7a8d"]
 	]
 }, {
-	"id": "4cf0f707.e6c778",
+	"id": "5fb7b767.4ddd98",
 	"type": "not-found",
 	"name": "not-found",
 	"xml": "<outcome value='not-found'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2885.750473022461,
-	"y": 1619.2818554639816,
-	"z": "926fea0b.1d3458",
+	"x": 2710.7192344665527,
+	"y": 1761.2506046295166,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["c8a04464.0d92e8"]
+		["caf5934b.a4349"]
 	]
 }, {
-	"id": "6db6cec3.b72d2",
+	"id": "86ac5eca.1f9de",
 	"type": "other",
 	"name": "other",
 	"xml": "<outcome value='Other'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2877.083484649658,
-	"y": 1652.6152304410934,
-	"z": "926fea0b.1d3458",
+	"x": 2702.05224609375,
+	"y": 1794.5839796066284,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["2ba90495.cc80ec"]
+		["81de09fe.962e28"]
 	]
 }, {
-	"id": "c8a04464.0d92e8",
+	"id": "caf5934b.a4349",
 	"type": "returnFailure",
 	"name": "return failure",
 	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
 	"comments": "",
-	"x": 3033.3220977783203,
-	"y": 1618.5677441358566,
-	"z": "926fea0b.1d3458",
+	"x": 2858.290859222412,
+	"y": 1760.5364933013916,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "2ba90495.cc80ec",
+	"id": "81de09fe.962e28",
 	"type": "returnFailure",
 	"name": "return failure",
 	"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
 	"comments": "",
-	"x": 3030.856128692627,
-	"y": 1652.0543783903122,
-	"z": "926fea0b.1d3458",
+	"x": 2855.8248901367188,
+	"y": 1794.0231275558472,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "71ac1295.fb6b8c",
+	"id": "4c6bb0cf.7a8d",
 	"type": "set",
 	"name": "set tmp.thirdparty-sdnc-id",
 	"xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
 	"comments": "",
-	"x": 3070.2595710754395,
-	"y": 1580.7078808546066,
-	"z": "926fea0b.1d3458",
+	"x": 2895.2283325195312,
+	"y": 1722.6766300201416,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "410e9e0d.02dd6",
+	"id": "98ff5f9a.496c",
 	"type": "set",
 	"name": "set oof.vpn",
 	"xml": "<set>\n<parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />",
 	"comments": "",
-	"x": 2695.2595176696777,
-	"y": 1525.8187206983566,
-	"z": "926fea0b.1d3458",
+	"x": 2520.2282791137695,
+	"y": 1667.7874698638916,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "e1dac9e1.6143b8",
+	"id": "c5f7cd02.474b9",
 	"type": "switchNode",
 	"name": "switch network-parameter-name == 'thirdPartySdncId'",
 	"xml": "<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'thirdPartySdncId'`\">\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1656.3606433868408,
-	"y": 2064.0312827825546,
-	"z": "926fea0b.1d3458",
+	"x": 1691.3293933868408,
+	"y": 2110.0000327825546,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["97e55015.0cef1"]
+		["347a73c9.c2044c"]
 	]
 }, {
-	"id": "97e55015.0cef1",
+	"id": "347a73c9.c2044c",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1987.5585746765137,
-	"y": 2065.0622037649155,
-	"z": "926fea0b.1d3458",
+	"x": 2022.5273246765137,
+	"y": 2111.0309537649155,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["4f5ce339.2f4b7c"]
+		["1807bcd9.cbcc63"]
 	]
 }, {
-	"id": "4f5ce339.2f4b7c",
+	"id": "1807bcd9.cbcc63",
 	"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.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value` AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2252.559513092041,
-	"y": 2063.0622037649155,
-	"z": "926fea0b.1d3458",
+	"x": 2287.528263092041,
+	"y": 2109.0309537649155,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["2b9c64e4.ee151c", "847e4996.04f018", "b0a7e0c2.d0f99"]
+		["d9323612.7d0628", "cd1ef5fe.d66f28", "d826bc61.a3061"]
 	]
 }, {
-	"id": "2b9c64e4.ee151c",
+	"id": "d9323612.7d0628",
 	"type": "success",
 	"name": "success",
 	"xml": "<outcome value='success'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2514.5593185424805,
-	"y": 2007.0620158910751,
-	"z": "926fea0b.1d3458",
+	"x": 2549.5280685424805,
+	"y": 2053.030765891075,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["760fc6b6.ea2d48"]
+		["a93b1e0d.a35c7"]
 	]
 }, {
-	"id": "760fc6b6.ea2d48",
+	"id": "a93b1e0d.a35c7",
 	"type": "set",
 	"name": "set controller data",
 	"xml": "<set>\n<parameter name='prop.thirdpartySdnc-found' value='true' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
 	"comments": "",
-	"x": 2712.0593795776367,
-	"y": 1995.0620158910751,
-	"z": "926fea0b.1d3458",
+	"x": 2747.0281295776367,
+	"y": 2041.0307658910751,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "847e4996.04f018",
+	"id": "cd1ef5fe.d66f28",
 	"type": "not-found",
 	"name": "not-found",
 	"xml": "<outcome value='not-found'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2546.0501823425293,
-	"y": 2055.636119246483,
-	"z": "926fea0b.1d3458",
+	"x": 2581.0189323425293,
+	"y": 2101.604869246483,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["d47f6331.80419"]
+		["1e56373b.ddb279"]
 	]
 }, {
-	"id": "b0a7e0c2.d0f99",
+	"id": "d826bc61.a3061",
 	"type": "other",
 	"name": "other",
 	"xml": "<outcome value='Other'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 2541.3831901550293,
-	"y": 2096.969432234764,
-	"z": "926fea0b.1d3458",
+	"x": 2576.3519401550293,
+	"y": 2142.938182234764,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["d47f6331.80419"]
+		["1e56373b.ddb279"]
 	]
 }, {
-	"id": "d47f6331.80419",
+	"id": "1e56373b.ddb279",
 	"type": "set",
 	"name": "set controller data",
 	"xml": "<set>\n<parameter name='prop.thirdpartySdnc-found' value='false' />\n",
 	"comments": "",
-	"x": 2753.0585975646973,
-	"y": 2074.062201857567,
-	"z": "926fea0b.1d3458",
+	"x": 2788.0273475646973,
+	"y": 2120.030951857567,
+	"z": "1ade981f.b4cb28",
 	"wires": []
 }, {
-	"id": "43cfa6be.6eb688",
+	"id": "e797233f.75da4",
 	"type": "switchNode",
 	"name": "switch network-parameter-name == 'restapiUrl'",
 	"xml": "<switch test=\"`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-name == 'restapiUrl'`\">\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1629.5584564208984,
-	"y": 2156.0620836019516,
-	"z": "926fea0b.1d3458",
+	"x": 1664.5272064208984,
+	"y": 2202.0308336019516,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["24fb19a9.1d22f6"]
+		["c250bfe5.c7f1f"]
 	]
 }, {
-	"id": "24fb19a9.1d22f6",
+	"id": "c250bfe5.c7f1f",
 	"type": "outcomeTrue",
 	"name": "true",
 	"xml": "<outcome value='true'>\n",
 	"comments": "",
 	"outputs": 1,
-	"x": 1971.5585670471191,
-	"y": 2154.0622066259384,
-	"z": "926fea0b.1d3458",
+	"x": 2006.5273170471191,
+	"y": 2200.0309566259384,
+	"z": "1ade981f.b4cb28",
 	"wires": [
-		["cdaeb398.e7393"]
+		["666e08da.034568"]
 	]
 }, {
-	"id": "cdaeb398.e7393",
+	"id": "666e08da.034568",
 	"type": "set",
 	"name": "set tmp.templateFileName",
 	"xml": "<set>\n<parameter name='tmp.restapiUrl' value='`$tmp.network.network-data.network-topology.network-parameters.network-parameter[$cxid].network-parameter-value`' />\n<parameter name='tmp.restapiUrl-found' value='true' />",
 	"comments": "",
-	"x": 2215.558645248413,
-	"y": 2158.0622762441635,
-	"z": "926fea0b.1d3458",
+	"x": 2250.527395248413,
+	"y": 2204.0310262441635,
+	"z": "1ade981f.b4cb28",
 	"wires": []
+}, {
+	"id": "75fcb157.b9b59",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 2379,
+	"y": 1248,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["5b14048f.12553c", "52b16544.03c78c", "38c987e8.484a28", "32addcf6.c66764", "ece3ef52.4cd9", "ae270f1d.ffa9c", "7f091c79.e46444", "309988b6.7920e8", "8517e005.7b636", "80955454.533fe8"]
+	]
+}, {
+	"id": "5b14048f.12553c",
+	"type": "switchNode",
+	"name": "switch name",
+	"xml": "<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'name'`\">",
+	"comments": "",
+	"outputs": 1,
+	"x": 2600.9999465942383,
+	"y": 1046.0000805854797,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["fe000a36.fbe0e8"]
+	]
+}, {
+	"id": "fe000a36.fbe0e8",
+	"type": "outcomeTrue",
+	"name": "true",
+	"xml": "<outcome value='true'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 2787.9999465942383,
+	"y": 1042.0000805854797,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["ade8c214.0be56"]
+	]
+}, {
+	"id": "ade8c214.0be56",
+	"type": "set",
+	"name": "set name",
+	"xml": "<set>\n<parameter name='template.name' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n",
+	"comments": "",
+	"x": 2955.9999465942383,
+	"y": 1042.6000866889954,
+	"z": "1ade981f.b4cb28",
+	"wires": []
+}, {
+	"id": "52b16544.03c78c",
+	"type": "switchNode",
+	"name": "switch service-type",
+	"xml": "<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'service-type'`\">",
+	"comments": "",
+	"outputs": 1,
+	"x": 2618.510139465332,
+	"y": 1107.0000205039978,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["b7d5221e.05258"]
+	]
+}, {
+	"id": "b7d5221e.05258",
+	"type": "outcomeTrue",
+	"name": "true",
+	"xml": "<outcome value='true'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 2805.510139465332,
+	"y": 1103.0000205039978,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["f4d03bdc.ad8be8"]
+	]
+}, {
+	"id": "f4d03bdc.ad8be8",
+	"type": "set",
+	"name": "set service-type",
+	"xml": "<set>\n<parameter name='template.service-type' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n",
+	"comments": "",
+	"x": 2973.510139465332,
+	"y": 1103.6000266075134,
+	"z": "1ade981f.b4cb28",
+	"wires": []
+}, {
+	"id": "38c987e8.484a28",
+	"type": "switchNode",
+	"name": "switch total-size",
+	"xml": "<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'total-size'`\">",
+	"comments": "",
+	"outputs": 1,
+	"x": 2611.9727172851562,
+	"y": 1163.472821712494,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["ce8d2ecf.cebcb"]
+	]
+}, {
+	"id": "ce8d2ecf.cebcb",
+	"type": "outcomeTrue",
+	"name": "true",
+	"xml": "<outcome value='true'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 2798.9727172851562,
+	"y": 1159.472821712494,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["79bc31d0.6049b"]
+	]
+}, {
+	"id": "79bc31d0.6049b",
+	"type": "set",
+	"name": "set total-size",
+	"xml": "<set>\n<parameter name='template.total-size' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n",
+	"comments": "",
+	"x": 2966.9727172851562,
+	"y": 1160.0728278160095,
+	"z": "1ade981f.b4cb28",
+	"wires": []
+}, {
+	"id": "32addcf6.c66764",
+	"type": "switchNode",
+	"name": "switch pir",
+	"xml": "<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'pir'`\">",
+	"comments": "",
+	"outputs": 1,
+	"x": 2589.972816467285,
+	"y": 1212.4728608131409,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["ac264859.78f2c8"]
+	]
+}, {
+	"id": "ac264859.78f2c8",
+	"type": "outcomeTrue",
+	"name": "true",
+	"xml": "<outcome value='true'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 2776.972816467285,
+	"y": 1208.4728608131409,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["69a60419.09575c"]
+	]
+}, {
+	"id": "69a60419.09575c",
+	"type": "set",
+	"name": "set pir",
+	"xml": "<set>\n<parameter name='template.pir' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n",
+	"comments": "",
+	"x": 2944.972816467285,
+	"y": 1209.0728669166565,
+	"z": "1ade981f.b4cb28",
+	"wires": []
+}, {
+	"id": "ece3ef52.4cd9",
+	"type": "switchNode",
+	"name": "switch cbs",
+	"xml": "<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'cbs'`\">",
+	"comments": "",
+	"outputs": 1,
+	"x": 2590.9728507995605,
+	"y": 1263.4727854728699,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["2bbf7850.c2a418"]
+	]
+}, {
+	"id": "2bbf7850.c2a418",
+	"type": "outcomeTrue",
+	"name": "true",
+	"xml": "<outcome value='true'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 2777.9728507995605,
+	"y": 1259.4727854728699,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["221a9fbe.0b7a2"]
+	]
+}, {
+	"id": "221a9fbe.0b7a2",
+	"type": "set",
+	"name": "set cbs",
+	"xml": "<set>\n<parameter name='template.cbs' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n",
+	"comments": "",
+	"x": 2945.9728507995605,
+	"y": 1260.0727915763855,
+	"z": "1ade981f.b4cb28",
+	"wires": []
+}, {
+	"id": "ae270f1d.ffa9c",
+	"type": "switchNode",
+	"name": "switch pbs",
+	"xml": "<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'pbs'`\">",
+	"comments": "",
+	"outputs": 1,
+	"x": 2586.9728507995605,
+	"y": 1318.4727854728699,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["3aa18960.21df06"]
+	]
+}, {
+	"id": "3aa18960.21df06",
+	"type": "outcomeTrue",
+	"name": "true",
+	"xml": "<outcome value='true'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 2773.9728507995605,
+	"y": 1314.4727854728699,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["f2dc9f13.63071"]
+	]
+}, {
+	"id": "f2dc9f13.63071",
+	"type": "set",
+	"name": "set pbs",
+	"xml": "<set>\n<parameter name='template.pbs' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n",
+	"comments": "",
+	"x": 2941.9728507995605,
+	"y": 1315.0727915763855,
+	"z": "1ade981f.b4cb28",
+	"wires": []
+}, {
+	"id": "7f091c79.e46444",
+	"type": "switchNode",
+	"name": "switch couplingFlag",
+	"xml": "<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'couplingFlag'`\">",
+	"comments": "",
+	"outputs": 1,
+	"x": 2616.972999572754,
+	"y": 1374.4727873802185,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["2ec96ac1.74eb56"]
+	]
+}, {
+	"id": "2ec96ac1.74eb56",
+	"type": "outcomeTrue",
+	"name": "true",
+	"xml": "<outcome value='true'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 2803.972999572754,
+	"y": 1370.4727873802185,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["f23df759.89ea78"]
+	]
+}, {
+	"id": "f23df759.89ea78",
+	"type": "set",
+	"name": "set couplingFlag",
+	"xml": "<set>\n<parameter name='template.couplingFlag' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n",
+	"comments": "",
+	"x": 2971.972999572754,
+	"y": 1371.0727934837341,
+	"z": "1ade981f.b4cb28",
+	"wires": []
+}, {
+	"id": "309988b6.7920e8",
+	"type": "switchNode",
+	"name": "switch colorAware",
+	"xml": "<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'colorAware'`\">",
+	"comments": "",
+	"outputs": 1,
+	"x": 2610.972999572754,
+	"y": 1420.4727873802185,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["ff5d407a.d629a"]
+	]
+}, {
+	"id": "ff5d407a.d629a",
+	"type": "outcomeTrue",
+	"name": "true",
+	"xml": "<outcome value='true'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 2797.972999572754,
+	"y": 1416.4727873802185,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["5471bae7.23b974"]
+	]
+}, {
+	"id": "5471bae7.23b974",
+	"type": "set",
+	"name": "set colorAware",
+	"xml": "<set>\n<parameter name='template.colorAware' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n",
+	"comments": "",
+	"x": 2965.972999572754,
+	"y": 1417.0727934837341,
+	"z": "1ade981f.b4cb28",
+	"wires": []
+}, {
+	"id": "80955454.533fe8",
+	"type": "switchNode",
+	"name": "switch diversity-policy",
+	"xml": "<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'diversity-policy'`\">",
+	"comments": "",
+	"outputs": 1,
+	"x": 2618.9732398986816,
+	"y": 1511.472852230072,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["394315e7.68ab3a"]
+	]
+}, {
+	"id": "394315e7.68ab3a",
+	"type": "outcomeTrue",
+	"name": "true",
+	"xml": "<outcome value='true'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 2805.9732398986816,
+	"y": 1507.472852230072,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["c01e5816.98fe98"]
+	]
+}, {
+	"id": "c01e5816.98fe98",
+	"type": "set",
+	"name": "set diversity-policy",
+	"xml": "<set>\n<parameter name='template.diversity-policy' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n",
+	"comments": "",
+	"x": 2973.9732398986816,
+	"y": 1508.0728583335876,
+	"z": "1ade981f.b4cb28",
+	"wires": []
+}, {
+	"id": "8517e005.7b636",
+	"type": "switchNode",
+	"name": "switch route-objective-function",
+	"xml": "<switch test=\"`$tmp.network-input-parameters.param[$paidx].name == 'route-objective-function'`\">",
+	"comments": "",
+	"outputs": 1,
+	"x": 2647.9731483459473,
+	"y": 1460.472852230072,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["8485067c.5ed7d8"]
+	]
+}, {
+	"id": "8485067c.5ed7d8",
+	"type": "outcomeTrue",
+	"name": "true",
+	"xml": "<outcome value='true'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 2834.9731483459473,
+	"y": 1456.472852230072,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["abef4cdd.0306b"]
+	]
+}, {
+	"id": "abef4cdd.0306b",
+	"type": "set",
+	"name": "set route-objective-function",
+	"xml": "<set>\n<parameter name='template.route-objective-function' value='`$tmp.network-input-parameters.param[$paidx].value`' />\n",
+	"comments": "",
+	"x": 3002.9731483459473,
+	"y": 1457.0728583335876,
+	"z": "1ade981f.b4cb28",
+	"wires": []
+}, {
+	"id": "98b5510e.5eab2",
+	"type": "for",
+	"name": "for paidx..tmp.network-input-parameters.param_length[]",
+	"xml": "<for index='paidx' start='0' end='`$tmp.network-input-parameters.param_length`' >",
+	"comments": "",
+	"outputs": 1,
+	"x": 2099.1355361938477,
+	"y": 1378.468924999237,
+	"z": "1ade981f.b4cb28",
+	"wires": [
+		["75fcb157.b9b59"]
+	]
 }]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.xml
index 0b1ff5a9..b11e7408 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_wan-connection-topology-operation-activate.xml
@@ -131,6 +131,80 @@
                             <parameter name="prop.remote.connection-attachment.access-node-id" value="`$temp.accessTPs[1].access-node-id`"/>  
                             <parameter name="prop.remote.connection-attachment.access-ltp-id" value="`$temp.accessTPs[1].access-ltp-id`"/>
                           </set>
+                          <for index="paidx" start="0" end="`$tmp.network-input-parameters.param_length`">
+                            <block> 
+                              <switch test="`$tmp.network-input-parameters.param[$paidx].name == 'name'`">
+                                <outcome value="true"> 
+                                  <set> 
+                                    <parameter name="template.name" value="`$tmp.network-input-parameters.param[$paidx].value`"/> 
+                                  </set>
+                                </outcome>
+                              </switch>
+                              <switch test="`$tmp.network-input-parameters.param[$paidx].name == 'service-type'`">
+                                <outcome value="true"> 
+                                  <set> 
+                                    <parameter name="template.service-type" value="`$tmp.network-input-parameters.param[$paidx].value`"/> 
+                                  </set>
+                                </outcome>
+                              </switch>
+                              <switch test="`$tmp.network-input-parameters.param[$paidx].name == 'total-size'`">
+                                <outcome value="true"> 
+                                  <set> 
+                                    <parameter name="template.total-size" value="`$tmp.network-input-parameters.param[$paidx].value`"/> 
+                                  </set>
+                                </outcome>
+                              </switch>
+                              <switch test="`$tmp.network-input-parameters.param[$paidx].name == 'pir'`">
+                                <outcome value="true"> 
+                                  <set> 
+                                    <parameter name="template.pir" value="`$tmp.network-input-parameters.param[$paidx].value`"/> 
+                                  </set>
+                                </outcome>
+                              </switch>
+                              <switch test="`$tmp.network-input-parameters.param[$paidx].name == 'cbs'`">
+                                <outcome value="true"> 
+                                  <set> 
+                                    <parameter name="template.cbs" value="`$tmp.network-input-parameters.param[$paidx].value`"/> 
+                                  </set>
+                                </outcome>
+                              </switch>
+                              <switch test="`$tmp.network-input-parameters.param[$paidx].name == 'pbs'`">
+                                <outcome value="true"> 
+                                  <set> 
+                                    <parameter name="template.pbs" value="`$tmp.network-input-parameters.param[$paidx].value`"/> 
+                                  </set>
+                                </outcome>
+                              </switch>
+                              <switch test="`$tmp.network-input-parameters.param[$paidx].name == 'couplingFlag'`">
+                                <outcome value="true"> 
+                                  <set> 
+                                    <parameter name="template.couplingFlag" value="`$tmp.network-input-parameters.param[$paidx].value`"/> 
+                                  </set>
+                                </outcome>
+                              </switch>
+                              <switch test="`$tmp.network-input-parameters.param[$paidx].name == 'colorAware'`">
+                                <outcome value="true"> 
+                                  <set> 
+                                    <parameter name="template.colorAware" value="`$tmp.network-input-parameters.param[$paidx].value`"/> 
+                                  </set>
+                                </outcome>
+                              </switch>
+                              <switch test="`$tmp.network-input-parameters.param[$paidx].name == 'route-objective-function'`">
+                                <outcome value="true"> 
+                                  <set> 
+                                    <parameter name="template.route-objective-function" value="`$tmp.network-input-parameters.param[$paidx].value`"/> 
+                                  </set>
+                                </outcome>
+                              </switch>
+                              <switch test="`$tmp.network-input-parameters.param[$paidx].name == 'diversity-policy'`">
+                                <outcome value="true"> 
+                                  <set> 
+                                    <parameter name="template.diversity-policy" value="`$tmp.network-input-parameters.param[$paidx].value`"/> 
+                                  </set>
+                                </outcome>
+                              </switch>
+                            </block>
+                          </for>
                           <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> 
                             <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`"/>  
                             <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`"/>