Connecting SOTN sub DGs to network DG

Changes include:
1. Connected SOTN sub DG with network DG
2. Removed hardcoding of version

Change-Id: Iabdbc267434bcef0ce125d166d1c2252fa49ce97
Issue-ID: SDNC-356
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>

Former-commit-id: c972410c1bb1faa06155e1aa8126c0849990879a

1 files changed, 380 insertions, 397 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
index 9559f36f..3c9c95ff 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
@@ -1,91 +1,90 @@
 [
   {
-    "id": "11760114.ffa53f",
+    "id": "139a6e7f.35f132",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 109,
-    "y": 68.88888743473217,
-    "z": "f3682574.cde048",
+    "x": 103.01040649414062,
+    "y": 78.2888806159608,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "387ea19.1ea525e"
+        "5165cd92.df7bd4"
       ]
     ]
   },
   {
-    "id": "387ea19.1ea525e",
+    "id": "5165cd92.df7bd4",
     "type": "service-logic",
-    "name": "GENERIC-RESOURCE-API 1.2.1-SNAPSHOT",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
-    "version": "1.2.1-SNAPSHOT",
+    "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='1.2.1-SNAPSHOT'>",
+    "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": 363.5,
-    "y": 68.88888743473217,
-    "z": "f3682574.cde048",
+    "x": 357.5104064941406,
+    "y": 78.2888806159608,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "acc8b788.ec53d8"
+        "a7444b33.7d1f48"
       ]
     ]
   },
   {
-    "id": "acc8b788.ec53d8",
+    "id": "a7444b33.7d1f48",
     "type": "method",
     "name": "sotn-network-topology-operation-create",
     "xml": "<method rpc='sotn-network-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 362.5,
-    "y": 168.88888743473217,
-    "z": "f3682574.cde048",
+    "x": 356.5104064941406,
+    "y": 178.2888806159608,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "34953ba0.309594"
+        "a19a8247.a1622"
       ]
     ]
   },
   {
-    "id": "34953ba0.309594",
+    "id": "a19a8247.a1622",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 502.5,
-    "y": 268.88888743473217,
-    "z": "f3682574.cde048",
+    "x": 496.5104064941406,
+    "y": 278.2888806159608,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "7388dbd6.e4b144",
-        "eb46e056.51069",
-        "27c87a61.1820b6",
-        "1c8ab342.be0a1d",
-        "f72cb383.b1b6",
-        "a36220a4.22926",
-        "a70fe000.5399c",
-        "47a1000.3ac09",
-        "edce49a.1c028b8",
-        "1f8a7b8b.e596a4",
-        "68c583ec.0ea75c",
-        "1522718b.801dfe",
-        "e184926f.0ad08"
+        "9690673f.c35c38",
+        "9090896d.431318",
+        "1b9ab03d.d8994",
+        "611901b5.6b6e9",
+        "64f0eb98.ddb424",
+        "22fd42de.86c53e",
+        "cc42b05c.ab9b4",
+        "b37c9027.58eb3",
+        "3085f08f.eacbb",
+        "27379959.fccb76",
+        "2ad70cde.edce44",
+        "3e882683.7d50ea"
       ]
     ]
   },
   {
-    "id": "7388dbd6.e4b144",
+    "id": "9690673f.c35c38",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-sotn-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 932.5000114440918,
-    "y": 86.66663935733959,
-    "z": "f3682574.cde048",
+    "x": 926.5104179382324,
+    "y": 96.06663253856823,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
         
@@ -93,15 +92,15 @@
     ]
   },
   {
-    "id": "eb46e056.51069",
+    "id": "9090896d.431318",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sotn-network-topology-operation-create\"/>\n<parameter name=\"field3\" value=\"SOTN-Config\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 726.0556564331055,
-    "y": 264.11109924316406,
-    "z": "f3682574.cde048",
+    "x": 720.0660629272461,
+    "y": 273.5110924243927,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
         
@@ -109,15 +108,15 @@
     ]
   },
   {
-    "id": "27c87a61.1820b6",
+    "id": "1b9ab03d.d8994",
     "type": "execute",
     "name": "execute generate-sotn-vpn-network-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.sotn.network-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 826.5000114440918,
-    "y": 126.66663935733959,
-    "z": "f3682574.cde048",
+    "x": 820.5104179382324,
+    "y": 136.06663253856823,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
         
@@ -125,142 +124,142 @@
     ]
   },
   {
-    "id": "1c8ab342.be0a1d",
+    "id": "611901b5.6b6e9",
     "type": "switchNode",
     "name": "switch service-data.networks_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 817.0556564331055,
-    "y": 224.11109924316406,
-    "z": "f3682574.cde048",
+    "x": 811.0660629272461,
+    "y": 233.5110924243927,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "c1b6935.5afba7",
-        "33b11f83.270c2"
+        "6504f13e.cb942",
+        "f06b01d1.5ae64"
       ]
     ]
   },
   {
-    "id": "c1b6935.5afba7",
+    "id": "6504f13e.cb942",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1046.0556564331055,
-    "y": 204.11109924316406,
-    "z": "f3682574.cde048",
+    "x": 1040.066062927246,
+    "y": 213.5110924243927,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "50a80e72.5fa1f"
+        "80cc460d.6062a8"
       ]
     ]
   },
   {
-    "id": "33b11f83.270c2",
+    "id": "f06b01d1.5ae64",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1046.0556564331055,
-    "y": 244.11109924316406,
-    "z": "f3682574.cde048",
+    "x": 1040.066062927246,
+    "y": 253.5110924243927,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "683104fc.0cc2bc"
+        "cc9b4b29.340cf8"
       ]
     ]
   },
   {
-    "id": "50a80e72.5fa1f",
+    "id": "80cc460d.6062a8",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='0' />\n",
     "comments": "",
-    "x": 1188.5556564331055,
-    "y": 204.11109924316406,
-    "z": "f3682574.cde048",
+    "x": 1182.566062927246,
+    "y": 213.5110924243927,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "4bd2e74.8492e18",
+    "id": "8ea707fc.e9fc98",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments": "",
-    "x": 1322.1111755371094,
-    "y": 205.66670894622803,
-    "z": "f3682574.cde048",
+    "x": 1316.12158203125,
+    "y": 215.06670212745667,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "f72cb383.b1b6",
+    "id": "64f0eb98.ddb424",
     "type": "set",
     "name": "set network in service-data",
     "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-id' value='`$prop.sotn.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": 787.5556564331055,
-    "y": 304.11109924316406,
-    "z": "f3682574.cde048",
+    "x": 781.5660629272461,
+    "y": 313.5110924243927,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "a36220a4.22926",
+    "id": "22fd42de.86c53e",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$prop.sotn.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.sotn.network-id  + '/network-data/'` \" />",
     "comments": "",
-    "x": 823.0556564331055,
-    "y": 344.11109924316406,
-    "z": "f3682574.cde048",
+    "x": 817.0660629272461,
+    "y": 353.5110924243927,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "a70fe000.5399c",
+    "id": "cc42b05c.ab9b4",
     "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": 749.7224502563477,
-    "y": 596.7778205871582,
-    "z": "f3682574.cde048",
+    "x": 743.7329025268555,
+    "y": 580.1777954101562,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "47a1000.3ac09",
+    "id": "b37c9027.58eb3",
     "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": 794.5556564331055,
-    "y": 384.11109924316406,
-    "z": "f3682574.cde048",
+    "x": 788.5660629272461,
+    "y": 393.5110924243927,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "edce49a.1c028b8",
+    "id": "3085f08f.eacbb",
     "type": "save",
     "name": "save SOTN connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n      key='configuration.configuration-id = $prop.sotn.network-id' >\n<parameter name='configuration-id' value='`$prop.sotn.network-id`' />\n<parameter name='configuration-name' value='`$prop.sotn.client-svc-name`' />\n<parameter name='configuration-type' value='`$prop.sotn.client-svc-descr`' />\n<parameter name='configuration-sub-type' value='`$prop.sotn.tenantId`' />\n<parameter name='orchestration-status' value='`$prop.sotn.vpnType`' />\n<parameter name='management-option' value='`$prop.sotn.cir`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='configuration-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />",
     "comments": "",
     "outputs": 1,
-    "x": 827.0556564331055,
-    "y": 430.77778816223145,
-    "z": "f3682574.cde048",
+    "x": 821.0660629272461,
+    "y": 440.1777813434601,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
         
@@ -268,15 +267,15 @@
     ]
   },
   {
-    "id": "1f8a7b8b.e596a4",
+    "id": "27379959.fccb76",
     "type": "save",
     "name": "save service relationship in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"configuration\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/configurations/configuration/' + $prop.sotn.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"configuration.configuration-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 802.0556678771973,
-    "y": 468.55554008483887,
-    "z": "f3682574.cde048",
+    "x": 796.0660743713379,
+    "y": 477.9555332660675,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
         
@@ -284,903 +283,887 @@
     ]
   },
   {
-    "id": "b85378f.1752188",
+    "id": "56dd0abe.1511b4",
     "type": "for",
     "name": "for each existing network",
     "xml": "<for index='idx' start='0' end='`$nidx`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1191.5397186279297,
-    "y": 348.8888511364348,
-    "z": "f3682574.cde048",
+    "x": 1185.5501251220703,
+    "y": 358.28884431766346,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "ad3781e0.62cbe"
+        "a637d096.3728c"
       ]
     ]
   },
   {
-    "id": "683104fc.0cc2bc",
+    "id": "cc9b4b29.340cf8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1190.4127006530762,
-    "y": 244.04761123657227,
-    "z": "f3682574.cde048",
+    "x": 1184.4231071472168,
+    "y": 253.4476044178009,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "b85378f.1752188",
-        "4bd2e74.8492e18"
+        "56dd0abe.1511b4",
+        "8ea707fc.e9fc98"
       ]
     ]
   },
   {
-    "id": "ad3781e0.62cbe",
+    "id": "a637d096.3728c",
     "type": "switchNode",
     "name": "switch networkid found",
     "xml": "<switch test=\"`$service-data.networks.network[$idx].network-id == $network-topology-operation-input.network-information.network-id`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1466.825439453125,
-    "y": 348.4603538219817,
-    "z": "f3682574.cde048",
+    "x": 1460.8358459472656,
+    "y": 357.86034700321034,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "30f1f431.08877c"
+        "29edb34.33bc74c"
       ]
     ]
   },
   {
-    "id": "30f1f431.08877c",
+    "id": "29edb34.33bc74c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1367.5556373596191,
-    "y": 407.03178498195484,
-    "z": "f3682574.cde048",
+    "x": 1361.5660438537598,
+    "y": 416.4317781631835,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "1df899ae.3b8026"
+        "fb222058.5489a"
       ]
     ]
   },
   {
-    "id": "3a07954a.fda22a",
+    "id": "e2502908.30a4f8",
     "type": "comment",
     "name": "make sure this network doesn't exist already",
     "info": "",
     "comments": "",
-    "x": 1415.1904487609863,
-    "y": 307.142908543814,
-    "z": "f3682574.cde048",
+    "x": 1409.200855255127,
+    "y": 316.5429017250426,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "1df899ae.3b8026",
+    "id": "fb222058.5489a",
     "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 already found in service-data\" />\n",
     "comments": "",
-    "x": 1515.3057403564453,
-    "y": 406.88897705078125,
-    "z": "f3682574.cde048",
+    "x": 1509.316146850586,
+    "y": 416.2889702320099,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "1eccb58d.49bd0a",
+    "id": "5c98a39b.1a248c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1481.957233428955,
-    "y": 176.6666965484619,
-    "z": "f3682574.cde048",
+    "x": 1475.9676399230957,
+    "y": 186.06668972969055,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "39c25585.35095a",
-        "f63e13ae.1ca36",
-        "b990d7b7.d50db8",
-        "84319a02.cc83c8",
-        "fd903008.4e1c6",
-        "64b1c8e5.3ad178",
-        "c55257d1.2dce08",
-        "70e3ab9b.3b6ef4",
-        "f11487f.1a2d778",
-        "f273d999.226da8",
-        "e251bd6c.23dfe",
-        "f51170c3.6db7",
-        "ba516d92.f632",
-        "fe52bad5.770908",
-        "b3759567.fa1fc8",
-        "a9128726.ee25b8"
+        "eb10737a.973ea",
+        "20241118.87993e",
+        "8f9a601f.f6c31",
+        "2f4693cf.5c48bc",
+        "a92d3efb.9a862",
+        "8921689e.0cc458",
+        "23d4de8a.cdb1a2",
+        "c9294e5e.af421",
+        "f05d31ef.6d9f2",
+        "3ac5e719.7cdd08",
+        "36127ed4.d4df92",
+        "f5195bd8.3c84a8",
+        "ef3f5059.2d4ea",
+        "cd1b68b3.245ce8",
+        "43611249.362dac",
+        "c4de2cef.1053e"
       ]
     ]
   },
   {
-    "id": "39c25585.35095a",
+    "id": "eb10737a.973ea",
     "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": 1740.1789779663086,
-    "y": 34,
-    "z": "f3682574.cde048",
+    "x": 1734.1893844604492,
+    "y": 43.39999318122864,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "be03b2cc.d65d1"
+        "d0562182.0b394"
       ]
     ]
   },
   {
-    "id": "be03b2cc.d65d1",
+    "id": "d0562182.0b394",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1927.1789779663086,
-    "y": 30,
-    "z": "f3682574.cde048",
+    "x": 1921.1893844604492,
+    "y": 39.39999318122864,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "904307f9.4f4248"
+        "85ea5b3a.80fc78"
       ]
     ]
   },
   {
-    "id": "904307f9.4f4248",
+    "id": "85ea5b3a.80fc78",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.sotn.etht-svc-name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2077.1791076660156,
-    "y": 28.600006580352783,
-    "z": "f3682574.cde048",
+    "x": 2071.1895141601562,
+    "y": 37.99999976158142,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "f63e13ae.1ca36",
+    "id": "20241118.87993e",
     "type": "switchNode",
     "name": "switch description",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'description'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1751.0186386108398,
-    "y": 73.99999809265137,
-    "z": "f3682574.cde048",
+    "x": 1745.0290451049805,
+    "y": 83.39999127388,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "2d5d0686.3b5eba"
+        "aec8775b.d30d08"
       ]
     ]
   },
   {
-    "id": "2d5d0686.3b5eba",
+    "id": "aec8775b.d30d08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1921.0186386108398,
-    "y": 69.99999809265137,
-    "z": "f3682574.cde048",
+    "x": 1915.0290451049805,
+    "y": 79.39999127388,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "8eefd68e.fffed8"
+        "6a968958.282fd8"
       ]
     ]
   },
   {
-    "id": "8eefd68e.fffed8",
+    "id": "6a968958.282fd8",
     "type": "set",
     "name": "set etht-svc-descr",
     "xml": "<set>\n<parameter name='prop.sotn.etht-svc-descr' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2108.3520793914795,
-    "y": 68.46115493774414,
-    "z": "f3682574.cde048",
+    "x": 2102.36248588562,
+    "y": 77.86114811897278,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "68c583ec.0ea75c",
+    "id": "2ad70cde.edce44",
     "type": "for",
     "name": "for loop i - 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": 819.7343978881836,
-    "y": 174.44442749023438,
-    "z": "f3682574.cde048",
+    "x": 813.7448043823242,
+    "y": 183.844420671463,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "1eccb58d.49bd0a"
+        "5c98a39b.1a248c"
       ]
     ]
   },
   {
-    "id": "b990d7b7.d50db8",
+    "id": "8f9a601f.f6c31",
     "type": "switchNode",
     "name": "switch tenantId",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1741.4010200500488,
-    "y": 117.33332538604736,
-    "z": "f3682574.cde048",
+    "x": 1735.4114265441895,
+    "y": 126.733318567276,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "d96e6910.7c5ce8"
+        "bc2214ce.6d70f8"
       ]
     ]
   },
   {
-    "id": "d96e6910.7c5ce8",
+    "id": "bc2214ce.6d70f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1928.4010200500488,
-    "y": 113.33332538604736,
-    "z": "f3682574.cde048",
+    "x": 1922.4114265441895,
+    "y": 122.733318567276,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "5b48eb71.3d5864"
+        "46fa1cce.7d92e4"
       ]
     ]
   },
   {
-    "id": "5b48eb71.3d5864",
+    "id": "46fa1cce.7d92e4",
     "type": "set",
     "name": "set tenantId",
     "xml": "<set>\n<parameter name='prop.sotn.tenantId' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2096.401020050049,
-    "y": 113.93333148956299,
-    "z": "f3682574.cde048",
+    "x": 2090.4114265441895,
+    "y": 123.33332467079163,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "84319a02.cc83c8",
+    "id": "2f4693cf.5c48bc",
     "type": "switchNode",
     "name": "switch CIR",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CIR'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1723.2406768798828,
-    "y": 207.33338356018066,
-    "z": "f3682574.cde048",
+    "x": 1717.2510833740234,
+    "y": 216.7333767414093,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "c1cdced0.80842"
+        "6dc3af21.b1bfa"
       ]
     ]
   },
   {
-    "id": "c1cdced0.80842",
+    "id": "6dc3af21.b1bfa",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1931.2407455444336,
-    "y": 203.3333969116211,
-    "z": "f3682574.cde048",
+    "x": 1925.2511520385742,
+    "y": 212.73339009284973,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "bcbc8704.d57d08"
+        "8bfeab9d.acab98"
       ]
     ]
   },
   {
-    "id": "bcbc8704.d57d08",
+    "id": "8bfeab9d.acab98",
     "type": "set",
     "name": "set cir",
     "xml": "<set>\n<parameter name='prop.sotn.cir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2080.5740661621094,
-    "y": 201.7945442199707,
-    "z": "f3682574.cde048",
+    "x": 2074.58447265625,
+    "y": 211.19453740119934,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "fd903008.4e1c6",
+    "id": "a92d3efb.9a862",
     "type": "switchNode",
     "name": "switch vpnType",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1742.5491485595703,
-    "y": 161.11110258102417,
-    "z": "f3682574.cde048",
+    "x": 1736.559555053711,
+    "y": 170.5110957622528,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "25a34a38.dcc406"
+        "4f2e612c.866ed"
       ]
     ]
   },
   {
-    "id": "25a34a38.dcc406",
+    "id": "4f2e612c.866ed",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1929.5491485595703,
-    "y": 157.11110258102417,
-    "z": "f3682574.cde048",
+    "x": 1923.559555053711,
+    "y": 166.5110957622528,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "fc6be9bd.f8dd28"
+        "a5f469fe.1f7fb8"
       ]
     ]
   },
   {
-    "id": "fc6be9bd.f8dd28",
+    "id": "a5f469fe.1f7fb8",
     "type": "set",
     "name": "set vpnType",
     "xml": "<set>\n<parameter name='prop.sotn.vpnType' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2098.882781982422,
-    "y": 154.57226753234863,
-    "z": "f3682574.cde048",
+    "x": 2092.8931884765625,
+    "y": 163.97226071357727,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "64b1c8e5.3ad178",
+    "id": "8921689e.0cc458",
     "type": "switchNode",
     "name": "switch access-provider-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-provider-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1764.0307846069336,
-    "y": 483.55562114715576,
-    "z": "f3682574.cde048",
+    "x": 1758.0411911010742,
+    "y": 492.9556143283844,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "d7282d61.ab2dc"
+        "db262e87.3b64a"
       ]
     ]
   },
   {
-    "id": "c55257d1.2dce08",
+    "id": "23d4de8a.cdb1a2",
     "type": "switchNode",
     "name": "switch access-client-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-client-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1756.5862655639648,
-    "y": 528.8889503479004,
-    "z": "f3682574.cde048",
+    "x": 1750.5966720581055,
+    "y": 538.288943529129,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "3e5c147b.b1e80c"
+        "fd7a8c1c.3cc36"
       ]
     ]
   },
   {
-    "id": "70e3ab9b.3b6ef4",
+    "id": "c9294e5e.af421",
     "type": "switchNode",
     "name": "switch access-topology-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-topology-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1761.0307235717773,
-    "y": 567.7778358459473,
-    "z": "f3682574.cde048",
+    "x": 1755.041130065918,
+    "y": 577.1778290271759,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "733a89f7.791ab8"
+        "131fe813.7d7c68"
       ]
     ]
   },
   {
-    "id": "d7282d61.ab2dc",
+    "id": "db262e87.3b64a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1948.0307846069336,
-    "y": 482.5556364059448,
-    "z": "f3682574.cde048",
+    "x": 1942.0411911010742,
+    "y": 491.95562958717346,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "bf6a3d1f.8cbc"
+        "34d62c4c.27c844"
       ]
     ]
   },
   {
-    "id": "3e5c147b.b1e80c",
+    "id": "fd7a8c1c.3cc36",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1943.5862655639648,
-    "y": 524.8889503479004,
-    "z": "f3682574.cde048",
+    "x": 1937.5966720581055,
+    "y": 534.288943529129,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "eae17cc1.2b92b"
+        "98f0aeff.0649d"
       ]
     ]
   },
   {
-    "id": "733a89f7.791ab8",
+    "id": "131fe813.7d7c68",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1948.0307235717773,
-    "y": 563.7778358459473,
-    "z": "f3682574.cde048",
+    "x": 1942.041130065918,
+    "y": 573.1778290271759,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "bf2ad720.26e6f8"
+        "7da4534a.aa3dbc"
       ]
     ]
   },
   {
-    "id": "bf6a3d1f.8cbc",
+    "id": "34d62c4c.27c844",
     "type": "set",
     "name": "set access-provider-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-provider-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2131.253143310547,
-    "y": 481.66682052612305,
-    "z": "f3682574.cde048",
+    "x": 2125.2635498046875,
+    "y": 491.0668137073517,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "eae17cc1.2b92b",
+    "id": "98f0aeff.0649d",
     "type": "set",
     "name": "set access-client-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-client-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2120.1421813964844,
-    "y": 522.8994269371033,
-    "z": "f3682574.cde048",
+    "x": 2114.152587890625,
+    "y": 532.2994201183319,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "bf2ad720.26e6f8",
+    "id": "7da4534a.aa3dbc",
     "type": "set",
     "name": "set access-topology-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-topology-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2130.0310974121094,
-    "y": 561.7882833480835,
-    "z": "f3682574.cde048",
+    "x": 2124.04150390625,
+    "y": 571.1882765293121,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "f11487f.1a2d778",
+    "id": "f05d31ef.6d9f2",
     "type": "switchNode",
     "name": "switch access-node-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-node-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1761.8454818725586,
-    "y": 614.4444794654846,
-    "z": "f3682574.cde048",
+    "x": 1755.8558883666992,
+    "y": 623.8444726467133,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "3f7939dd.f6bad6"
+        "b31c7b7f.9ced68"
       ]
     ]
   },
   {
-    "id": "3f7939dd.f6bad6",
+    "id": "b31c7b7f.9ced68",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1948.8454818725586,
-    "y": 610.4444794654846,
-    "z": "f3682574.cde048",
+    "x": 1942.8558883666992,
+    "y": 619.8444726467133,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "36806cf5.900574"
+        "76abc59c.8e0adc"
       ]
     ]
   },
   {
-    "id": "f273d999.226da8",
+    "id": "3ac5e719.7cdd08",
     "type": "switchNode",
     "name": "switch access-ltp-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-ltp-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1758.6232528686523,
-    "y": 656.8889560699463,
-    "z": "f3682574.cde048",
+    "x": 1752.633659362793,
+    "y": 666.2889492511749,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "dd2b85b9.e6ec48"
+        "848bd038.a1fd2"
       ]
     ]
   },
   {
-    "id": "dd2b85b9.e6ec48",
+    "id": "848bd038.a1fd2",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1945.6232528686523,
-    "y": 652.8889560699463,
-    "z": "f3682574.cde048",
+    "x": 1939.633659362793,
+    "y": 662.2889492511749,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "7e4475d7.79ec8c"
+        "33b13d79.1d69b2"
       ]
     ]
   },
   {
-    "id": "36806cf5.900574",
+    "id": "76abc59c.8e0adc",
     "type": "set",
     "name": "set access-node-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-node-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2120.8457946777344,
-    "y": 609.1216135025024,
-    "z": "f3682574.cde048",
+    "x": 2114.856201171875,
+    "y": 618.5216066837311,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "7e4475d7.79ec8c",
+    "id": "33b13d79.1d69b2",
     "type": "set",
     "name": "set access-ltp-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-ltp-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2111.2899475097656,
-    "y": 651.8993854522705,
-    "z": "f3682574.cde048",
+    "x": 2105.3003540039062,
+    "y": 661.2993786334991,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "1522718b.801dfe",
-    "type": "save",
-    "name": "save srcLTP relationship in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration:relationship-list' \n      key='configuration.configuration-id = $prop.sotn.network-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"logical-link\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/logical-links/logical-link/' + $unique-src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"logical-link.link-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-src-ltpId`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 800.1047744750977,
-    "y": 553.5184006690979,
-    "z": "f3682574.cde048",
-    "wires": [
-      [
-        
-      ]
-    ]
-  },
-  {
-    "id": "e184926f.0ad08",
+    "id": "3e882683.7d50ea",
     "type": "set",
     "name": "set unique-src-ltpId",
     "xml": "<set>\n<parameter name='unique-src-ltpId' value=\"`'nodeId-' + $prop.sotn.src-access-node-id + '-ltpId-' + $prop.sotn.src-access-ltp-id`\" />",
     "comments": "",
-    "x": 764.6603622436523,
-    "y": 515.9999980926514,
-    "z": "f3682574.cde048",
+    "x": 758.670768737793,
+    "y": 525.39999127388,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "e251bd6c.23dfe",
+    "id": "36127ed4.d4df92",
     "type": "switchNode",
     "name": "switch EIR",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'EIR'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1724.5311279296875,
-    "y": 250.03125,
-    "z": "f3682574.cde048",
+    "x": 1718.5415344238281,
+    "y": 259.43124318122864,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "8810ee0c.a4e38"
+        "f8180ca.c5aedf"
       ]
     ]
   },
   {
-    "id": "8810ee0c.a4e38",
+    "id": "f8180ca.c5aedf",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1926.5310897827148,
-    "y": 245.03127002716064,
-    "z": "f3682574.cde048",
+    "x": 1920.5414962768555,
+    "y": 254.43126320838928,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "1e197aec.8afff5"
+        "5b0895e4.66408c"
       ]
     ]
   },
   {
-    "id": "1e197aec.8afff5",
+    "id": "5b0895e4.66408c",
     "type": "set",
     "name": "set eir",
     "xml": "<set>\n<parameter name='prop.sotn.eir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2082.8645935058594,
-    "y": 244.49240589141846,
-    "z": "f3682574.cde048",
+    "x": 2076.875,
+    "y": 253.8923990726471,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "f51170c3.6db7",
+    "id": "f5195bd8.3c84a8",
     "type": "switchNode",
     "name": "switch CBS",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CBS'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1724.5311279296875,
-    "y": 299.03125,
-    "z": "f3682574.cde048",
+    "x": 1718.5415344238281,
+    "y": 308.43124318122864,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "49df64ea.07087c"
+        "c725a9a8.031f88"
       ]
     ]
   },
   {
-    "id": "49df64ea.07087c",
+    "id": "c725a9a8.031f88",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1923.5310897827148,
-    "y": 295.0312566757202,
-    "z": "f3682574.cde048",
+    "x": 1917.5414962768555,
+    "y": 304.43124985694885,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "386c9243.097e5e"
+        "9ce1ba29.f6ec68"
       ]
     ]
   },
   {
-    "id": "386c9243.097e5e",
+    "id": "9ce1ba29.f6ec68",
     "type": "set",
     "name": "set cbs",
     "xml": "<set>\n<parameter name='prop.sotn.cbs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2081.8646545410156,
-    "y": 293.49241638183594,
-    "z": "f3682574.cde048",
+    "x": 2075.8750610351562,
+    "y": 302.8924095630646,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "ba516d92.f632",
+    "id": "ef3f5059.2d4ea",
     "type": "switchNode",
     "name": "switch PBS",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'PBS'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1724.5311279296875,
-    "y": 344.03125,
-    "z": "f3682574.cde048",
+    "x": 1718.5415344238281,
+    "y": 353.43124318122864,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "9ac50dab.4fbde"
+        "205ee4a2.b994ec"
       ]
     ]
   },
   {
-    "id": "9ac50dab.4fbde",
+    "id": "205ee4a2.b994ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1923.5310897827148,
-    "y": 337.03125762939453,
-    "z": "f3682574.cde048",
+    "x": 1917.5414962768555,
+    "y": 346.43125081062317,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "fcfbd737.d83c58"
+        "547b372e.cb4fb8"
       ]
     ]
   },
   {
-    "id": "fcfbd737.d83c58",
+    "id": "547b372e.cb4fb8",
     "type": "set",
     "name": "set pbs",
     "xml": "<set>\n<parameter name='prop.sotn.pbs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2084.8646545410156,
-    "y": 338.49241638183594,
-    "z": "f3682574.cde048",
+    "x": 2078.8750610351562,
+    "y": 347.8924095630646,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "fe52bad5.770908",
+    "id": "cd1b68b3.245ce8",
     "type": "switchNode",
     "name": "switch color-aware",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'color-aware'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1746.5312118530273,
-    "y": 391.0312671661377,
-    "z": "f3682574.cde048",
+    "x": 1740.541618347168,
+    "y": 400.43126034736633,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "bccb8e92.0b5c7"
+        "5d9f9f32.e6f9f"
       ]
     ]
   },
   {
-    "id": "bccb8e92.0b5c7",
+    "id": "5d9f9f32.e6f9f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1924.5312156677246,
-    "y": 385.03125953674316,
-    "z": "f3682574.cde048",
+    "x": 1918.5416221618652,
+    "y": 394.4312527179718,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "e228c0d1.eaf54"
+        "38ebf92a.f170a6"
       ]
     ]
   },
   {
-    "id": "e228c0d1.eaf54",
+    "id": "38ebf92a.f170a6",
     "type": "set",
     "name": "set colorAware",
     "xml": "<set>\n<parameter name='prop.sotn.colorAware' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2105.8645935058594,
-    "y": 384.49241828918457,
-    "z": "f3682574.cde048",
+    "x": 2099.875,
+    "y": 393.8924114704132,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "b3759567.fa1fc8",
+    "id": "43611249.362dac",
     "type": "switchNode",
     "name": "switch coupling-flag",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'coupling-flag'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1746.5312194824219,
-    "y": 437.0312919616699,
-    "z": "f3682574.cde048",
+    "x": 1740.5416259765625,
+    "y": 446.43128514289856,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "a4cdcb3.5f83638"
+        "bd25ef93.0d4f4"
       ]
     ]
   },
   {
-    "id": "a4cdcb3.5f83638",
+    "id": "bd25ef93.0d4f4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1924.5312118530273,
-    "y": 429.0312604904175,
-    "z": "f3682574.cde048",
+    "x": 1918.541618347168,
+    "y": 438.4312536716461,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "6e47434b.16603c"
+        "fd007702.45b298"
       ]
     ]
   },
   {
-    "id": "6e47434b.16603c",
+    "id": "fd007702.45b298",
     "type": "set",
     "name": "set couplingFlag",
     "xml": "<set>\n<parameter name='prop.sotn.couplingFlag' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2109.8645935058594,
-    "y": 429.4924430847168,
-    "z": "f3682574.cde048",
+    "x": 2103.875,
+    "y": 438.89243626594543,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "a9128726.ee25b8",
+    "id": "c4de2cef.1053e",
     "type": "switchNode",
     "name": "switch cVLAN",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'cVLAN'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1737.5311584472656,
-    "y": 702.0312995910645,
-    "z": "f3682574.cde048",
+    "x": 1731.5415649414062,
+    "y": 711.4312927722931,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "1ad6eb3c.320b35"
+        "2a41f958.80fe56"
       ]
     ]
   },
   {
-    "id": "1ad6eb3c.320b35",
+    "id": "2a41f958.80fe56",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1942.5311279296875,
-    "y": 703.03125,
-    "z": "f3682574.cde048",
+    "x": 1936.5415344238281,
+    "y": 712.4312431812286,
+    "z": "13b9846a.014e4c",
     "wires": [
       [
-        "9dd46589.0d0a48"
+        "3e76d5dc.97935a"
       ]
     ]
   },
   {
-    "id": "9dd46589.0d0a48",
+    "id": "3e76d5dc.97935a",
     "type": "set",
     "name": "set cVLAN",
     "xml": "<set>\n<parameter name='prop.sotn.cVLAN' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2096.197967529297,
-    "y": 702.0417213439941,
-    "z": "f3682574.cde048",
+    "x": 2090.2083740234375,
+    "y": 711.4417145252228,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]
   },
   {
-    "id": "b152e598.bced08",
+    "id": "97828cf6.96e35",
     "type": "comment",
     "name": "TODO: Recheck AAI schemas",
     "info": "",
     "comments": "",
-    "x": 791.0312805175781,
-    "y": 33.03132629394531,
-    "z": "f3682574.cde048",
+    "x": 785.0416870117188,
+    "y": 42.43131947517395,
+    "z": "13b9846a.014e4c",
     "wires": [
       
     ]