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, 186 insertions, 210 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_connection-attachment-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_connection-attachment-topology-operation.json
index 77d885af..7ec149ae 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_connection-attachment-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_connection-attachment-topology-operation.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "b2143086.a417",
+    "id": "7040c3da.af1dec",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 109.03125,
-    "y": 37.03125,
-    "z": "efb71132.eba6e",
+    "x": 110.00390625,
+    "y": 64.00390625,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "7e88a37a.69419c"
+        "2925fee5.4b2612"
       ]
     ]
   },
   {
-    "id": "7e88a37a.69419c",
+    "id": "2925fee5.4b2612",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,515 +22,491 @@
     "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": 247.03126525878906,
-    "y": 98.03124809265137,
-    "z": "efb71132.eba6e",
+    "x": 248.00392150878906,
+    "y": 125.00390434265137,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "90bc847a.1e90f8"
+        "b82edbfb.46a2a8"
       ]
     ]
   },
   {
-    "id": "90bc847a.1e90f8",
+    "id": "b82edbfb.46a2a8",
     "type": "method",
     "name": "connection-attachment-topology-operation",
     "xml": "<method rpc='connection-attachment-topology-operation' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 282.0312805175781,
-    "y": 146.03127670288086,
-    "z": "efb71132.eba6e",
+    "x": 283.0039367675781,
+    "y": 173.00393295288086,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "bf0dea50.c6f6f8"
+        "a9203dbc.c4a92"
       ]
     ]
   },
   {
-    "id": "bf0dea50.c6f6f8",
+    "id": "a9203dbc.c4a92",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 207.03125,
-    "y": 224.03124237060547,
-    "z": "efb71132.eba6e",
+    "x": 208.00390625,
+    "y": 251.00389862060547,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "4b652dbe.7deec4",
-        "976e09a7.a23c78",
-        "d692689.8b14098",
-        "f2e8c4be.f6edf8"
+        "d28295b8.2c2758",
+        "7f7eb3b.b67394c",
+        "779cd391.117a2c",
+        "3ccb66ff.5dacfa"
       ]
     ]
   },
   {
-    "id": "4b652dbe.7deec4",
+    "id": "d28295b8.2c2758",
     "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": 421.40042877197266,
-    "y": 836.8741173744202,
-    "z": "efb71132.eba6e",
-    "wires": [
-
-    ]
+    "x": 422.37308502197266,
+    "y": 863.8467736244202,
+    "z": "d74aac07.dc7e5",
+    "wires": []
   },
   {
-    "id": "976e09a7.a23c78",
+    "id": "7f7eb3b.b67394c",
     "type": "switchNode",
     "name": "switch svc-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 428.0311737060547,
-    "y": 383.44496059417725,
-    "z": "efb71132.eba6e",
+    "x": 429.0038299560547,
+    "y": 410.41761684417725,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "7df40438.8d552c",
-        "854b6002.a361e",
-        "d0a5f285.16e91",
-        "a7c210e.8aeb8f",
-        "d7a3669.7308f98"
+        "bb04a1a3.bc9cc",
+        "e1cc92c7.25fd7",
+        "cf940d5c.e7317",
+        "935024a.1180cd8",
+        "50ef3ecb.f8e1d"
       ]
     ]
   },
   {
-    "id": "d692689.8b14098",
+    "id": "779cd391.117a2c",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-connection-attachment-input",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-connection-attachment-input' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 619.6026916503906,
-    "y": 204.01640129089355,
-    "z": "efb71132.eba6e",
+    "x": 620.5753479003906,
+    "y": 230.98905754089355,
+    "z": "d74aac07.dc7e5",
     "wires": [
-      [
-
-      ]
+      []
     ]
   },
   {
-    "id": "7df40438.8d552c",
+    "id": "bb04a1a3.bc9cc",
     "type": "other",
     "name": "activate",
     "xml": "<outcome value='activate'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 643.3169174194336,
-    "y": 392.58784008026123,
-    "z": "efb71132.eba6e",
+    "x": 644.2895736694336,
+    "y": 419.56049633026123,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "c747bb59.396bf8"
+        "f86d00f8.fcf59"
       ]
     ]
   },
   {
-    "id": "854b6002.a361e",
+    "id": "e1cc92c7.25fd7",
     "type": "other",
-    "name": "deactivate",
-    "xml": "<outcome value='deactivate'>\n",
+    "name": "delete",
+    "xml": "<outcome value='delete'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 653.3169784545898,
-    "y": 673.5880031585693,
-    "z": "efb71132.eba6e",
+    "x": 654.2896347045898,
+    "y": 700.5606594085693,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "5f2c7e54.e5319"
+        "7a0372ab.33be4c"
       ]
     ]
   },
   {
-    "id": "d0a5f285.16e91",
+    "id": "cf940d5c.e7317",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 642.6502876281738,
-    "y": 758.9214267730713,
-    "z": "efb71132.eba6e",
+    "x": 643.6229438781738,
+    "y": 785.8940830230713,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "63b93e5c.700f6"
+        "903586f6.489208"
       ]
     ]
   },
   {
-    "id": "63b93e5c.700f6",
+    "id": "903586f6.489208",
     "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-action is invalid\" />\n",
     "comments": "",
-    "x": 824.6502838134766,
-    "y": 757.9214363098145,
-    "z": "efb71132.eba6e",
-    "wires": [
-
-    ]
+    "x": 825.6229400634766,
+    "y": 784.8940925598145,
+    "z": "d74aac07.dc7e5",
+    "wires": []
   },
   {
-    "id": "f2e8c4be.f6edf8",
+    "id": "3ccb66ff.5dacfa",
     "type": "set",
     "name": "Set final indicator to Y",
     "xml": "<set>\n<parameter name=\"ack-final\" value=\"Y\"/>",
     "comments": "",
-    "x": 440.4281234741211,
-    "y": 796.0324559211731,
-    "z": "efb71132.eba6e",
-    "wires": [
-
-    ]
+    "x": 441.4007797241211,
+    "y": 823.0051121711731,
+    "z": "d74aac07.dc7e5",
+    "wires": []
   },
   {
-    "id": "a7c210e.8aeb8f",
+    "id": "935024a.1180cd8",
     "type": "other",
     "name": "create",
     "xml": "<outcome value='create'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 642.5576133728027,
-    "y": 257.19257259368896,
-    "z": "efb71132.eba6e",
+    "x": 643.5302696228027,
+    "y": 284.16522884368896,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "8d1575e7.3d39d8"
+        "76e064e5.59ef8c"
       ]
     ]
   },
   {
-    "id": "d7a3669.7308f98",
+    "id": "50ef3ecb.f8e1d",
     "type": "other",
-    "name": "delete",
-    "xml": "<outcome value='delete'>\n",
+    "name": "deactivate",
+    "xml": "<outcome value='deactivate'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 647.8909645080566,
-    "y": 533.8593759536743,
-    "z": "efb71132.eba6e",
+    "x": 648.8636207580566,
+    "y": 560.8320322036743,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "347f7912.887506"
+        "c2dd69d2.09a368"
       ]
     ]
   },
   {
-    "id": "380d46d2.a08ada",
+    "id": "381cd5e6.60b05a",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-attachment-topology-operation-create",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-create' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1537.1175537109375,
-    "y": 208.57203483581543,
-    "z": "efb71132.eba6e",
+    "x": 1538.0902099609375,
+    "y": 235.54469108581543,
+    "z": "d74aac07.dc7e5",
     "wires": [
-      [
-
-      ]
+      []
     ]
   },
   {
-    "id": "8d1575e7.3d39d8",
+    "id": "76e064e5.59ef8c",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 833.5313034057617,
-    "y": 256.0312566757202,
-    "z": "efb71132.eba6e",
+    "x": 834.5039596557617,
+    "y": 283.0039129257202,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "b4498aac.7cb2b8",
-        "ed77a730.056558"
+        "73303973.3b9048",
+        "7c8a6efc.7a43c"
       ]
     ]
   },
   {
-    "id": "b4498aac.7cb2b8",
+    "id": "73303973.3b9048",
     "type": "outcome",
     "name": "CreateSOTNAttachmentInstance",
     "xml": "<outcome value='CreateSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1088.864517211914,
-    "y": 208.03106307983398,
-    "z": "efb71132.eba6e",
+    "x": 1089.837173461914,
+    "y": 235.00371932983398,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "380d46d2.a08ada"
+        "381cd5e6.60b05a"
       ]
     ]
   },
   {
-    "id": "ed77a730.056558",
+    "id": "7c8a6efc.7a43c",
     "type": "outcome",
     "name": "other",
     "xml": "<outcome value='other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1018.8646240234375,
-    "y": 299.69779205322266,
-    "z": "efb71132.eba6e",
+    "x": 1019.8372802734375,
+    "y": 326.67044830322266,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "1b79383c.71b538"
+        "2e04dda8.211e22"
       ]
     ]
   },
   {
-    "id": "1b79383c.71b538",
+    "id": "2e04dda8.211e22",
     "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=\"`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`\" />\n",
     "comments": "",
-    "x": 1184.5312881469727,
-    "y": 300.03125762939453,
-    "z": "efb71132.eba6e",
-    "wires": [
-
-    ]
+    "x": 1185.5039443969727,
+    "y": 327.00391387939453,
+    "z": "d74aac07.dc7e5",
+    "wires": []
   },
   {
-    "id": "b97ace55.086d3",
+    "id": "c3ec8e4c.42bba",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-attachment-topology-operation-activate",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-activate' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1546.5312957763672,
-    "y": 343.03125953674316,
-    "z": "efb71132.eba6e",
+    "x": 1547.5039520263672,
+    "y": 370.00391578674316,
+    "z": "d74aac07.dc7e5",
     "wires": [
-      [
-
-      ]
+      []
     ]
   },
   {
-    "id": "a6785aab.86f948",
+    "id": "e555e69b.d6dab8",
     "type": "outcome",
     "name": "ActivateSOTNAttachmentInstance",
     "xml": "<outcome value='ActivateSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1096.278335571289,
-    "y": 345.4902935028076,
-    "z": "efb71132.eba6e",
+    "x": 1097.250991821289,
+    "y": 372.4629497528076,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "b97ace55.086d3"
+        "c3ec8e4c.42bba"
       ]
     ]
   },
   {
-    "id": "d100865f.7e59f8",
+    "id": "5c941c7c.d135c4",
     "type": "outcome",
     "name": "other",
     "xml": "<outcome value='other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1026.2784423828125,
-    "y": 437.1570224761963,
-    "z": "efb71132.eba6e",
+    "x": 1027.2510986328125,
+    "y": 464.1296787261963,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "19062ead.ade691"
+        "b0deba38.7b5228"
       ]
     ]
   },
   {
-    "id": "bbd40a3d.52a218",
+    "id": "874a4de5.20f7a",
     "type": "outcome",
     "name": "DeactivateSOTNAttachmentInstance",
     "xml": "<outcome value='DeactivateSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1115.8645477294922,
-    "y": 484.0310802459717,
-    "z": "efb71132.eba6e",
+    "x": 1116.8372039794922,
+    "y": 511.0037364959717,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "cdb50b2f.8ff328"
+        "4329778c.cafb48"
       ]
     ]
   },
   {
-    "id": "6647d681.d75a78",
+    "id": "8f441f1b.ab4bb",
     "type": "outcome",
     "name": "other",
     "xml": "<outcome value='other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1030.8645706176758,
-    "y": 575.6977853775024,
-    "z": "efb71132.eba6e",
+    "x": 1031.8372268676758,
+    "y": 602.6704416275024,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "dab4a1b3.5c9b3"
+        "5242314d.7fd95"
       ]
     ]
   },
   {
-    "id": "cdb50b2f.8ff328",
+    "id": "4329778c.cafb48",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-attachment-topology-operation-deactivate",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-deactivate' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1574.5313720703125,
-    "y": 484.03126335144043,
-    "z": "efb71132.eba6e",
+    "x": 1575.5040283203125,
+    "y": 511.00391960144043,
+    "z": "d74aac07.dc7e5",
     "wires": [
-      [
-
-      ]
+      []
     ]
   },
   {
-    "id": "8c01d720.070a78",
+    "id": "18c3914d.1fd05f",
     "type": "outcome",
     "name": "DeleteSOTNAttachmentInstance",
     "xml": "<outcome value='DeleteSOTNAttachmentInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1104.8644638061523,
-    "y": 625.0310564041138,
-    "z": "efb71132.eba6e",
+    "x": 1105.8371200561523,
+    "y": 652.0037126541138,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "58c79286.6e607c"
+        "1d1f5f1c.4ba391"
       ]
     ]
   },
   {
-    "id": "aa83e7c.d9f1218",
+    "id": "a82f11b4.25a05",
     "type": "outcome",
     "name": "other",
     "xml": "<outcome value='other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1034.8645706176758,
-    "y": 716.6977853775024,
-    "z": "efb71132.eba6e",
+    "x": 1035.8372268676758,
+    "y": 743.6704416275024,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "4e0c491c.1e9da8"
+        "c42475bd.4b30d8"
       ]
     ]
   },
   {
-    "id": "58c79286.6e607c",
+    "id": "1d1f5f1c.4ba391",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:sotn-attachment-topology-operation-delete",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-attachment-topology-operation-delete' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1560.5313415527344,
-    "y": 626.0312671661377,
-    "z": "efb71132.eba6e",
+    "x": 1561.5039978027344,
+    "y": 653.0039234161377,
+    "z": "d74aac07.dc7e5",
     "wires": [
-      [
-
-      ]
+      []
     ]
   },
   {
-    "id": "c747bb59.396bf8",
+    "id": "f86d00f8.fcf59",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 831.0313110351562,
-    "y": 397.03126335144043,
-    "z": "efb71132.eba6e",
+    "x": 832.0039672851562,
+    "y": 424.00391960144043,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "a6785aab.86f948",
-        "d100865f.7e59f8"
+        "e555e69b.d6dab8",
+        "5c941c7c.d135c4"
       ]
     ]
   },
   {
-    "id": "347f7912.887506",
+    "id": "c2dd69d2.09a368",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 845.03125,
-    "y": 538.03125,
-    "z": "efb71132.eba6e",
+    "x": 846.00390625,
+    "y": 565.00390625,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "bbd40a3d.52a218",
-        "6647d681.d75a78"
+        "874a4de5.20f7a",
+        "8f441f1b.ab4bb"
       ]
     ]
   },
   {
-    "id": "5f2c7e54.e5319",
+    "id": "7a0372ab.33be4c",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$connection-attachment-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 848.03125,
-    "y": 673.03125,
-    "z": "efb71132.eba6e",
+    "x": 849.00390625,
+    "y": 700.00390625,
+    "z": "d74aac07.dc7e5",
     "wires": [
       [
-        "8c01d720.070a78",
-        "aa83e7c.d9f1218"
+        "18c3914d.1fd05f",
+        "a82f11b4.25a05"
       ]
     ]
   },
   {
-    "id": "19062ead.ade691",
+    "id": "b0deba38.7b5228",
     "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=\"`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`\" />\n",
     "comments": "",
-    "x": 1190.03125,
-    "y": 437.03125,
-    "z": "efb71132.eba6e",
-    "wires": [
-
-    ]
+    "x": 1191.00390625,
+    "y": 464.00390625,
+    "z": "d74aac07.dc7e5",
+    "wires": []
   },
   {
-    "id": "dab4a1b3.5c9b3",
+    "id": "5242314d.7fd95",
     "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=\"`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`\" />\n",
     "comments": "",
-    "x": 1198.03125,
-    "y": 577.03125,
-    "z": "efb71132.eba6e",
-    "wires": [
-
-    ]
+    "x": 1199.00390625,
+    "y": 604.00390625,
+    "z": "d74aac07.dc7e5",
+    "wires": []
   },
   {
-    "id": "4e0c491c.1e9da8",
+    "id": "c42475bd.4b30d8",
     "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=\"`'Provided request-action=' + $connection-attachment-topology-operation-input.request-information.request-action + ' is not supported.'`\" />\n",
     "comments": "",
-    "x": 1203.03125,
-    "y": 716.03125,
-    "z": "efb71132.eba6e",
-    "wires": [
-
-    ]
+    "x": 1204.00390625,
+    "y": 743.00390625,
+    "z": "d74aac07.dc7e5",
+    "wires": []
   }
-]
\ No newline at end of file
+]