connectivity attachment issue fix

Test issues fixed

Change-Id: I991876c6176c5fa05682e635b9c1e29eb5b08d54
Issue-ID: SDNC-356
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

Former-commit-id: e89a860588e3a094d5cc251dd6992373c2f36ab7

1 files changed, 339 insertions, 369 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-connection-attachment-input.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-connection-attachment-input.json
index fa77c6f0..4f6b2fd5 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-connection-attachment-input.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-connection-attachment-input.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "193b8ebe.168931",
+    "id": "d55e5da1.6e0d9",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 133.03125,
-    "y": 58.03125,
-    "z": "548da231.570f2c",
+    "x": 120.00390625,
+    "y": 81.00390625,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "516b96b5.f39508"
+        "30ea7403.a4dabc"
       ]
     ]
   },
   {
-    "id": "516b96b5.f39508",
+    "id": "30ea7403.a4dabc",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,972 +22,942 @@
     "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": 262.3169708251953,
-    "y": 153.26932334899902,
-    "z": "548da231.570f2c",
+    "x": 249.2896270751953,
+    "y": 176.24197959899902,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "d1fe8042.cc5a4"
+        "8e089853.9ab118"
       ]
     ]
   },
   {
-    "id": "d1fe8042.cc5a4",
+    "id": "8e089853.9ab118",
     "type": "method",
     "name": "method validate-connection-attachment-input",
     "xml": "<method rpc='validate-connection-attachment-input' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 258.94793701171875,
-    "y": 249.28427839279175,
-    "z": "548da231.570f2c",
+    "x": 245.92059326171875,
+    "y": 272.25693464279175,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "b05ac558.fc0298"
+        "592d05ce.3188dc"
       ]
     ]
   },
   {
-    "id": "b05ac558.fc0298",
+    "id": "592d05ce.3188dc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 265.94799041748047,
-    "y": 367.28428649902344,
-    "z": "548da231.570f2c",
+    "x": 252.92064666748047,
+    "y": 390.25694274902344,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "11b2d666.19a8fa",
-        "a0f1dfee.c1db9",
-        "57efdb7e.7de474",
-        "e66639cf.56aa48"
+        "53e1d116.7a486",
+        "e5f15950.d2b488",
+        "f3bdd2ba.fa4b4",
+        "19ed1ade.774285"
       ]
     ]
   },
   {
-    "id": "11b2d666.19a8fa",
+    "id": "53e1d116.7a486",
     "type": "switchNode",
     "name": "switch  svc-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 671.9479293823242,
-    "y": 24.28428077697754,
-    "z": "548da231.570f2c",
+    "x": 680.9205856323242,
+    "y": 138.25693607330322,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "563fe857.005428"
+        "e201ddb1.b905"
       ]
     ]
   },
   {
-    "id": "563fe857.005428",
+    "id": "e201ddb1.b905",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 883.6623001098633,
-    "y": 24.28429126739502,
-    "z": "548da231.570f2c",
+    "x": 890.6349487304688,
+    "y": 137.25694751739502,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "bf9c002.703e6"
+        "2d1ab943.03f3d6"
       ]
     ]
   },
   {
-    "id": "bf9c002.703e6",
+    "id": "2d1ab943.03f3d6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-request-id is a required input\" />\n",
     "comments": "",
-    "x": 1058.0908508300781,
-    "y": 23.28428363800049,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1065.0634994506836,
+    "y": 136.2569398880005,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "a0f1dfee.c1db9",
+    "id": "e5f15950.d2b488",
     "type": "switchNode",
     "name": "switch svc-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 656.9478225708008,
-    "y": 366.2843084335327,
-    "z": "548da231.570f2c",
+    "x": 464.92047119140625,
+    "y": 389.2569742202759,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "6b1eefd1.a4726",
-        "517bdb12.579b84",
-        "352e24a0.788a7c",
-        "92374a0f.2f7d98",
-        "eb87ceea.db236"
+        "4fc16b2d.fa1904",
+        "2374157d.59a87a",
+        "1cb25e54.ccc152",
+        "8cd348c0.4aba88",
+        "7e69dc53.dacb04"
       ]
     ]
   },
   {
-    "id": "6b1eefd1.a4726",
+    "id": "4fc16b2d.fa1904",
     "type": "outcome",
     "name": "create",
     "xml": "<outcome value='create'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 882.4479789733887,
-    "y": 194.28435230255127,
-    "z": "548da231.570f2c",
+    "x": 646.4206275939941,
+    "y": 300.25702476501465,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "2f04939.a9b436c"
+        "62f2f74b.222b28"
       ]
     ]
   },
   {
-    "id": "517bdb12.579b84",
+    "id": "2374157d.59a87a",
     "type": "outcome",
     "name": "delete",
     "xml": "<outcome value='delete'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 884.4599838256836,
-    "y": 772.1745042800903,
-    "z": "548da231.570f2c",
+    "x": 651.4328269958496,
+    "y": 582.1471920013428,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "c9b924ac.aa4418"
+        "bf7c4189.d4114"
       ]
     ]
   },
   {
-    "id": "352e24a0.788a7c",
+    "id": "1cb25e54.ccc152",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 885.2218246459961,
-    "y": 958.6029243469238,
-    "z": "548da231.570f2c",
+    "x": 648.1945915222168,
+    "y": 654.5756464004517,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "313b0ba4.9277b4"
+        "14bee845.382418"
       ]
     ]
   },
   {
-    "id": "313b0ba4.9277b4",
+    "id": "14bee845.382418",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
     "comments": "",
-    "x": 1068.793357849121,
-    "y": 959.2220649719238,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 831.7661247253418,
+    "y": 655.1947870254517,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "c9b924ac.aa4418",
+    "id": "bf7c4189.d4114",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1066.6028099060059,
-    "y": 772.8409547805786,
-    "z": "548da231.570f2c",
+    "x": 833.5756530761719,
+    "y": 582.813642501831,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "21ee0580.01132a"
+        "93839262.d70fa"
       ]
     ]
   },
   {
-    "id": "72eb1342.c73a6c",
+    "id": "11d0fd2e.8d1473",
     "type": "other",
     "name": "DeleteSOTNAttachmentInstance",
     "xml": "<outcome value='DeleteSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1380.3171997070312,
-    "y": 786.8409357070923,
-    "z": "548da231.570f2c",
+    "x": 1298.2901344299316,
+    "y": 551.8136596679688,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "a0b8065a.68d4e8"
+        "bede7ad6.c52858"
       ]
     ]
   },
   {
-    "id": "77510c5b.922da4",
+    "id": "25e7d254.79a53e",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1313.3174514770508,
-    "y": 875.8410797119141,
-    "z": "548da231.570f2c",
+    "x": 1220.2902450561523,
+    "y": 601.8138084411621,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "69dd5310.b0e50c"
+        "58f1ca81.4b3774"
       ]
     ]
   },
   {
-    "id": "69dd5310.b0e50c",
+    "id": "58f1ca81.4b3774",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete\" />\n",
     "comments": "",
-    "x": 1500.3174514770508,
-    "y": 876.8410797119141,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1407.2902450561523,
+    "y": 602.8138084411621,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "a0b8065a.68d4e8",
+    "id": "bede7ad6.c52858",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1743.3170852661133,
-    "y": 500.84095668792725,
-    "z": "548da231.570f2c",
+    "x": 1561.2900390625,
+    "y": 440.8136692047119,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "6c6e8419.13924c",
-        "d81b196b.de9bf8"
+        "9003dc0.c133528",
+        "eba16a4b.e63458"
       ]
     ]
   },
   {
-    "id": "6c6e8419.13924c",
+    "id": "9003dc0.c133528",
     "type": "switchNode",
     "name": "switch allotted-resource-id",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1994.3169059753418,
-    "y": 536.8409214019775,
-    "z": "548da231.570f2c",
+    "x": 1784.2896137237549,
+    "y": 439.8135929107666,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "3455ba94.f30a46"
+        "ce15a307.ea6db"
       ]
     ]
   },
   {
-    "id": "3455ba94.f30a46",
+    "id": "ce15a307.ea6db",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 2005.3169212341309,
-    "y": 625.8409004211426,
-    "z": "548da231.570f2c",
+    "x": 1964.2896766662598,
+    "y": 438.81360816955566,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "42c69ed2.4c6e3"
+        "d45df1e5.8c102"
       ]
     ]
   },
   {
-    "id": "42c69ed2.4c6e3",
+    "id": "d45df1e5.8c102",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"network-request-input.network-input-parameters.name is a required input\" />\n",
     "comments": "",
-    "x": 2161.745632171631,
-    "y": 624.8409004211426,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1996.7183303833008,
+    "y": 494.81362438201904,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "d81b196b.de9bf8",
+    "id": "eba16a4b.e63458",
     "type": "execute",
     "name": "execute requiredParameter",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id\" value=\"$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1997.0313415527344,
-    "y": 464.98375606536865,
-    "z": "548da231.570f2c",
+    "x": 1788.004093170166,
+    "y": 401.9564437866211,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
-      [
-
-      ]
+      []
     ]
   },
   {
-    "id": "57efdb7e.7de474",
+    "id": "f3bdd2ba.fa4b4",
     "type": "switchNode",
     "name": "switch service-instance-id",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.service-information.service-instance-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 697.0312728881836,
-    "y": 67.99399757385254,
-    "z": "548da231.570f2c",
+    "x": 704.0039215087891,
+    "y": 180.96665382385254,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "85a4ddfa.563bf"
+        "840d370d.dae7a8"
       ]
     ]
   },
   {
-    "id": "85a4ddfa.563bf",
+    "id": "840d370d.dae7a8",
     "type": "other",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 913.4598617553711,
-    "y": 68.99399757385254,
-    "z": "548da231.570f2c",
+    "x": 920.4325103759766,
+    "y": 181.96665382385254,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "e5b10c87.6dcab"
+        "78d3f021.91704"
       ]
     ]
   },
   {
-    "id": "e5b10c87.6dcab",
+    "id": "78d3f021.91704",
     "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=\"service-information.service-instance-id is a required input\" />\n",
     "comments": "",
-    "x": 1071.8883895874023,
-    "y": 67.99399757385254,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1078.8610382080078,
+    "y": 180.96665382385254,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "2f04939.a9b436c",
+    "id": "62f2f74b.222b28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1047.253620147705,
-    "y": 191.9940309524536,
-    "z": "548da231.570f2c",
+    "x": 811.2262687683105,
+    "y": 297.966703414917,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "99cb6d0f.faec9"
+        "b9263adf.a79a98"
       ]
     ]
   },
   {
-    "id": "99cb6d0f.faec9",
+    "id": "b9263adf.a79a98",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1142.4890975952148,
-    "y": 255.4991979598999,
-    "z": "548da231.570f2c",
+    "x": 1001.4617919921875,
+    "y": 299.4719018936157,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "12b9b32c.a4b30d",
-        "46ff1495.b090cc"
+        "daaeed0a.68f55",
+        "32fc1c5a.a1c7a4"
       ]
     ]
   },
   {
-    "id": "12b9b32c.a4b30d",
+    "id": "daaeed0a.68f55",
     "type": "outcome",
     "name": "CreateSOTNAttachmentInstance",
     "xml": "<outcome value='CreateSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1397.8223190307617,
-    "y": 138.49896335601807,
-    "z": "548da231.570f2c",
+    "x": 1282.7950744628906,
+    "y": 278.47163105010986,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "a1752dfc.73195"
+        "1d50a6f4.652229"
       ]
     ]
   },
   {
-    "id": "46ff1495.b090cc",
+    "id": "32fc1c5a.a1c7a4",
     "type": "outcome",
     "name": "other",
     "xml": "<outcome value='other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1330.8223152160645,
-    "y": 284.1656885147095,
-    "z": "548da231.570f2c",
+    "x": 1201.7950973510742,
+    "y": 326.1383662223816,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "67468b53.41b5e4"
+        "ab38e26c.3455"
       ]
     ]
   },
   {
-    "id": "67468b53.41b5e4",
+    "id": "ab38e26c.3455",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.request-action is invalid\" />\n",
     "comments": "",
-    "x": 1529.3781509399414,
-    "y": 283.61034536361694,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1400.3509330749512,
+    "y": 325.58302307128906,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "a1752dfc.73195",
+    "id": "1d50a6f4.652229",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1653.6977615356445,
-    "y": 136.88288116455078,
-    "z": "548da231.570f2c",
+    "x": 1514.6704368591309,
+    "y": 280.85553073883057,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "db455346.fe8d9"
+        "15baa2b8.a5423d"
       ]
     ]
   },
   {
-    "id": "db455346.fe8d9",
+    "id": "15baa2b8.a5423d",
     "type": "for",
     "name": "for loop i - Sotn input param",
     "xml": "<for index=\"i\" start=\"0\" end=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.param_length`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1735.3287467956543,
-    "y": 197.18352508544922,
-    "z": "548da231.570f2c",
+    "x": 1720.3014526367188,
+    "y": 276.15617847442627,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "250dfbd6.f87e24"
+        "1411c83d.30f948"
       ]
     ]
   },
   {
-    "id": "250dfbd6.f87e24",
+    "id": "1411c83d.30f948",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1929.4120750427246,
-    "y": 161.93047618865967,
-    "z": "548da231.570f2c",
+    "x": 1882.384853363037,
+    "y": 233.90312957763672,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "6411a252.efa3dc",
-        "bd70a50a.f57aa8",
-        "bce7ba47.627aa8"
+        "8cd60ce0.f328b",
+        "7c6899b1.f878f8",
+        "a0ef1495.11fa68"
       ]
     ]
   },
   {
-    "id": "6411a252.efa3dc",
+    "id": "8cd60ce0.f328b",
     "type": "set",
     "name": "clear tmp-data",
     "xml": "<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",
     "comments": "",
-    "x": 2121.412136077881,
-    "y": 116.16857433319092,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 2041.3849601745605,
+    "y": 188.14123916625977,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "bd70a50a.f57aa8",
+    "id": "7c6899b1.f878f8",
     "type": "set",
     "name": "set tmp-data",
     "xml": "<set>\n<parameter name='tmp.name' value=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.param[$i].name`\"/>\n<parameter name='tmp.value' value=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.param[$i].value`\"/>\n",
     "comments": "",
-    "x": 2110.4121322631836,
-    "y": 193.16857862472534,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 2039.3848342895508,
+    "y": 220.14124202728271,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "bce7ba47.627aa8",
+    "id": "a0ef1495.11fa68",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$tmp.name`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2110.4122161865234,
-    "y": 275.16857862472534,
-    "z": "548da231.570f2c",
+    "x": 2036.3849563598633,
+    "y": 260.1412477493286,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "9a3c6ac9.101328",
-        "b44b4e5e.93a68",
-        "c46018d4.cde2f8",
-        "bf279f01.56146",
-        "2718b920.5086d6",
-        "9dec1793.d77e58",
-        "6b903ba1.e89184",
-        "9610c6b4.d4b598"
+        "58732708.c19e68",
+        "2b1a4a1c.736d86",
+        "ac680bd3.a5c298",
+        "38c84211.606bbe",
+        "668e89b6.3edf98",
+        "eee3ac82.081b3",
+        "232cba3c.20f5a6",
+        "553b7c39.9758e4"
       ]
     ]
   },
   {
-    "id": "9a3c6ac9.101328",
+    "id": "58732708.c19e68",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 2312.4763164520264,
-    "y": 618.9942054748535,
-    "z": "548da231.570f2c",
+    "x": 2243.449363708496,
+    "y": 397.96692180633545,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "75de126c.4ad7cc"
+        "9929f9d1.8bdb78"
       ]
     ]
   },
   {
-    "id": "75de126c.4ad7cc",
+    "id": "9929f9d1.8bdb78",
     "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-input-parameters.param[' + $i + ']' + '.name is a required input'`\" />\n",
     "comments": "",
-    "x": 2487.476665496826,
-    "y": 614.9942588806152,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 2395.4495735168457,
+    "y": 392.9669542312622,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "21ee0580.01132a",
+    "id": "93839262.d70fa",
     "type": "switchNode",
     "name": "switch request-action",
-    "xml": "<switch test='`$sotn-topology-operation-input.request-information.request-action`'>\n",
+    "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1088.6980628967285,
-    "y": 851.994065284729,
-    "z": "548da231.570f2c",
+    "x": 1031.6709442138672,
+    "y": 584.966794013977,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "72eb1342.c73a6c",
-        "77510c5b.922da4"
+        "11d0fd2e.8d1473",
+        "25e7d254.79a53e"
       ]
     ]
   },
   {
-    "id": "b44b4e5e.93a68",
+    "id": "2b1a4a1c.736d86",
     "type": "other",
     "name": "sotnVpnName",
     "xml": "<outcome value='sotnVpnName'>",
     "comments": "",
     "outputs": 1,
-    "x": 2327.4757356643677,
-    "y": 144.19395065307617,
-    "z": "548da231.570f2c",
+    "x": 2263.44863986969,
+    "y": 142.1666374206543,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "b99955f0.4e5fc8"
+        "938831fe.ccb6b"
       ]
     ]
   },
   {
-    "id": "b99955f0.4e5fc8",
+    "id": "938831fe.ccb6b",
     "type": "switchNode",
     "name": "switch value",
     "xml": "<switch test=\"`$tmp.value`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2558.3922157287598,
-    "y": 333.20887565612793,
-    "z": "548da231.570f2c",
+    "x": 2526.3655128479004,
+    "y": 257.18157863616943,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "79ab6adb.1f2014"
+        "bbabb9a8.e7fa88"
       ]
     ]
   },
   {
-    "id": "79ab6adb.1f2014",
+    "id": "bbabb9a8.e7fa88",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 2742.3921394348145,
-    "y": 329.208890914917,
-    "z": "548da231.570f2c",
+    "x": 2664.3654823303223,
+    "y": 252.18159866333008,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "cf098d97.55fb"
+        "7d365ba9.43c364"
       ]
     ]
   },
   {
-    "id": "cf098d97.55fb",
+    "id": "7d365ba9.43c364",
     "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=\"`'$tmp.name +' is a required input'`\" />\n",
     "comments": "",
-    "x": 2750.821060180664,
-    "y": 403.2088851928711,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 2786.7941932678223,
+    "y": 289.1815767288208,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "c46018d4.cde2f8",
+    "id": "ac680bd3.a5c298",
     "type": "other",
     "name": "clientSignal",
     "xml": "<outcome value='clientSignal'>",
     "comments": "",
     "outputs": 1,
-    "x": 2333.475742340088,
-    "y": 213.19396114349365,
-    "z": "548da231.570f2c",
+    "x": 2256.4488105773926,
+    "y": 179.16665935516357,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "b99955f0.4e5fc8"
+        "938831fe.ccb6b"
       ]
     ]
   },
   {
-    "id": "bf279f01.56146",
+    "id": "38c84211.606bbe",
     "type": "other",
     "name": "access-provider-id",
     "xml": "<outcome value='access-provider-id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2335.3646812438965,
-    "y": 289.1939239501953,
-    "z": "548da231.570f2c",
+    "x": 2276.3377571105957,
+    "y": 215.16660690307617,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "b99955f0.4e5fc8"
+        "938831fe.ccb6b"
       ]
     ]
   },
   {
-    "id": "2718b920.5086d6",
+    "id": "668e89b6.3edf98",
     "type": "other",
     "name": "access-client-id",
     "xml": "<outcome value='access-client-id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2332.3646812438965,
-    "y": 361.19392371177673,
-    "z": "548da231.570f2c",
+    "x": 2265.337661743164,
+    "y": 254.16663455963135,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "b99955f0.4e5fc8"
+        "938831fe.ccb6b"
       ]
     ]
   },
   {
-    "id": "9dec1793.d77e58",
+    "id": "eee3ac82.081b3",
     "type": "other",
     "name": "access-topology-id",
     "xml": "<outcome value='access-topology-id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2336.3646812438965,
-    "y": 423.1939239501953,
-    "z": "548da231.570f2c",
+    "x": 2274.3377532958984,
+    "y": 289.16660594940186,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
-      [
-
-      ]
+      []
     ]
   },
   {
-    "id": "6b903ba1.e89184",
+    "id": "232cba3c.20f5a6",
     "type": "other",
     "name": "access-node-id",
     "xml": "<outcome value='access-node-id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2338.3648529052734,
-    "y": 488.19395637512207,
-    "z": "548da231.570f2c",
+    "x": 2265.3377571105957,
+    "y": 325.1666440963745,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "b99955f0.4e5fc8"
+        "938831fe.ccb6b"
       ]
     ]
   },
   {
-    "id": "9610c6b4.d4b598",
+    "id": "553b7c39.9758e4",
     "type": "other",
     "name": "cVLAN",
     "xml": "<outcome value='cVLAN'>",
     "comments": "",
     "outputs": 1,
-    "x": 2316.3651542663574,
-    "y": 552.7496566772461,
-    "z": "548da231.570f2c",
+    "x": 2240.338275909424,
+    "y": 360.72238540649414,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "b99955f0.4e5fc8"
+        "938831fe.ccb6b"
       ]
     ]
   },
   {
-    "id": "92374a0f.2f7d98",
+    "id": "8cd348c0.4aba88",
     "type": "outcome",
     "name": "activate",
     "xml": "<outcome value='activate'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 883.5312347412109,
-    "y": 364.53126430511475,
-    "z": "548da231.570f2c",
+    "x": 646.5038909912109,
+    "y": 387.5039529800415,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "40ca4bfa.dde754"
+        "55079242.de61dc"
       ]
     ]
   },
   {
-    "id": "40ca4bfa.dde754",
+    "id": "55079242.de61dc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1064.3369064331055,
-    "y": 365.24098110198975,
-    "z": "548da231.570f2c",
+    "x": 827.3095626831055,
+    "y": 388.2136697769165,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "38d46ef5.2515a2"
+        "4e961c0d.873094"
       ]
     ]
   },
   {
-    "id": "38d46ef5.2515a2",
+    "id": "4e961c0d.873094",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1137.5723876953125,
-    "y": 445.74612522125244,
-    "z": "548da231.570f2c",
+    "x": 1015.5450439453125,
+    "y": 389.7188367843628,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "bc03657f.d968f8",
-        "c7a46845.a20028"
+        "5f2b72b3.993c4c",
+        "80608f20.06ea9"
       ]
     ]
   },
   {
-    "id": "bc03657f.d968f8",
+    "id": "5f2b72b3.993c4c",
     "type": "outcome",
     "name": "ActivateSOTNAttachmentInstance",
     "xml": "<outcome value='ActivateSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1393.9055290222168,
-    "y": 375.7458610534668,
-    "z": "548da231.570f2c",
+    "x": 1284.8783226013184,
+    "y": 363.71854877471924,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "a0b8065a.68d4e8"
+        "bede7ad6.c52858"
       ]
     ]
   },
   {
-    "id": "c7a46845.a20028",
+    "id": "80608f20.06ea9",
     "type": "outcome",
     "name": "other",
     "xml": "<outcome value='other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1310.905445098877,
-    "y": 484.41266107559204,
-    "z": "548da231.570f2c",
+    "x": 1200.8781394958496,
+    "y": 413.3853511810303,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "62ba5aa1.e5bf54"
+        "cc018098.4c869"
       ]
     ]
   },
   {
-    "id": "62ba5aa1.e5bf54",
+    "id": "cc018098.4c869",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.request-action is invalid\" />\n",
     "comments": "",
-    "x": 1509.461280822754,
-    "y": 483.8573179244995,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1340.434097290039,
+    "y": 416.8300075531006,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "eb87ceea.db236",
+    "id": "7e69dc53.dacb04",
     "type": "outcome",
     "name": "deactivate",
     "xml": "<outcome value='deactivate'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 881.5311889648438,
-    "y": 584.53125,
-    "z": "548da231.570f2c",
+    "x": 659.5039253234863,
+    "y": 487.5039005279541,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "10580d5c.7277e3"
+        "5e98d5e.da18e2c"
       ]
     ]
   },
   {
-    "id": "10580d5c.7277e3",
+    "id": "5e98d5e.da18e2c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1063.674015045166,
-    "y": 585.1977005004883,
-    "z": "548da231.570f2c",
+    "x": 841.6467514038086,
+    "y": 488.1703510284424,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "97009550.34e988"
+        "e876eace.fbc408"
       ]
     ]
   },
   {
-    "id": "a7478b0d.ac1368",
+    "id": "674c6e42.5758f",
     "type": "other",
     "name": "DeactivateSOTNAttachmentInstance",
     "xml": "<outcome value='DeactivateSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1377.3884048461914,
-    "y": 599.197681427002,
-    "z": "548da231.570f2c",
+    "x": 1303.3611869812012,
+    "y": 459.1703567504883,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "a0b8065a.68d4e8"
+        "bede7ad6.c52858"
       ]
     ]
   },
   {
-    "id": "f5f85a41.420a68",
+    "id": "3d6789d5.968686",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1310.388656616211,
-    "y": 688.1978254318237,
-    "z": "548da231.570f2c",
+    "x": 1207.3614921569824,
+    "y": 508.17051124572754,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "e751aaad.be4338"
+        "7dd7d50b.2e0d4c"
       ]
     ]
   },
   {
-    "id": "e751aaad.be4338",
+    "id": "7dd7d50b.2e0d4c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete\" />\n",
     "comments": "",
-    "x": 1497.388656616211,
-    "y": 689.1978254318237,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1394.3614921569824,
+    "y": 509.17051124572754,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   },
   {
-    "id": "97009550.34e988",
+    "id": "e876eace.fbc408",
     "type": "switchNode",
     "name": "switch request-action",
-    "xml": "<switch test='`$sotn-topology-operation-input.request-information.request-action`'>\n",
+    "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1085.7692680358887,
-    "y": 664.3508110046387,
-    "z": "548da231.570f2c",
+    "x": 1028.7420654296875,
+    "y": 487.3234739303589,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "a7478b0d.ac1368",
-        "f5f85a41.420a68"
+        "674c6e42.5758f",
+        "3d6789d5.968686"
       ]
     ]
   },
   {
-    "id": "e66639cf.56aa48",
+    "id": "19ed1ade.774285",
     "type": "switchNode",
     "name": "switch parent-service-instance-id",
-    "xml": "<switch test='`$connection-attachment-topology-operation-input.service-information.parent-service-instance-id`'>\n",
+    "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 713.0103988647461,
-    "y": 114.01042175292969,
-    "z": "548da231.570f2c",
+    "x": 719.9830474853516,
+    "y": 226.9830780029297,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "2f054da9.55b662"
+        "6bc4dd76.e36a44"
       ]
     ]
   },
   {
-    "id": "2f054da9.55b662",
+    "id": "6bc4dd76.e36a44",
     "type": "other",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 919.43896484375,
-    "y": 118.01041412353516,
-    "z": "548da231.570f2c",
+    "x": 926.4116134643555,
+    "y": 230.98307037353516,
+    "z": "2bd9a7ae.9f12a8",
     "wires": [
       [
-        "271d7aba.ca1876"
+        "a93ef8b3.222ac8"
       ]
     ]
   },
   {
-    "id": "271d7aba.ca1876",
+    "id": "a93ef8b3.222ac8",
     "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=\"service-information.parent-service-instance-id is a required input\" />\n",
     "comments": "",
-    "x": 1077.8674926757812,
-    "y": 117.01041412353516,
-    "z": "548da231.570f2c",
-    "wires": [
-
-    ]
+    "x": 1084.8401412963867,
+    "y": 229.98307037353516,
+    "z": "2bd9a7ae.9f12a8",
+    "wires": []
   }
 ]
\ No newline at end of file