Updates to SOTN DG

Updates include:
- Changes to support inter-domain.
- Changes wrt. AAI nodes and fields.

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

Former-commit-id: 62b4fd6b216ec03288cd216b50803ba8c64a3c3b

1 files changed, 374 insertions, 388 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 3c9c95ff..49437c77 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,20 +1,20 @@
 [
   {
-    "id": "139a6e7f.35f132",
+    "id": "81cd1a9a.ed4778",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 103.01040649414062,
-    "y": 78.2888806159608,
-    "z": "13b9846a.014e4c",
+    "x": 104.00390625,
+    "y": 120.28887966228649,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "5165cd92.df7bd4"
+        "1bef31e6.92d38e"
       ]
     ]
   },
   {
-    "id": "5165cd92.df7bd4",
+    "id": "1bef31e6.92d38e",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,69 +22,68 @@
     "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": 357.5104064941406,
-    "y": 78.2888806159608,
-    "z": "13b9846a.014e4c",
+    "x": 358.50390625,
+    "y": 120.28887966228649,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "a7444b33.7d1f48"
+        "22d8cb0f.1fe844"
       ]
     ]
   },
   {
-    "id": "a7444b33.7d1f48",
+    "id": "22d8cb0f.1fe844",
     "type": "method",
     "name": "sotn-network-topology-operation-create",
     "xml": "<method rpc='sotn-network-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 356.5104064941406,
-    "y": 178.2888806159608,
-    "z": "13b9846a.014e4c",
+    "x": 357.50390625,
+    "y": 220.2888796622865,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "a19a8247.a1622"
+        "1ac6ec58.6cc8c4"
       ]
     ]
   },
   {
-    "id": "a19a8247.a1622",
+    "id": "1ac6ec58.6cc8c4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 496.5104064941406,
-    "y": 278.2888806159608,
-    "z": "13b9846a.014e4c",
+    "x": 497.50390625,
+    "y": 320.2888796622865,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "9690673f.c35c38",
-        "9090896d.431318",
-        "1b9ab03d.d8994",
-        "611901b5.6b6e9",
-        "64f0eb98.ddb424",
-        "22fd42de.86c53e",
-        "cc42b05c.ab9b4",
-        "b37c9027.58eb3",
-        "3085f08f.eacbb",
-        "27379959.fccb76",
-        "2ad70cde.edce44",
-        "3e882683.7d50ea"
+        "dccba4bb.ec45e8",
+        "8d26ff9f.61d6",
+        "9cc5feac.c16eb",
+        "611e5fda.9173",
+        "493b5551.491c0c",
+        "7896c4df.77216c",
+        "cade84ce.caa788",
+        "d2e2bb0e.8628c8",
+        "dc47979f.672478",
+        "949f871e.3694a8",
+        "2d8bf094.04a15"
       ]
     ]
   },
   {
-    "id": "9690673f.c35c38",
+    "id": "dccba4bb.ec45e8",
     "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": 926.5104179382324,
-    "y": 96.06663253856823,
-    "z": "13b9846a.014e4c",
+    "x": 927.5039176940918,
+    "y": 138.0666315848939,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
         
@@ -92,15 +91,15 @@
     ]
   },
   {
-    "id": "9090896d.431318",
+    "id": "8d26ff9f.61d6",
     "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": 720.0660629272461,
-    "y": 273.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 721.0595626831055,
+    "y": 315.5110914707184,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
         
@@ -108,15 +107,15 @@
     ]
   },
   {
-    "id": "1b9ab03d.d8994",
+    "id": "9cc5feac.c16eb",
     "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": 820.5104179382324,
-    "y": 136.06663253856823,
-    "z": "13b9846a.014e4c",
+    "x": 821.5039176940918,
+    "y": 178.0666315848939,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
         
@@ -124,142 +123,142 @@
     ]
   },
   {
-    "id": "611901b5.6b6e9",
+    "id": "611e5fda.9173",
     "type": "switchNode",
     "name": "switch service-data.networks_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 811.0660629272461,
-    "y": 233.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 812.0595626831055,
+    "y": 275.5110914707184,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "6504f13e.cb942",
-        "f06b01d1.5ae64"
+        "73a5159b.c3206c",
+        "82bb8d63.17326"
       ]
     ]
   },
   {
-    "id": "6504f13e.cb942",
+    "id": "73a5159b.c3206c",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1040.066062927246,
-    "y": 213.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 1041.0595626831055,
+    "y": 255.51109147071838,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "80cc460d.6062a8"
+        "b454d6b2.ed7f78"
       ]
     ]
   },
   {
-    "id": "f06b01d1.5ae64",
+    "id": "82bb8d63.17326",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1040.066062927246,
-    "y": 253.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 1041.0595626831055,
+    "y": 295.5110914707184,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "cc9b4b29.340cf8"
+        "1c6a631d.a6467d"
       ]
     ]
   },
   {
-    "id": "80cc460d.6062a8",
+    "id": "b454d6b2.ed7f78",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='0' />\n",
     "comments": "",
-    "x": 1182.566062927246,
-    "y": 213.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 1183.5595626831055,
+    "y": 255.51109147071838,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "8ea707fc.e9fc98",
+    "id": "29335226.4cde8e",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments": "",
-    "x": 1316.12158203125,
-    "y": 215.06670212745667,
-    "z": "13b9846a.014e4c",
+    "x": 1317.1150817871094,
+    "y": 257.06670117378235,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "64f0eb98.ddb424",
+    "id": "493b5551.491c0c",
     "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": 781.5660629272461,
-    "y": 313.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 782.5595626831055,
+    "y": 355.5110914707184,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "22fd42de.86c53e",
+    "id": "7896c4df.77216c",
     "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": 817.0660629272461,
-    "y": 353.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 818.0595626831055,
+    "y": 395.5110914707184,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "cc42b05c.ab9b4",
+    "id": "cade84ce.caa788",
     "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": 743.7329025268555,
-    "y": 580.1777954101562,
-    "z": "13b9846a.014e4c",
+    "x": 741.7264022827148,
+    "y": 562.1778182983398,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "b37c9027.58eb3",
+    "id": "d2e2bb0e.8628c8",
     "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": 788.5660629272461,
-    "y": 393.5110924243927,
-    "z": "13b9846a.014e4c",
+    "x": 789.5595626831055,
+    "y": 435.5110914707184,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "3085f08f.eacbb",
+    "id": "dc47979f.672478",
     "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/'` \" />",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.sotn.network-id' >\n<parameter name='connectivity-id' value='`$prop.sotn.network-id`' />\n<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<parameter name='color-aware' value='`$prop.sotn.colorAware`' />\n<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />\n<parameter name='access-provider-id' value='`$prop.sotn.access-provider-id`' />\n<parameter name='access-client-id' value='`$prop.sotn.access-client-id`' />\n<parameter name='access-topology-id' value='`$prop.sotn.access-topology-id`' />\n<parameter name='access-node-id' value='`$prop.sotn.access-node-id`' />\n<parameter name='access-ltp-id' value='`$prop.sotn.access-ltp-id`' />\n<parameter name='cvlan-tag-entry' value='`$prop.sotn.cVLAN`' />\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='connectivity-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": 821.0660629272461,
-    "y": 440.1777813434601,
-    "z": "13b9846a.014e4c",
+    "x": 822.0595626831055,
+    "y": 482.17778038978577,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
         
@@ -267,15 +266,15 @@
     ]
   },
   {
-    "id": "27379959.fccb76",
+    "id": "949f871e.3694a8",
     "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`\" />",
+    "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=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 796.0660743713379,
-    "y": 477.9555332660675,
-    "z": "13b9846a.014e4c",
+    "x": 797.0595741271973,
+    "y": 519.9555323123932,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
         
@@ -283,887 +282,874 @@
     ]
   },
   {
-    "id": "56dd0abe.1511b4",
+    "id": "bcdf0e05.a3fa2",
     "type": "for",
     "name": "for each existing network",
     "xml": "<for index='idx' start='0' end='`$nidx`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1185.5501251220703,
-    "y": 358.28884431766346,
-    "z": "13b9846a.014e4c",
+    "x": 1186.5436248779297,
+    "y": 400.28884336398914,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "a637d096.3728c"
+        "c6c47ed0.cb847"
       ]
     ]
   },
   {
-    "id": "cc9b4b29.340cf8",
+    "id": "1c6a631d.a6467d",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1184.4231071472168,
-    "y": 253.4476044178009,
-    "z": "13b9846a.014e4c",
+    "x": 1185.4166069030762,
+    "y": 295.4476034641266,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "56dd0abe.1511b4",
-        "8ea707fc.e9fc98"
+        "bcdf0e05.a3fa2",
+        "29335226.4cde8e"
       ]
     ]
   },
   {
-    "id": "a637d096.3728c",
+    "id": "c6c47ed0.cb847",
     "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": 1460.8358459472656,
-    "y": 357.86034700321034,
-    "z": "13b9846a.014e4c",
+    "x": 1461.829345703125,
+    "y": 399.860346049536,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "29edb34.33bc74c"
+        "af281df5.a00a9"
       ]
     ]
   },
   {
-    "id": "29edb34.33bc74c",
+    "id": "af281df5.a00a9",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1361.5660438537598,
-    "y": 416.4317781631835,
-    "z": "13b9846a.014e4c",
+    "x": 1362.5595436096191,
+    "y": 458.43177720950916,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "fb222058.5489a"
+        "6774871.c3ba278"
       ]
     ]
   },
   {
-    "id": "e2502908.30a4f8",
+    "id": "ec60dbfe.f45f08",
     "type": "comment",
     "name": "make sure this network doesn't exist already",
     "info": "",
     "comments": "",
-    "x": 1409.200855255127,
-    "y": 316.5429017250426,
-    "z": "13b9846a.014e4c",
+    "x": 1410.1943550109863,
+    "y": 358.5429007713683,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "fb222058.5489a",
+    "id": "6774871.c3ba278",
     "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": 1509.316146850586,
-    "y": 416.2889702320099,
-    "z": "13b9846a.014e4c",
+    "x": 1510.3096466064453,
+    "y": 458.28896927833557,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "5c98a39b.1a248c",
+    "id": "fa710c0b.f8f7f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1475.9676399230957,
-    "y": 186.06668972969055,
-    "z": "13b9846a.014e4c",
+    "x": 1476.961139678955,
+    "y": 228.06668877601624,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "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"
+        "3da7e963.953786",
+        "ea8c87f0.c92e88",
+        "f149851b.9a9dd8",
+        "74ce1a73.a6b444",
+        "a5724e6b.3f9f1",
+        "53daad6a.5244e4",
+        "8867a34e.4671a",
+        "3149ec04.0b57f4",
+        "1e784180.8a488f",
+        "ca14452f.51d7b8",
+        "600f2d8b.ac1e64",
+        "f8776a5f.dd77d8",
+        "6867734f.34178c",
+        "e09fe051.1cbb8",
+        "1d14a0da.1e8adf",
+        "8cf376b5.6cba28"
       ]
     ]
   },
   {
-    "id": "eb10737a.973ea",
+    "id": "3da7e963.953786",
     "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": 1734.1893844604492,
-    "y": 43.39999318122864,
-    "z": "13b9846a.014e4c",
+    "x": 1735.1828842163086,
+    "y": 85.39999222755432,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "d0562182.0b394"
+        "42c647fe.f59548"
       ]
     ]
   },
   {
-    "id": "d0562182.0b394",
+    "id": "42c647fe.f59548",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1921.1893844604492,
-    "y": 39.39999318122864,
-    "z": "13b9846a.014e4c",
+    "x": 1922.1828842163086,
+    "y": 81.39999222755432,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "85ea5b3a.80fc78"
+        "22eef4c4.58190c"
       ]
     ]
   },
   {
-    "id": "85ea5b3a.80fc78",
+    "id": "22eef4c4.58190c",
     "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": 2071.1895141601562,
-    "y": 37.99999976158142,
-    "z": "13b9846a.014e4c",
+    "x": 2072.1830139160156,
+    "y": 79.9999988079071,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "20241118.87993e",
+    "id": "ea8c87f0.c92e88",
     "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": 1745.0290451049805,
-    "y": 83.39999127388,
-    "z": "13b9846a.014e4c",
+    "x": 1746.0225448608398,
+    "y": 125.39999032020569,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "aec8775b.d30d08"
+        "3266ff0a.32d5c"
       ]
     ]
   },
   {
-    "id": "aec8775b.d30d08",
+    "id": "3266ff0a.32d5c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1915.0290451049805,
-    "y": 79.39999127388,
-    "z": "13b9846a.014e4c",
+    "x": 1916.0225448608398,
+    "y": 121.39999032020569,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "6a968958.282fd8"
+        "e4bed62.ba99828"
       ]
     ]
   },
   {
-    "id": "6a968958.282fd8",
+    "id": "e4bed62.ba99828",
     "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": 2102.36248588562,
-    "y": 77.86114811897278,
-    "z": "13b9846a.014e4c",
+    "x": 2103.3559856414795,
+    "y": 119.86114716529846,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "2ad70cde.edce44",
+    "id": "2d8bf094.04a15",
     "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": 813.7448043823242,
-    "y": 183.844420671463,
-    "z": "13b9846a.014e4c",
+    "x": 814.7383041381836,
+    "y": 225.8444197177887,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "5c98a39b.1a248c"
+        "fa710c0b.f8f7f"
       ]
     ]
   },
   {
-    "id": "8f9a601f.f6c31",
+    "id": "f149851b.9a9dd8",
     "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": 1735.4114265441895,
-    "y": 126.733318567276,
-    "z": "13b9846a.014e4c",
+    "x": 1736.4049263000488,
+    "y": 168.73331761360168,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "bc2214ce.6d70f8"
+        "776be651.50d848"
       ]
     ]
   },
   {
-    "id": "bc2214ce.6d70f8",
+    "id": "776be651.50d848",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1922.4114265441895,
-    "y": 122.733318567276,
-    "z": "13b9846a.014e4c",
+    "x": 1923.4049263000488,
+    "y": 164.73331761360168,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "46fa1cce.7d92e4"
+        "a00211ac.55fa"
       ]
     ]
   },
   {
-    "id": "46fa1cce.7d92e4",
+    "id": "a00211ac.55fa",
     "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": 2090.4114265441895,
-    "y": 123.33332467079163,
-    "z": "13b9846a.014e4c",
+    "x": 2091.404926300049,
+    "y": 165.3333237171173,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "2f4693cf.5c48bc",
+    "id": "74ce1a73.a6b444",
     "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": 1717.2510833740234,
-    "y": 216.7333767414093,
-    "z": "13b9846a.014e4c",
+    "x": 1718.2445831298828,
+    "y": 258.733375787735,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "6dc3af21.b1bfa"
+        "701ee64a.e717f8"
       ]
     ]
   },
   {
-    "id": "6dc3af21.b1bfa",
+    "id": "701ee64a.e717f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1925.2511520385742,
-    "y": 212.73339009284973,
-    "z": "13b9846a.014e4c",
+    "x": 1926.2446517944336,
+    "y": 254.73338913917542,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "8bfeab9d.acab98"
+        "c0353e87.7a345"
       ]
     ]
   },
   {
-    "id": "8bfeab9d.acab98",
+    "id": "c0353e87.7a345",
     "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": 2074.58447265625,
-    "y": 211.19453740119934,
-    "z": "13b9846a.014e4c",
+    "x": 2075.5779724121094,
+    "y": 253.19453644752502,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "a92d3efb.9a862",
+    "id": "a5724e6b.3f9f1",
     "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": 1736.559555053711,
-    "y": 170.5110957622528,
-    "z": "13b9846a.014e4c",
+    "x": 1737.5530548095703,
+    "y": 212.5110948085785,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "4f2e612c.866ed"
+        "89501c3c.39e65"
       ]
     ]
   },
   {
-    "id": "4f2e612c.866ed",
+    "id": "89501c3c.39e65",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1923.559555053711,
-    "y": 166.5110957622528,
-    "z": "13b9846a.014e4c",
+    "x": 1924.5530548095703,
+    "y": 208.5110948085785,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "a5f469fe.1f7fb8"
+        "2f537b9c.402a54"
       ]
     ]
   },
   {
-    "id": "a5f469fe.1f7fb8",
+    "id": "2f537b9c.402a54",
     "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": 2092.8931884765625,
-    "y": 163.97226071357727,
-    "z": "13b9846a.014e4c",
+    "x": 2093.886688232422,
+    "y": 205.97225975990295,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "8921689e.0cc458",
+    "id": "53daad6a.5244e4",
     "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": 1758.0411911010742,
-    "y": 492.9556143283844,
-    "z": "13b9846a.014e4c",
+    "x": 1759.0346908569336,
+    "y": 534.9556133747101,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "db262e87.3b64a"
+        "c9908bde.d3d748"
       ]
     ]
   },
   {
-    "id": "23d4de8a.cdb1a2",
+    "id": "8867a34e.4671a",
     "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": 1750.5966720581055,
-    "y": 538.288943529129,
-    "z": "13b9846a.014e4c",
+    "x": 1751.5901718139648,
+    "y": 580.2889425754547,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "fd7a8c1c.3cc36"
+        "8bdcf612.c4ddd8"
       ]
     ]
   },
   {
-    "id": "c9294e5e.af421",
+    "id": "3149ec04.0b57f4",
     "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": 1755.041130065918,
-    "y": 577.1778290271759,
-    "z": "13b9846a.014e4c",
+    "x": 1756.0346298217773,
+    "y": 619.1778280735016,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "131fe813.7d7c68"
+        "3417d7e.4ccb528"
       ]
     ]
   },
   {
-    "id": "db262e87.3b64a",
+    "id": "c9908bde.d3d748",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1942.0411911010742,
-    "y": 491.95562958717346,
-    "z": "13b9846a.014e4c",
+    "x": 1943.0346908569336,
+    "y": 533.9556286334991,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "34d62c4c.27c844"
+        "39defa6f.d38fd6"
       ]
     ]
   },
   {
-    "id": "fd7a8c1c.3cc36",
+    "id": "8bdcf612.c4ddd8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1937.5966720581055,
-    "y": 534.288943529129,
-    "z": "13b9846a.014e4c",
+    "x": 1938.5901718139648,
+    "y": 576.2889425754547,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "98f0aeff.0649d"
+        "f50e4f7e.4a67d"
       ]
     ]
   },
   {
-    "id": "131fe813.7d7c68",
+    "id": "3417d7e.4ccb528",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1942.041130065918,
-    "y": 573.1778290271759,
-    "z": "13b9846a.014e4c",
+    "x": 1943.0346298217773,
+    "y": 615.1778280735016,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "7da4534a.aa3dbc"
+        "53d7cb35.9e4a94"
       ]
     ]
   },
   {
-    "id": "34d62c4c.27c844",
+    "id": "39defa6f.d38fd6",
     "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": 2125.2635498046875,
-    "y": 491.0668137073517,
-    "z": "13b9846a.014e4c",
+    "x": 2126.257049560547,
+    "y": 533.0668127536774,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "98f0aeff.0649d",
+    "id": "f50e4f7e.4a67d",
     "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": 2114.152587890625,
-    "y": 532.2994201183319,
-    "z": "13b9846a.014e4c",
+    "x": 2115.1460876464844,
+    "y": 574.2994191646576,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "7da4534a.aa3dbc",
+    "id": "53d7cb35.9e4a94",
     "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": 2124.04150390625,
-    "y": 571.1882765293121,
-    "z": "13b9846a.014e4c",
+    "x": 2125.0350036621094,
+    "y": 613.1882755756378,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "f05d31ef.6d9f2",
+    "id": "1e784180.8a488f",
     "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": 1755.8558883666992,
-    "y": 623.8444726467133,
-    "z": "13b9846a.014e4c",
+    "x": 1756.8493881225586,
+    "y": 665.8444716930389,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "b31c7b7f.9ced68"
+        "76b87020.8228"
       ]
     ]
   },
   {
-    "id": "b31c7b7f.9ced68",
+    "id": "76b87020.8228",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1942.8558883666992,
-    "y": 619.8444726467133,
-    "z": "13b9846a.014e4c",
+    "x": 1943.8493881225586,
+    "y": 661.8444716930389,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "76abc59c.8e0adc"
+        "c5389f2b.e694e"
       ]
     ]
   },
   {
-    "id": "3ac5e719.7cdd08",
+    "id": "ca14452f.51d7b8",
     "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": 1752.633659362793,
-    "y": 666.2889492511749,
-    "z": "13b9846a.014e4c",
+    "x": 1753.6271591186523,
+    "y": 708.2889482975006,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "848bd038.a1fd2"
+        "f814a8ba.16d968"
       ]
     ]
   },
   {
-    "id": "848bd038.a1fd2",
+    "id": "f814a8ba.16d968",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1939.633659362793,
-    "y": 662.2889492511749,
-    "z": "13b9846a.014e4c",
+    "x": 1940.6271591186523,
+    "y": 704.2889482975006,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "33b13d79.1d69b2"
+        "ae0c0f38.c407d"
       ]
     ]
   },
   {
-    "id": "76abc59c.8e0adc",
+    "id": "c5389f2b.e694e",
     "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": 2114.856201171875,
-    "y": 618.5216066837311,
-    "z": "13b9846a.014e4c",
+    "x": 2115.8497009277344,
+    "y": 660.5216057300568,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "33b13d79.1d69b2",
+    "id": "ae0c0f38.c407d",
     "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": 2105.3003540039062,
-    "y": 661.2993786334991,
-    "z": "13b9846a.014e4c",
+    "x": 2106.2938537597656,
+    "y": 703.2993776798248,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "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": 758.670768737793,
-    "y": 525.39999127388,
-    "z": "13b9846a.014e4c",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "36127ed4.d4df92",
+    "id": "600f2d8b.ac1e64",
     "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": 1718.5415344238281,
-    "y": 259.43124318122864,
-    "z": "13b9846a.014e4c",
+    "x": 1719.5350341796875,
+    "y": 301.4312422275543,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "f8180ca.c5aedf"
+        "39a162af.cbdf4e"
       ]
     ]
   },
   {
-    "id": "f8180ca.c5aedf",
+    "id": "39a162af.cbdf4e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1920.5414962768555,
-    "y": 254.43126320838928,
-    "z": "13b9846a.014e4c",
+    "x": 1921.5349960327148,
+    "y": 296.43126225471497,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "5b0895e4.66408c"
+        "5150b53b.34980c"
       ]
     ]
   },
   {
-    "id": "5b0895e4.66408c",
+    "id": "5150b53b.34980c",
     "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": 2076.875,
-    "y": 253.8923990726471,
-    "z": "13b9846a.014e4c",
+    "x": 2077.8684997558594,
+    "y": 295.8923981189728,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "f5195bd8.3c84a8",
+    "id": "f8776a5f.dd77d8",
     "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": 1718.5415344238281,
-    "y": 308.43124318122864,
-    "z": "13b9846a.014e4c",
+    "x": 1719.5350341796875,
+    "y": 350.4312422275543,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "c725a9a8.031f88"
+        "52870b8e.6e27b4"
       ]
     ]
   },
   {
-    "id": "c725a9a8.031f88",
+    "id": "52870b8e.6e27b4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1917.5414962768555,
-    "y": 304.43124985694885,
-    "z": "13b9846a.014e4c",
+    "x": 1918.5349960327148,
+    "y": 346.43124890327454,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "9ce1ba29.f6ec68"
+        "1fed4c26.5b7f64"
       ]
     ]
   },
   {
-    "id": "9ce1ba29.f6ec68",
+    "id": "1fed4c26.5b7f64",
     "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": 2075.8750610351562,
-    "y": 302.8924095630646,
-    "z": "13b9846a.014e4c",
+    "x": 2076.8685607910156,
+    "y": 344.89240860939026,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "ef3f5059.2d4ea",
+    "id": "6867734f.34178c",
     "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": 1718.5415344238281,
-    "y": 353.43124318122864,
-    "z": "13b9846a.014e4c",
+    "x": 1719.5350341796875,
+    "y": 395.4312422275543,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "205ee4a2.b994ec"
+        "dc43d92a.b102c8"
       ]
     ]
   },
   {
-    "id": "205ee4a2.b994ec",
+    "id": "dc43d92a.b102c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1917.5414962768555,
-    "y": 346.43125081062317,
-    "z": "13b9846a.014e4c",
+    "x": 1918.5349960327148,
+    "y": 388.43124985694885,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "547b372e.cb4fb8"
+        "a31e90a2.55db7"
       ]
     ]
   },
   {
-    "id": "547b372e.cb4fb8",
+    "id": "a31e90a2.55db7",
     "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": 2078.8750610351562,
-    "y": 347.8924095630646,
-    "z": "13b9846a.014e4c",
+    "x": 2079.8685607910156,
+    "y": 389.89240860939026,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "cd1b68b3.245ce8",
+    "id": "e09fe051.1cbb8",
     "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": 1740.541618347168,
-    "y": 400.43126034736633,
-    "z": "13b9846a.014e4c",
+    "x": 1741.5351181030273,
+    "y": 442.431259393692,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "5d9f9f32.e6f9f"
+        "6b010031.f7dc"
       ]
     ]
   },
   {
-    "id": "5d9f9f32.e6f9f",
+    "id": "6b010031.f7dc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1918.5416221618652,
-    "y": 394.4312527179718,
-    "z": "13b9846a.014e4c",
+    "x": 1919.5351219177246,
+    "y": 436.4312517642975,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "38ebf92a.f170a6"
+        "f64a6ad7.75c698"
       ]
     ]
   },
   {
-    "id": "38ebf92a.f170a6",
+    "id": "f64a6ad7.75c698",
     "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": 2099.875,
-    "y": 393.8924114704132,
-    "z": "13b9846a.014e4c",
+    "x": 2100.8684997558594,
+    "y": 435.8924105167389,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "43611249.362dac",
+    "id": "1d14a0da.1e8adf",
     "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": 1740.5416259765625,
-    "y": 446.43128514289856,
-    "z": "13b9846a.014e4c",
+    "x": 1741.5351257324219,
+    "y": 488.43128418922424,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "bd25ef93.0d4f4"
+        "465a723d.71bccc"
       ]
     ]
   },
   {
-    "id": "bd25ef93.0d4f4",
+    "id": "465a723d.71bccc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1918.541618347168,
-    "y": 438.4312536716461,
-    "z": "13b9846a.014e4c",
+    "x": 1919.5351181030273,
+    "y": 480.4312527179718,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "fd007702.45b298"
+        "abc827cf.8d31c8"
       ]
     ]
   },
   {
-    "id": "fd007702.45b298",
+    "id": "abc827cf.8d31c8",
     "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": 2103.875,
-    "y": 438.89243626594543,
-    "z": "13b9846a.014e4c",
+    "x": 2104.8684997558594,
+    "y": 480.8924353122711,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "c4de2cef.1053e",
+    "id": "8cf376b5.6cba28",
     "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": 1731.5415649414062,
-    "y": 711.4312927722931,
-    "z": "13b9846a.014e4c",
+    "x": 1732.5350646972656,
+    "y": 753.4312918186188,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "2a41f958.80fe56"
+        "cbfe2ddc.e03c2"
       ]
     ]
   },
   {
-    "id": "2a41f958.80fe56",
+    "id": "cbfe2ddc.e03c2",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1936.5415344238281,
-    "y": 712.4312431812286,
-    "z": "13b9846a.014e4c",
+    "x": 1937.5350341796875,
+    "y": 754.4312422275543,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       [
-        "3e76d5dc.97935a"
+        "57793550.48202c"
       ]
     ]
   },
   {
-    "id": "3e76d5dc.97935a",
+    "id": "57793550.48202c",
     "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": 2090.2083740234375,
-    "y": 711.4417145252228,
-    "z": "13b9846a.014e4c",
+    "x": 2091.201873779297,
+    "y": 753.4417135715485,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]
   },
   {
-    "id": "97828cf6.96e35",
+    "id": "5bd71de4.186664",
     "type": "comment",
     "name": "TODO: Recheck AAI schemas",
     "info": "",
     "comments": "",
-    "x": 785.0416870117188,
-    "y": 42.43131947517395,
-    "z": "13b9846a.014e4c",
+    "x": 786.0351867675781,
+    "y": 84.43131852149963,
+    "z": "7cf7d682.dbbec8",
     "wires": [
       
     ]