feat(mojaloop/#3984): parameterize switch id (#149)

mojaloop · Jun 28, 2024 · c7e5bca · c7e5bca
1 parent 2c5a801
commit c7e5bca
Show file tree

Hide file tree

Showing 34 changed files with 188 additions and 186 deletions.
diff --git a/collections/hub/golden_path/api-tests/admin-api-tests/Admintests-20201221.json b/collections/hub/golden_path/api-tests/admin-api-tests/Admintests-20201221.json
@@ -85,10 +85,10 @@
             "type": "central_admin"
           },
           "operationPath": "/participants/{name}/accounts",
-          "path": "/participants/Hub/accounts",
+          "path": "/participants/{$inputs.HUB_NAME}/accounts",
           "method": "get",
           "params": {
-            "name": "Hub"
+            "name": "{$inputs.HUB_NAME}"
           },
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {

diff --git a/...date requests with an incorrect-non-existent FSP-ID in the FSPIOP-Destination header.json b/...date requests with an incorrect-non-existent FSP-ID in the FSPIOP-Destination header.json
@@ -290,7 +290,7 @@
                 "id": 14,
                 "description": "Payee Notification FSP Source is Switch",
                 "exec": [
-                  "// expect(environment.payeeCallbackNotification.headers['fspiop-source']).to.equal('switch')"
+                  "// expect(environment.payeeCallbackNotification.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {
@@ -656,7 +656,7 @@
                 "id": 14,
                 "description": "Payee Notification FSP Source is Switch",
                 "exec": [
-                  "expect(environment.payeeCallbackNotification.headers['fspiop-source']).to.equal('switch')"
+                  "expect(environment.payeeCallbackNotification.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {

diff --git a/...lden_path/feature_tests/Active_Inactive_participants/active_and_inactive_participant.json b/...lden_path/feature_tests/Active_Inactive_participants/active_and_inactive_participant.json
@@ -173,10 +173,10 @@
               },
               {
                 "id": 5,
-                "description": "Payer side Callback Header - fspiop-source is switch",
+                "description": "Payer side Callback Header - fspiop-source is switch's name",
                 "exec": [
                   "if (environment.ENABLE_WS_ASSERTIONS===true) {",
-                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('switch')",
+                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   "}"
                 ]
               },
@@ -352,10 +352,10 @@
               },
               {
                 "id": 5,
-                "description": "Payer side Callback Header - fspiop-source is switch",
+                "description": "Payer side Callback Header - fspiop-source is switch's name",
                 "exec": [
                   "if (environment.ENABLE_WS_ASSERTIONS===true) {",
-                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('switch')",
+                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   "}"
                 ]
               },

diff --git a/...feature_tests/Active_Inactive_participants/active_and_inactive_participants_accounts.json b/...feature_tests/Active_Inactive_participants/active_and_inactive_participants_accounts.json
@@ -210,10 +210,10 @@
               },
               {
                 "id": 5,
-                "description": "Payer side Callback Header - fspiop-source is switch",
+                "description": "Payer side Callback Header - fspiop-source is switch's name",
                 "exec": [
                   "if (environment.ENABLE_WS_ASSERTIONS===true) {",
-                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('switch')",
+                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   "}"
                 ]
               },
@@ -388,10 +388,10 @@
               },
               {
                 "id": 5,
-                "description": "Payer side Callback Header - fspiop-source is switch",
+                "description": "Payer side Callback Header - fspiop-source is switch's name",
                 "exec": [
                   "if (environment.ENABLE_WS_ASSERTIONS===true) {",
-                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('switch')",
+                  "  expect(requestVariables.sim1Callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   "}"
                 ]
               },

diff --git a/collections/hub/golden_path/feature_tests/block_transfer.json b/collections/hub/golden_path/feature_tests/block_transfer.json
@@ -457,9 +457,9 @@
               },
               {
                 "id": 4,
-                "description": "'fspiop-source' should be 'switch'",
+                "description": "'fspiop-source' should be switch's name",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch');"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}');"
                 ]
               },
               {
@@ -1259,9 +1259,9 @@
               },
               {
                 "id": 4,
-                "description": "'fspiop-source' should be 'switch'",
+                "description": "'fspiop-source' should be switch's name",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch');"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}');"
                 ]
               },
               {

diff --git a/collections/hub/golden_path/feature_tests/duplicate_handling/transfers/fulfill_commit.json b/collections/hub/golden_path/feature_tests/duplicate_handling/transfers/fulfill_commit.json
@@ -441,9 +441,9 @@
               },
               {
                 "id": 12,
-                "description": "Callback Header - fspiop-source is switch",
+                "description": "Callback Header - fspiop-source is switch's name",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },
@@ -880,9 +880,9 @@
               },
               {
                 "id": 3,
-                "description": "Payee Side Callback Header - fspiop-source is switch",
+                "description": "Payee Side Callback Header - fspiop-source is switch's name",
                 "exec": [
-                  "expect(requestVariables.payeeCallback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(requestVariables.payeeCallback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },

diff --git a/collections/hub/golden_path/feature_tests/duplicate_handling/transfers/fulfill_reject.json b/collections/hub/golden_path/feature_tests/duplicate_handling/transfers/fulfill_reject.json
@@ -437,9 +437,9 @@
               },
               {
                 "id": 12,
-                "description": "Callback Header - fspiop-source is switch",
+                "description": "Callback Header - fspiop-source is switch's name",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },
@@ -956,9 +956,9 @@
               },
               {
                 "id": 12,
-                "description": "Callback Header - fspiop-source is switch",
+                "description": "Callback Header - fspiop-source is switch's name",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },

diff --git a/...olden_path/feature_tests/duplicate_handling/transfers/original_transfer_at_committed.json b/...olden_path/feature_tests/duplicate_handling/transfers/original_transfer_at_committed.json
@@ -736,9 +736,9 @@
               },
               {
                 "id": 15,
-                "description": "Callback Header - fspiop-source is switch",
+                "description": "Callback Header - fspiop-source is switch's name",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')",
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')",
                   ""
                 ]
               },

diff --git a/collections/hub/golden_path/feature_tests/funds_in/funds_in_ttk.json b/collections/hub/golden_path/feature_tests/funds_in/funds_in_ttk.json
@@ -72,10 +72,10 @@
             "type": "central_admin"
           },
           "operationPath": "/participants/{name}/accounts",
-          "path": "/participants/Hub/accounts",
+          "path": "/participants/{$inputs.HUB_NAME}/accounts",
           "method": "get",
           "params": {
-            "name": "Hub"
+            "name": "{$inputs.HUB_NAME}"
           },
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {
@@ -277,10 +277,10 @@
             "type": "central_admin"
           },
           "operationPath": "/participants/{name}/accounts",
-          "path": "/participants/Hub/accounts",
+          "path": "/participants/{$inputs.HUB_NAME}/accounts",
           "method": "get",
           "params": {
-            "name": "Hub"
+            "name": "{$inputs.HUB_NAME}"
           },
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {
@@ -363,9 +363,9 @@
               },
               {
                 "id": 2,
-                "description": "fspiop-source is switch",
+                "description": "fspiop-source is switch's name",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {

diff --git a/collections/hub/golden_path/feature_tests/funds_out/Reserve&Abort/funds_out_abort.json b/collections/hub/golden_path/feature_tests/funds_out/Reserve&Abort/funds_out_abort.json
@@ -72,10 +72,10 @@
             "type": "central_admin"
           },
           "operationPath": "/participants/{name}/accounts",
-          "path": "/participants/Hub/accounts",
+          "path": "/participants/{$inputs.HUB_NAME}/accounts",
           "method": "get",
           "params": {
-            "name": "Hub"
+            "name": "{$inputs.HUB_NAME}"
           },
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {
@@ -277,10 +277,10 @@
             "type": "central_admin"
           },
           "operationPath": "/participants/{name}/accounts",
-          "path": "/participants/Hub/accounts",
+          "path": "/participants/{$inputs.HUB_NAME}/accounts",
           "method": "get",
           "params": {
-            "name": "Hub"
+            "name": "{$inputs.HUB_NAME}"
           },
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {
@@ -363,9 +363,9 @@
               },
               {
                 "id": 2,
-                "description": "fspiop-source is switch",
+                "description": "fspiop-source is switch's name",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {
@@ -504,10 +504,10 @@
             "type": "central_admin"
           },
           "operationPath": "/participants/{name}/accounts",
-          "path": "/participants/Hub/accounts",
+          "path": "/participants/{$inputs.HUB_NAME}/accounts",
           "method": "get",
           "params": {
-            "name": "Hub"
+            "name": "{$inputs.HUB_NAME}"
           },
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {
@@ -675,10 +675,10 @@
             "type": "central_admin"
           },
           "operationPath": "/participants/{name}/accounts",
-          "path": "/participants/Hub/accounts",
+          "path": "/participants/{$inputs.HUB_NAME}/accounts",
           "method": "get",
           "params": {
-            "name": "Hub"
+            "name": "{$inputs.HUB_NAME}"
           },
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {
@@ -762,9 +762,9 @@
               },
               {
                 "id": 2,
-                "description": "fspiop-source is switch",
+                "description": "fspiop-source is switch's name",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {

diff --git a/collections/hub/golden_path/feature_tests/funds_out/Reserve&Commit/funds_out_commit.json b/collections/hub/golden_path/feature_tests/funds_out/Reserve&Commit/funds_out_commit.json
@@ -72,10 +72,10 @@
             "type": "central_admin"
           },
           "operationPath": "/participants/{name}/accounts",
-          "path": "/participants/Hub/accounts",
+          "path": "/participants/{$inputs.HUB_NAME}/accounts",
           "method": "get",
           "params": {
-            "name": "Hub"
+            "name": "{$inputs.HUB_NAME}"
           },
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {
@@ -277,10 +277,10 @@
             "type": "central_admin"
           },
           "operationPath": "/participants/{name}/accounts",
-          "path": "/participants/Hub/accounts",
+          "path": "/participants/{$inputs.HUB_NAME}/accounts",
           "method": "get",
           "params": {
-            "name": "Hub"
+            "name": "{$inputs.HUB_NAME}"
           },
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {
@@ -363,9 +363,9 @@
               },
               {
                 "id": 2,
-                "description": "fspiop-source is switch",
+                "description": "fspiop-source is switch's name",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {
@@ -504,10 +504,10 @@
             "type": "central_admin"
           },
           "operationPath": "/participants/{name}/accounts",
-          "path": "/participants/Hub/accounts",
+          "path": "/participants/{$inputs.HUB_NAME}/accounts",
           "method": "get",
           "params": {
-            "name": "Hub"
+            "name": "{$inputs.HUB_NAME}"
           },
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {
@@ -675,10 +675,10 @@
             "type": "central_admin"
           },
           "operationPath": "/participants/{name}/accounts",
-          "path": "/participants/Hub/accounts",
+          "path": "/participants/{$inputs.HUB_NAME}/accounts",
           "method": "get",
           "params": {
-            "name": "Hub"
+            "name": "{$inputs.HUB_NAME}"
           },
           "url": "{$inputs.HOST_CENTRAL_LEDGER}",
           "headers": {
@@ -762,9 +762,9 @@
               },
               {
                 "id": 2,
-                "description": "fspiop-source is switch",
+                "description": "fspiop-source is switch's name",
                 "exec": [
-                  "expect(callback.headers['fspiop-source']).to.equal('switch')"
+                  "expect(callback.headers['fspiop-source']).to.equal('{$inputs.HUB_NAME}')"
                 ]
               },
               {