SOTN issue fixes

Issues: SOTN connectivity issues in create, activate and deactivate is fixed

Change-Id: I4b85cf2eb248f36369a85fc93394a1d41d2170ac
Issue-ID: SDNC-356
Signed-off-by: Prakash E <prakash.e@huawei.com>

Former-commit-id: 42ff7639525bbba3dd81abd4965d340291d46b3e

1 files changed, 402 insertions, 506 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 49437c77..212b3cb1 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": "81cd1a9a.ed4778",
+    "id": "75ca7680.1d3a58",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 104.00390625,
-    "y": 120.28887966228649,
-    "z": "7cf7d682.dbbec8",
+    "x": 115,
+    "y": 94,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "1bef31e6.92d38e"
+        "129f94ba.7fe03b"
       ]
     ]
   },
   {
-    "id": "1bef31e6.92d38e",
+    "id": "129f94ba.7fe03b",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1136 +22,1032 @@
     "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": 358.50390625,
-    "y": 120.28887966228649,
-    "z": "7cf7d682.dbbec8",
+    "x": 333.49999237060547,
+    "y": 174.9999928767793,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "22d8cb0f.1fe844"
+        "436daa76.7579c4"
       ]
     ]
   },
   {
-    "id": "22d8cb0f.1fe844",
+    "id": "436daa76.7579c4",
     "type": "method",
     "name": "sotn-network-topology-operation-create",
     "xml": "<method rpc='sotn-network-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 357.50390625,
-    "y": 220.2888796622865,
-    "z": "7cf7d682.dbbec8",
+    "x": 332.49999237060547,
+    "y": 274.9999928767793,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "1ac6ec58.6cc8c4"
+        "d7bbd3b7.969f1"
       ]
     ]
   },
   {
-    "id": "1ac6ec58.6cc8c4",
+    "id": "d7bbd3b7.969f1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 497.50390625,
-    "y": 320.2888796622865,
-    "z": "7cf7d682.dbbec8",
+    "x": 472.49999237060547,
+    "y": 374.9999928767793,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "dccba4bb.ec45e8",
-        "8d26ff9f.61d6",
-        "9cc5feac.c16eb",
-        "611e5fda.9173",
-        "493b5551.491c0c",
-        "7896c4df.77216c",
-        "cade84ce.caa788",
-        "d2e2bb0e.8628c8",
-        "dc47979f.672478",
-        "949f871e.3694a8",
-        "2d8bf094.04a15"
+        "5f387e8f.fd62",
+        "eb116abb.3ac2e8",
+        "4aa45281.84acec",
+        "a532dc93.80ef6",
+        "b1588e73.71447",
+        "553a6b9e.729ec4",
+        "36ffcb33.4e1fd4",
+        "77abacf.f4efc54",
+        "5a59ba8.9380644",
+        "582840e.ea42fc",
+        "fc2a5352.16901"
       ]
     ]
   },
   {
-    "id": "dccba4bb.ec45e8",
+    "id": "5f387e8f.fd62",
     "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": 927.5039176940918,
-    "y": 138.0666315848939,
-    "z": "7cf7d682.dbbec8",
+    "x": 902.5000038146973,
+    "y": 192.7777447993867,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "8d26ff9f.61d6",
+    "id": "eb116abb.3ac2e8",
     "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": 721.0595626831055,
-    "y": 315.5110914707184,
-    "z": "7cf7d682.dbbec8",
+    "x": 696.0556488037109,
+    "y": 370.2222046852112,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "9cc5feac.c16eb",
+    "id": "4aa45281.84acec",
     "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": 821.5039176940918,
-    "y": 178.0666315848939,
-    "z": "7cf7d682.dbbec8",
+    "x": 796.5000038146973,
+    "y": 232.7777447993867,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "611e5fda.9173",
+    "id": "a532dc93.80ef6",
     "type": "switchNode",
     "name": "switch service-data.networks_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 812.0595626831055,
-    "y": 275.5110914707184,
-    "z": "7cf7d682.dbbec8",
+    "x": 789.0556564331055,
+    "y": 321.2221913631074,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "73a5159b.c3206c",
-        "82bb8d63.17326"
+        "d42a3b2a.ffbae8",
+        "2876f1e7.3bf11e"
       ]
     ]
   },
   {
-    "id": "73a5159b.c3206c",
+    "id": "d42a3b2a.ffbae8",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1041.0595626831055,
-    "y": 255.51109147071838,
-    "z": "7cf7d682.dbbec8",
+    "x": 1016.0556488037109,
+    "y": 310.2222046852112,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "b454d6b2.ed7f78"
+        "fde1029e.0da77"
       ]
     ]
   },
   {
-    "id": "82bb8d63.17326",
+    "id": "2876f1e7.3bf11e",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1041.0595626831055,
-    "y": 295.5110914707184,
-    "z": "7cf7d682.dbbec8",
+    "x": 1016.0556488037109,
+    "y": 350.2222046852112,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "1c6a631d.a6467d"
+        "895d1c39.9fd62"
       ]
     ]
   },
   {
-    "id": "b454d6b2.ed7f78",
+    "id": "fde1029e.0da77",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='0' />\n",
     "comments": "",
-    "x": 1183.5595626831055,
-    "y": 255.51109147071838,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 1158.555648803711,
+    "y": 310.2222046852112,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "29335226.4cde8e",
+    "id": "e9c489d1.6bc028",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments": "",
-    "x": 1317.1150817871094,
-    "y": 257.06670117378235,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 1292.1111679077148,
+    "y": 311.77781438827515,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "493b5551.491c0c",
+    "id": "b1588e73.71447",
     "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": 782.5595626831055,
-    "y": 355.5110914707184,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 757.5556488037109,
+    "y": 410.2222046852112,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "7896c4df.77216c",
+    "id": "553a6b9e.729ec4",
     "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": 818.0595626831055,
-    "y": 395.5110914707184,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 793.0556488037109,
+    "y": 450.2222046852112,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "cade84ce.caa788",
+    "id": "36ffcb33.4e1fd4",
     "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": 741.7264022827148,
-    "y": 562.1778182983398,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 716.7224884033203,
+    "y": 616.8889315128326,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "d2e2bb0e.8628c8",
+    "id": "77abacf.f4efc54",
     "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": 789.5595626831055,
-    "y": 435.5110914707184,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 764.5556488037109,
+    "y": 490.2222046852112,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "dc47979f.672478",
+    "id": "5a59ba8.9380644",
     "type": "save",
     "name": "save SOTN connectivity resource in AAI",
-    "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/'` \" />",
+    "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='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\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='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />\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' 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": 822.0595626831055,
-    "y": 482.17778038978577,
-    "z": "7cf7d682.dbbec8",
+    "x": 797.0556488037109,
+    "y": 536.8888936042786,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "949f871e.3694a8",
+    "id": "582840e.ea42fc",
     "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=\"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": 797.0595741271973,
-    "y": 519.9555323123932,
-    "z": "7cf7d682.dbbec8",
+    "x": 772.0556602478027,
+    "y": 574.666645526886,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "bcdf0e05.a3fa2",
+    "id": "7821c135.be528",
     "type": "for",
     "name": "for each existing network",
     "xml": "<for index='idx' start='0' end='`$nidx`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1186.5436248779297,
-    "y": 400.28884336398914,
-    "z": "7cf7d682.dbbec8",
+    "x": 1161.5397109985352,
+    "y": 454.99995657848194,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "c6c47ed0.cb847"
+        "c1a7031.d1ed7"
       ]
     ]
   },
   {
-    "id": "1c6a631d.a6467d",
+    "id": "895d1c39.9fd62",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1185.4166069030762,
-    "y": 295.4476034641266,
-    "z": "7cf7d682.dbbec8",
+    "x": 1160.4126930236816,
+    "y": 350.1587166786194,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "bcdf0e05.a3fa2",
-        "29335226.4cde8e"
+        "7821c135.be528",
+        "e9c489d1.6bc028"
       ]
     ]
   },
   {
-    "id": "c6c47ed0.cb847",
+    "id": "c1a7031.d1ed7",
     "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": 1461.829345703125,
-    "y": 399.860346049536,
-    "z": "7cf7d682.dbbec8",
+    "x": 1436.8254318237305,
+    "y": 454.5714592640288,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "af281df5.a00a9"
+        "9367b5e2.953668"
       ]
     ]
   },
   {
-    "id": "af281df5.a00a9",
+    "id": "9367b5e2.953668",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1362.5595436096191,
-    "y": 458.43177720950916,
-    "z": "7cf7d682.dbbec8",
+    "x": 1337.5556297302246,
+    "y": 513.142890424002,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "6774871.c3ba278"
+        "4001ac49.be63c4"
       ]
     ]
   },
   {
-    "id": "ec60dbfe.f45f08",
+    "id": "2f9e76b8.9b7e8a",
     "type": "comment",
     "name": "make sure this network doesn't exist already",
     "info": "",
     "comments": "",
-    "x": 1410.1943550109863,
-    "y": 358.5429007713683,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 1385.1904411315918,
+    "y": 413.2540139858611,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "6774871.c3ba278",
+    "id": "4001ac49.be63c4",
     "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": 1510.3096466064453,
-    "y": 458.28896927833557,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 1485.3057327270508,
+    "y": 513.0000824928284,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "fa710c0b.f8f7f",
+    "id": "e30a216c.06ee1",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1476.961139678955,
-    "y": 228.06668877601624,
-    "z": "7cf7d682.dbbec8",
+    "x": 1451.9572257995605,
+    "y": 282.77780199050903,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "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"
+        "64587c87.c4ced4",
+        "8393b82d.d5e438",
+        "6c36148d.1e8d6c",
+        "723317bf.383f98",
+        "86d16c8d.31d4e",
+        "26134e93.750692",
+        "5c4d7e43.e8961",
+        "729993a3.c5fcac",
+        "14dc371b.e7d799",
+        "b6721dfb.b1a0a",
+        "a5bddbeb.2c8598",
+        "9f8ad772.f86798",
+        "6553f7b8.604f48",
+        "ccf147e.f3f84b8",
+        "ca42d623.87ba58"
       ]
     ]
   },
   {
-    "id": "3da7e963.953786",
+    "id": "64587c87.c4ced4",
     "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": 1735.1828842163086,
-    "y": 85.39999222755432,
-    "z": "7cf7d682.dbbec8",
+    "x": 1710.178970336914,
+    "y": 140.11110544204712,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "42c647fe.f59548"
+        "c4b37985.1946d8"
       ]
     ]
   },
   {
-    "id": "42c647fe.f59548",
+    "id": "c4b37985.1946d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1922.1828842163086,
-    "y": 81.39999222755432,
-    "z": "7cf7d682.dbbec8",
+    "x": 1897.178970336914,
+    "y": 136.11110544204712,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "22eef4c4.58190c"
+        "5fad2e08.81224"
       ]
     ]
   },
   {
-    "id": "22eef4c4.58190c",
+    "id": "5fad2e08.81224",
     "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": 2072.1830139160156,
-    "y": 79.9999988079071,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2047.179100036621,
+    "y": 134.7111120223999,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "ea8c87f0.c92e88",
+    "id": "8393b82d.d5e438",
     "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": 1746.0225448608398,
-    "y": 125.39999032020569,
-    "z": "7cf7d682.dbbec8",
+    "x": 1721.0186309814453,
+    "y": 180.1111035346985,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "3266ff0a.32d5c"
+        "e7f48cb.3fc207"
       ]
     ]
   },
   {
-    "id": "3266ff0a.32d5c",
+    "id": "e7f48cb.3fc207",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1916.0225448608398,
-    "y": 121.39999032020569,
-    "z": "7cf7d682.dbbec8",
+    "x": 1891.0186309814453,
+    "y": 176.1111035346985,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "e4bed62.ba99828"
+        "5c031099.8cebf"
       ]
     ]
   },
   {
-    "id": "e4bed62.ba99828",
+    "id": "5c031099.8cebf",
     "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": 2103.3559856414795,
-    "y": 119.86114716529846,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2078.352071762085,
+    "y": 174.57226037979126,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "2d8bf094.04a15",
+    "id": "fc2a5352.16901",
     "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": 814.7383041381836,
-    "y": 225.8444197177887,
-    "z": "7cf7d682.dbbec8",
+    "x": 790.7343673706055,
+    "y": 281.5555348689668,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "fa710c0b.f8f7f"
+        "e30a216c.06ee1"
       ]
     ]
   },
   {
-    "id": "f149851b.9a9dd8",
+    "id": "6c36148d.1e8d6c",
     "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": 1736.4049263000488,
-    "y": 168.73331761360168,
-    "z": "7cf7d682.dbbec8",
+    "x": 1711.4010124206543,
+    "y": 223.44443082809448,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "776be651.50d848"
+        "b44c76e.15dfe88"
       ]
     ]
   },
   {
-    "id": "776be651.50d848",
+    "id": "b44c76e.15dfe88",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1923.4049263000488,
-    "y": 164.73331761360168,
-    "z": "7cf7d682.dbbec8",
+    "x": 1898.4010124206543,
+    "y": 219.44443082809448,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "a00211ac.55fa"
+        "96f73c26.559e8"
       ]
     ]
   },
   {
-    "id": "a00211ac.55fa",
+    "id": "96f73c26.559e8",
     "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": 2091.404926300049,
-    "y": 165.3333237171173,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2066.4010124206543,
+    "y": 220.0444369316101,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "74ce1a73.a6b444",
+    "id": "723317bf.383f98",
     "type": "switchNode",
-    "name": "switch CIR",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CIR'`\">\n",
+    "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": 1718.2445831298828,
-    "y": 258.733375787735,
-    "z": "7cf7d682.dbbec8",
+    "x": 1693.2406692504883,
+    "y": 313.4444890022278,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "701ee64a.e717f8"
+        "1a52097e.d09ff7"
       ]
     ]
   },
   {
-    "id": "701ee64a.e717f8",
+    "id": "1a52097e.d09ff7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1926.2446517944336,
-    "y": 254.73338913917542,
-    "z": "7cf7d682.dbbec8",
+    "x": 1901.240737915039,
+    "y": 309.4445023536682,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "c0353e87.7a345"
+        "f62306dc.1325f8"
       ]
     ]
   },
   {
-    "id": "c0353e87.7a345",
+    "id": "f62306dc.1325f8",
     "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": 2075.5779724121094,
-    "y": 253.19453644752502,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2050.574058532715,
+    "y": 307.9056496620178,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "a5724e6b.3f9f1",
+    "id": "86d16c8d.31d4e",
     "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": 1737.5530548095703,
-    "y": 212.5110948085785,
-    "z": "7cf7d682.dbbec8",
+    "x": 1712.5491409301758,
+    "y": 267.2222080230713,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "89501c3c.39e65"
+        "703f29bd.fdd258"
       ]
     ]
   },
   {
-    "id": "89501c3c.39e65",
+    "id": "703f29bd.fdd258",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1924.5530548095703,
-    "y": 208.5110948085785,
-    "z": "7cf7d682.dbbec8",
+    "x": 1899.5491409301758,
+    "y": 263.2222080230713,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "2f537b9c.402a54"
+        "ebf1a004.f1ef9"
       ]
     ]
   },
   {
-    "id": "2f537b9c.402a54",
+    "id": "ebf1a004.f1ef9",
     "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": 2093.886688232422,
-    "y": 205.97225975990295,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2068.8827743530273,
+    "y": 260.68337297439575,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "53daad6a.5244e4",
+    "id": "26134e93.750692",
     "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": 1759.0346908569336,
-    "y": 534.9556133747101,
-    "z": "7cf7d682.dbbec8",
+    "x": 1734.030776977539,
+    "y": 589.6667265892029,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "c9908bde.d3d748"
+        "4515fd29.b598c4"
       ]
     ]
   },
   {
-    "id": "8867a34e.4671a",
+    "id": "5c4d7e43.e8961",
     "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": 1751.5901718139648,
-    "y": 580.2889425754547,
-    "z": "7cf7d682.dbbec8",
+    "x": 1726.5862579345703,
+    "y": 635.0000557899475,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "8bdcf612.c4ddd8"
+        "47c3d65c.233b78"
       ]
     ]
   },
   {
-    "id": "3149ec04.0b57f4",
+    "id": "729993a3.c5fcac",
     "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": 1756.0346298217773,
-    "y": 619.1778280735016,
-    "z": "7cf7d682.dbbec8",
+    "x": 1731.0307159423828,
+    "y": 673.8889412879944,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "3417d7e.4ccb528"
+        "c3fc1f87.71129"
       ]
     ]
   },
   {
-    "id": "c9908bde.d3d748",
+    "id": "4515fd29.b598c4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1943.0346908569336,
-    "y": 533.9556286334991,
-    "z": "7cf7d682.dbbec8",
+    "x": 1918.030776977539,
+    "y": 588.666741847992,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "39defa6f.d38fd6"
+        "48e66b6b.492674"
       ]
     ]
   },
   {
-    "id": "8bdcf612.c4ddd8",
+    "id": "47c3d65c.233b78",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1938.5901718139648,
-    "y": 576.2889425754547,
-    "z": "7cf7d682.dbbec8",
+    "x": 1913.5862579345703,
+    "y": 631.0000557899475,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "f50e4f7e.4a67d"
+        "d6533a63.6dbd38"
       ]
     ]
   },
   {
-    "id": "3417d7e.4ccb528",
+    "id": "c3fc1f87.71129",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1943.0346298217773,
-    "y": 615.1778280735016,
-    "z": "7cf7d682.dbbec8",
+    "x": 1918.0307159423828,
+    "y": 669.8889412879944,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "53d7cb35.9e4a94"
+        "7c60d7e3.12f4c8"
       ]
     ]
   },
   {
-    "id": "39defa6f.d38fd6",
+    "id": "48e66b6b.492674",
     "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": 2126.257049560547,
-    "y": 533.0668127536774,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2101.2531356811523,
+    "y": 587.7779259681702,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "f50e4f7e.4a67d",
+    "id": "d6533a63.6dbd38",
     "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": 2115.1460876464844,
-    "y": 574.2994191646576,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2090.14217376709,
+    "y": 629.0105323791504,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "53d7cb35.9e4a94",
+    "id": "7c60d7e3.12f4c8",
     "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": 2125.0350036621094,
-    "y": 613.1882755756378,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2100.031089782715,
+    "y": 667.8993887901306,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "1e784180.8a488f",
+    "id": "14dc371b.e7d799",
     "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": 1756.8493881225586,
-    "y": 665.8444716930389,
-    "z": "7cf7d682.dbbec8",
+    "x": 1731.845474243164,
+    "y": 720.5555849075317,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "76b87020.8228"
+        "d1fbb326.d667a"
       ]
     ]
   },
   {
-    "id": "76b87020.8228",
+    "id": "d1fbb326.d667a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1943.8493881225586,
-    "y": 661.8444716930389,
-    "z": "7cf7d682.dbbec8",
+    "x": 1918.845474243164,
+    "y": 716.5555849075317,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "c5389f2b.e694e"
+        "aecd373e.842bf8"
       ]
     ]
   },
   {
-    "id": "ca14452f.51d7b8",
+    "id": "b6721dfb.b1a0a",
     "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": 1753.6271591186523,
-    "y": 708.2889482975006,
-    "z": "7cf7d682.dbbec8",
+    "x": 1728.6232452392578,
+    "y": 763.0000615119934,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "f814a8ba.16d968"
+        "3439641.1ff369c"
       ]
     ]
   },
   {
-    "id": "f814a8ba.16d968",
+    "id": "3439641.1ff369c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1940.6271591186523,
-    "y": 704.2889482975006,
-    "z": "7cf7d682.dbbec8",
+    "x": 1915.6232452392578,
+    "y": 759.0000615119934,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "ae0c0f38.c407d"
+        "668b4d7f.54d754"
       ]
     ]
   },
   {
-    "id": "c5389f2b.e694e",
+    "id": "aecd373e.842bf8",
     "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": 2115.8497009277344,
-    "y": 660.5216057300568,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2090.84578704834,
+    "y": 715.2327189445496,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "ae0c0f38.c407d",
+    "id": "668b4d7f.54d754",
     "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": 2106.2938537597656,
-    "y": 703.2993776798248,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2081.289939880371,
+    "y": 758.0104908943176,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "600f2d8b.ac1e64",
+    "id": "a5bddbeb.2c8598",
     "type": "switchNode",
-    "name": "switch EIR",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'EIR'`\">\n",
+    "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": 1719.5350341796875,
-    "y": 301.4312422275543,
-    "z": "7cf7d682.dbbec8",
+    "x": 1694.531120300293,
+    "y": 356.1423554420471,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "39a162af.cbdf4e"
+        "b200bce6.41ba6"
       ]
     ]
   },
   {
-    "id": "39a162af.cbdf4e",
+    "id": "b200bce6.41ba6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1921.5349960327148,
-    "y": 296.43126225471497,
-    "z": "7cf7d682.dbbec8",
+    "x": 1896.5310821533203,
+    "y": 351.14237546920776,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "5150b53b.34980c"
+        "179fefa2.e4ec6"
       ]
     ]
   },
   {
-    "id": "5150b53b.34980c",
+    "id": "179fefa2.e4ec6",
     "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": 2077.8684997558594,
-    "y": 295.8923981189728,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2052.864585876465,
+    "y": 350.6035113334656,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "f8776a5f.dd77d8",
+    "id": "9f8ad772.f86798",
     "type": "switchNode",
-    "name": "switch CBS",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CBS'`\">\n",
+    "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": 1719.5350341796875,
-    "y": 350.4312422275543,
-    "z": "7cf7d682.dbbec8",
+    "x": 1694.531120300293,
+    "y": 405.1423554420471,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "52870b8e.6e27b4"
+        "9fcff056.2543f"
       ]
     ]
   },
   {
-    "id": "52870b8e.6e27b4",
+    "id": "9fcff056.2543f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1918.5349960327148,
-    "y": 346.43124890327454,
-    "z": "7cf7d682.dbbec8",
+    "x": 1893.5310821533203,
+    "y": 401.14236211776733,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "1fed4c26.5b7f64"
+        "a1886f40.011c"
       ]
     ]
   },
   {
-    "id": "1fed4c26.5b7f64",
+    "id": "a1886f40.011c",
     "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": 2076.8685607910156,
-    "y": 344.89240860939026,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2051.864646911621,
+    "y": 399.60352182388306,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "6867734f.34178c",
+    "id": "6553f7b8.604f48",
     "type": "switchNode",
-    "name": "switch PBS",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'PBS'`\">\n",
+    "name": "switch ebs",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ebs'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1719.5350341796875,
-    "y": 395.4312422275543,
-    "z": "7cf7d682.dbbec8",
+    "x": 1694.531120300293,
+    "y": 450.1423554420471,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "dc43d92a.b102c8"
+        "4251079.c8008f8"
       ]
     ]
   },
   {
-    "id": "dc43d92a.b102c8",
+    "id": "4251079.c8008f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1918.5349960327148,
-    "y": 388.43124985694885,
-    "z": "7cf7d682.dbbec8",
+    "x": 1893.5310821533203,
+    "y": 443.14236307144165,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "a31e90a2.55db7"
+        "d1fd139b.e3892"
       ]
     ]
   },
   {
-    "id": "a31e90a2.55db7",
+    "id": "d1fd139b.e3892",
     "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",
+    "name": "set ebs",
+    "xml": "<set>\n<parameter name='prop.sotn.ebs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2079.8685607910156,
-    "y": 389.89240860939026,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2054.864646911621,
+    "y": 444.60352182388306,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "e09fe051.1cbb8",
+    "id": "ccf147e.f3f84b8",
     "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",
+    "name": "switch colorAware",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'colorAware'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1741.5351181030273,
-    "y": 442.431259393692,
-    "z": "7cf7d682.dbbec8",
+    "x": 1716.5312042236328,
+    "y": 497.1423726081848,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "6b010031.f7dc"
+        "b84d7f0e.a9757"
       ]
     ]
   },
   {
-    "id": "6b010031.f7dc",
+    "id": "b84d7f0e.a9757",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1919.5351219177246,
-    "y": 436.4312517642975,
-    "z": "7cf7d682.dbbec8",
+    "x": 1894.53120803833,
+    "y": 491.1423649787903,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "f64a6ad7.75c698"
+        "72e50f94.71d84"
       ]
     ]
   },
   {
-    "id": "f64a6ad7.75c698",
+    "id": "72e50f94.71d84",
     "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": 2100.8684997558594,
-    "y": 435.8924105167389,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2075.864585876465,
+    "y": 490.6035237312317,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "1d14a0da.1e8adf",
+    "id": "ca42d623.87ba58",
     "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",
+    "name": "switch couplingFlag",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'couplingFlag'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1741.5351257324219,
-    "y": 488.43128418922424,
-    "z": "7cf7d682.dbbec8",
+    "x": 1716.5312118530273,
+    "y": 543.142397403717,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "465a723d.71bccc"
+        "40eab97.899c148"
       ]
     ]
   },
   {
-    "id": "465a723d.71bccc",
+    "id": "40eab97.899c148",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1919.5351181030273,
-    "y": 480.4312527179718,
-    "z": "7cf7d682.dbbec8",
+    "x": 1894.5312042236328,
+    "y": 535.1423659324646,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "abc827cf.8d31c8"
+        "af755d0d.ba992"
       ]
     ]
   },
   {
-    "id": "abc827cf.8d31c8",
+    "id": "af755d0d.ba992",
     "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": 2104.8684997558594,
-    "y": 480.8924353122711,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
-  },
-  {
-    "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": 1732.5350646972656,
-    "y": 753.4312918186188,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      [
-        "cbfe2ddc.e03c2"
-      ]
-    ]
-  },
-  {
-    "id": "cbfe2ddc.e03c2",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1937.5350341796875,
-    "y": 754.4312422275543,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      [
-        "57793550.48202c"
-      ]
-    ]
-  },
-  {
-    "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": 2091.201873779297,
-    "y": 753.4417135715485,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2079.864585876465,
+    "y": 535.6035485267639,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "5bd71de4.186664",
+    "id": "e55153cb.9f1cd",
     "type": "comment",
     "name": "TODO: Recheck AAI schemas",
     "info": "",
     "comments": "",
-    "x": 786.0351867675781,
-    "y": 84.43131852149963,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 761.0312728881836,
+    "y": 139.14243173599243,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   }
-]
+]
\ No newline at end of file