feat(mojaloop/2976): added mojaloop-ttk-simulators chart as dependency to mojaloop

README.md

@@ -91,6 +91,14 @@
 
     Refer to [thirdparty/README.md](./thirdparty/README.md) for more information on what pre-requisites are required to enable Thirdparty components and how to  manually deploy backend dependencies.
 
+7. Deploy Mojaloop with Bulk-API-Adapter and SDK-TTK Bulk simulators
+
+    *Warning: This will deploy all core Mojaloop charts.*, the Bulk-API-Adapter and additional SDK+TTK simulators
+
+    - `helm --namespace <namespace> install <release_name> mojaloop/mojaloop --set mojaloop-bulk.enabled=true --set ml-ttk-test-val-bulk.tests.enabled=true `
+
+    e.g. `helm --namespace moja install dev mojaloop/mojaloop --set mojaloop-bulk.enabled=true --set ml-ttk-test-val-bulk.tests.enabled=true --set mojaloop-ttk-simulators.enabled=true --set global.kafka.host=<MOJALOOP_INSTALL_NAME>-kafka --set global.redis.host=<REDIS_INSTALL_NAME>-redis-master --set ml-ttk-test-val-sdk-bulk.tests.enabled=true`
+
 ### Deploying development versions
 
 1. To deploy the latest development version, use the `--devel` flag:
@@ -160,6 +168,7 @@ Mojaloop Helm deployments currently include the following tests:
     - `ml-ttk-test-setup.tests.enabled=true`
     - `ml-ttk-test-val-gp.tests.enabled=true`
     - `ml-ttk-test-val-bulk.tests.enabled=true` (_Note: only applicable if `mojaloop-bulk.enabled=true` is set_)
+    - `ml-ttk-test-val-sdk-bulk.tests.enabled=true` (_Note: only applicable if `mojaloop-bulk.enabled=true`, `mojaloop-ttk-simulators.enabled=true` is set_)
 
     Or alternatively add `--set` for each of the above parameters on the install command:
 

mojaloop-ttk-simulators/chart-sim1/values.yaml

@@ -5,12 +5,18 @@ sdk-scheme-adapter:
 
   ## Local re-usable configs
   config:
-    simName: &CONFIG_SIM1_NAME ml-ttk-sim1
+    simName: &CONFIG_SIM1_NAME ttksim1
     database: &CONFIG_SIM1_DB 1
 
   sdk-scheme-adapter-api-svc:
     enabled: true
-    nameOverride: 'ml-ttk-sim1-sdk-api-svc'
+    nameOverride: 'ttksim1-sdk-api-svc'
+
+    ## TODO: remove the following test image when the official image is available with all the fixes
+    image:
+      registry: docker.io
+      repository: mojaloop/sdk-scheme-adapter
+      tag: v20.0.0-bulk-snapshot.21
 
     redis:
       database: *CONFIG_SIM1_DB # This is a number between 0 to 15
@@ -30,7 +36,13 @@ sdk-scheme-adapter:
 
   sdk-scheme-adapter-dom-evt-handler:
     enabled: true
-    nameOverride: 'ml-ttk-sim1-sdk-dom-evt-handler'
+    nameOverride: 'ttksim1-sdk-dom-evt-handler'
+
+    ## TODO: remove the following test image when the official image is available with all the fixes
+    image:
+      registry: docker.io
+      repository: mojaloop/sdk-scheme-adapter
+      tag: v20.0.0-bulk-snapshot.21
 
     redis:
       database: *CONFIG_SIM1_DB # This is a number between 0 to 15
@@ -45,7 +57,13 @@ sdk-scheme-adapter:
 
   sdk-scheme-adapter-cmd-evt-handler:
     enabled: true
-    nameOverride: 'ml-ttk-sim1-sdk-cmd-evt-handler'
+    nameOverride: 'ttksim1-sdk-cmd-evt-handler'
+
+    ## TODO: remove the following test image when the official image is available with all the fixes
+    image:
+      registry: docker.io
+      repository: mojaloop/sdk-scheme-adapter
+      tag: v20.0.0-bulk-snapshot.21
 
     redis:
       database: *CONFIG_SIM1_DB # This is a number between 0 to 15
@@ -68,10 +86,10 @@ ml-testing-toolkit:
 
   ml-testing-toolkit-backend:
     enabled: true
-    nameOverride: 'ml-ttk-sim1-ttk-backend'
+    nameOverride: 'ttksim1-ttk-backend'
     config:
       user_config.json:
-        CALLBACK_ENDPOINT: 'http://$release_name-ml-ttk-sim1-sdk-api-svc:4001'
+        CALLBACK_ENDPOINT: 'http://$release_name-ttksim1-sdk-api-svc:4001'
       system_config.json: {
         "API_DEFINITIONS": [
           {
@@ -88,9 +106,9 @@ ml-testing-toolkit:
           }
         ]
       }
-      rules_response__default.json: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/feat/%232809-local-end-to-end-func-tests/test/func/config/ml-testing-toolkit/spec_files/rules_response/default.json'
-      api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/feat/%232809-local-end-to-end-func-tests/test/func/config/ml-testing-toolkit/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml'
-      api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/feat/%232809-local-end-to-end-func-tests/test/func/config/ml-testing-toolkit/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml'
+      rules_response__default.json: 'https://raw.githubusercontent.com/mojaloop/testing-toolkit-test-cases/mvp/bulk-sdk/rules/sdk-bulk/response_rules.json'
+      api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/bulk-sdk/test/func/config/ml-testing-toolkit/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml'
+      api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/bulk-sdk/test/func/config/ml-testing-toolkit/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml'
   #   ingress:
   #     enabled: true
   #     hosts:
@@ -107,7 +125,7 @@ ml-testing-toolkit:
 
   ml-testing-toolkit-frontend:
     enabled: true
-    nameOverride: 'ml-ttk-sim1-ttk-frontend'
+    nameOverride: 'ttksim1-ttk-frontend'
   #   ingress:
   #     enabled: true
   #     hosts:

mojaloop-ttk-simulators/chart-sim2/values.yaml

@@ -5,12 +5,18 @@ sdk-scheme-adapter:
 
   ## Local re-usable configs
   config:
-    simName: &CONFIG_SIM2_NAME ml-ttk-sim2
+    simName: &CONFIG_SIM2_NAME ttksim2
     database: &CONFIG_SIM2_DB 2
 
   sdk-scheme-adapter-api-svc:
     enabled: true
-    nameOverride: 'ml-ttk-sim2-sdk-api-svc'
+    nameOverride: 'ttksim2-sdk-api-svc'
+
+    ## TODO: remove the following test image when the official image is available with all the fixes
+    image:
+      registry: docker.io
+      repository: mojaloop/sdk-scheme-adapter
+      tag: v20.0.0-bulk-snapshot.21
 
     redis:
       database: *CONFIG_SIM2_DB # This is a number between 0 to 15
@@ -30,20 +36,32 @@ sdk-scheme-adapter:
   sdk-scheme-adapter-dom-evt-handler:
     enabled: true
 
+    ## TODO: remove the following test image when the official image is available with all the fixes
+    image:
+      registry: docker.io
+      repository: mojaloop/sdk-scheme-adapter
+      tag: v20.0.0-bulk-snapshot.21
+
     redis:
       database: *CONFIG_SIM2_DB # This is a number between 0 to 15
 
     config:
       simName: *CONFIG_SIM2_NAME
 
-    nameOverride: 'ml-ttk-sim2-sdk-dom-evt-handler'
+    nameOverride: 'ttksim2-sdk-dom-evt-handler'
     env:
       DOMAIN_EVENT_CONSUMER_GROUP_ID: '{{ .Values.config.simName }}-domain_events_consumer_group'
       DOMAIN_EVENT_CONSUMER_TOPICS: '{{ .Values.config.simName }}-topic-sdk-outbound-domain-events'
       COMMAND_EVENT_PRODUCER_TOPIC: '{{ .Values.config.simName }}-topic-sdk-outbound-command-events'
   sdk-scheme-adapter-cmd-evt-handler:
     enabled: true
-    nameOverride: 'ml-ttk-sim2-sdk-cmd-evt-handler'
+    nameOverride: 'ttksim2-sdk-cmd-evt-handler'
+
+    ## TODO: remove the following test image when the official image is available with all the fixes
+    image:
+      registry: docker.io
+      repository: mojaloop/sdk-scheme-adapter
+      tag: v20.0.0-bulk-snapshot.21
 
     redis:
       database: *CONFIG_SIM2_DB # This is a number between 0 to 15
@@ -66,10 +84,10 @@ ml-testing-toolkit:
 
   ml-testing-toolkit-backend:
     enabled: true
-    nameOverride: 'ml-ttk-sim2-ttk-backend'
+    nameOverride: 'ttksim2-ttk-backend'
     config:
       user_config.json:
-        CALLBACK_ENDPOINT: 'http://$release_name-ml-ttk-sim2-sdk-api-svc:4001'
+        CALLBACK_ENDPOINT: 'http://$release_name-ttksim2-sdk-api-svc:4001'
       system_config.json: {
         "API_DEFINITIONS": [
           {
@@ -86,9 +104,9 @@ ml-testing-toolkit:
           }
         ]
       }
-      rules_response__default.json: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/feat/%232809-local-end-to-end-func-tests/test/func/config/ml-testing-toolkit/spec_files/rules_response/default.json'
-      api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/feat/%232809-local-end-to-end-func-tests/test/func/config/ml-testing-toolkit/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml'
-      api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/feat/%232809-local-end-to-end-func-tests/test/func/config/ml-testing-toolkit/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml'
+      rules_response__default.json: 'https://raw.githubusercontent.com/mojaloop/testing-toolkit-test-cases/mvp/bulk-sdk/rules/sdk-bulk/response_rules.json'
+      api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/bulk-sdk/test/func/config/ml-testing-toolkit/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml'
+      api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/bulk-sdk/test/func/config/ml-testing-toolkit/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml'
 
   #   ingress:
   #     enabled: true
@@ -106,7 +124,7 @@ ml-testing-toolkit:
 
   ml-testing-toolkit-frontend:
     enabled: true
-    nameOverride: 'ml-ttk-sim2-ttk-frontend'
+    nameOverride: 'ttksim2-ttk-frontend'
   #   ingress:
   #     enabled: true
   #     hosts:

mojaloop-ttk-simulators/chart-sim3/values.yaml

@@ -5,12 +5,18 @@ sdk-scheme-adapter:
 
   ## Local re-usable configs
   config:
-    simName: &CONFIG_SIM3_NAME ml-ttk-sim3
+    simName: &CONFIG_SIM3_NAME ttksim3
     database: &CONFIG_SIM3_DB 3
 
   sdk-scheme-adapter-api-svc:
     enabled: true
-    nameOverride: 'ml-ttk-sim3-sdk-api-svc'
+    nameOverride: 'ttksim3-sdk-api-svc'
+
+    ## TODO: remove the following test image when the official image is available with all the fixes
+    image:
+      registry: docker.io
+      repository: mojaloop/sdk-scheme-adapter
+      tag: v20.0.0-bulk-snapshot.21
 
     redis:
       database: *CONFIG_SIM3_DB # This is a number between 0 to 15
@@ -30,20 +36,32 @@ sdk-scheme-adapter:
   sdk-scheme-adapter-dom-evt-handler:
     enabled: true
 
+    ## TODO: remove the following test image when the official image is available with all the fixes
+    image:
+      registry: docker.io
+      repository: mojaloop/sdk-scheme-adapter
+      tag: v20.0.0-bulk-snapshot.21
+
     redis:
       database: *CONFIG_SIM3_DB # This is a number between 0 to 15
 
     config:
       simName: *CONFIG_SIM3_NAME
 
-    nameOverride: 'ml-ttk-sim3-sdk-dom-evt-handler'
+    nameOverride: 'ttksim3-sdk-dom-evt-handler'
     env:
       DOMAIN_EVENT_CONSUMER_GROUP_ID: '{{ .Values.config.simName }}-domain_events_consumer_group'
       DOMAIN_EVENT_CONSUMER_TOPICS: '{{ .Values.config.simName }}-topic-sdk-outbound-domain-events'
       COMMAND_EVENT_PRODUCER_TOPIC: '{{ .Values.config.simName }}-topic-sdk-outbound-command-events'
   sdk-scheme-adapter-cmd-evt-handler:
     enabled: true
-    nameOverride: 'ml-ttk-sim3-sdk-cmd-evt-handler'
+    nameOverride: 'ttksim3-sdk-cmd-evt-handler'
+
+    ## TODO: remove the following test image when the official image is available with all the fixes
+    image:
+      registry: docker.io
+      repository: mojaloop/sdk-scheme-adapter
+      tag: v20.0.0-bulk-snapshot.21
 
     redis:
       database: *CONFIG_SIM3_DB # This is a number between 0 to 15
@@ -66,10 +84,10 @@ ml-testing-toolkit:
 
   ml-testing-toolkit-backend:
     enabled: true
-    nameOverride: 'ml-ttk-sim3-ttk-backend'
+    nameOverride: 'ttksim3-ttk-backend'
     config:
       user_config.json:
-        CALLBACK_ENDPOINT: 'http://$release_name-ml-ttk-sim3-sdk-api-svc:4001'
+        CALLBACK_ENDPOINT: 'http://$release_name-ttksim3-sdk-api-svc:4001'
       system_config.json: {
         "API_DEFINITIONS": [
           {
@@ -86,9 +104,9 @@ ml-testing-toolkit:
           }
         ]
       }
-      rules_response__default.json: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/feat/%232809-local-end-to-end-func-tests/test/func/config/ml-testing-toolkit/spec_files/rules_response/default.json'
-      api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/feat/%232809-local-end-to-end-func-tests/test/func/config/ml-testing-toolkit/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml'
-      api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/feat/%232809-local-end-to-end-func-tests/test/func/config/ml-testing-toolkit/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml'
+      rules_response__default.json: 'https://raw.githubusercontent.com/mojaloop/testing-toolkit-test-cases/mvp/bulk-sdk/rules/sdk-bulk/response_rules.json'
+      api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/bulk-sdk/test/func/config/ml-testing-toolkit/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml'
+      api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/bulk-sdk/test/func/config/ml-testing-toolkit/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml'
 
   #   ingress:
   #     enabled: true
@@ -106,7 +124,7 @@ ml-testing-toolkit:
 
   ml-testing-toolkit-frontend:
     enabled: true
-    nameOverride: 'ml-ttk-sim3-ttk-frontend'
+    nameOverride: 'ttksim3-ttk-frontend'
   #   ingress:
   #     enabled: true
   #     hosts:

mojaloop-ttk-simulators/values.yaml

@@ -18,7 +18,7 @@ mojaloop-ttk-sim1-svc:
 
   ## Local re-usable configs
   config:
-    simName: &CONFIG_SIM1_NAME ml-ttk-sim1
+    simName: &CONFIG_SIM1_NAME ttksim1
     database: &CONFIG_SIM1_DB 1
 
   sdk-scheme-adapter:
@@ -35,14 +35,6 @@ mojaloop-ttk-sim1-svc:
       config:
         simName: *CONFIG_SIM1_NAME
 
-      env:
-        PEER_ENDPOINT: '{{ .Release.Name }}-ml-ttk-sim2-sdk-api-svc:4000'
-        ALS_ENDPOINT: '{{ .Release.Name }}-ml-ttk-sim2-sdk-api-svc:4000'
-        QUOTES_ENDPOINT: '{{ .Release.Name }}-ml-ttk-sim2-sdk-api-svc:4000'
-        BULK_QUOTES_ENDPOINT: '{{ .Release.Name }}-ml-ttk-sim2-sdk-api-svc:4000'
-        TRANSACTION_REQUESTS_ENDPOINT: '{{ .Release.Name }}-ml-ttk-sim2-sdk-api-svc:4000'
-        TRANSFERS_ENDPOINT: '{{ .Release.Name }}-ml-ttk-sim2-sdk-api-svc:4000'
-        BULK_TRANSFERS_ENDPOINT: '{{ .Release.Name }}-ml-ttk-sim2-sdk-api-svc:4000'
 
     sdk-scheme-adapter-dom-evt-handler:
       # kafka:
@@ -102,7 +94,7 @@ mojaloop-ttk-sim2-svc:
 
   ## Local re-usable configs
   config:
-    simName: &CONFIG_SIM2_NAME ml-ttk-sim2
+    simName: &CONFIG_SIM2_NAME ttksim2
     database: &CONFIG_SIM2_DB 2
 
   sdk-scheme-adapter:
@@ -119,14 +111,6 @@ mojaloop-ttk-sim2-svc:
       config:
         simName: *CONFIG_SIM2_NAME
 
-      env:
-        PEER_ENDPOINT: '{{ .Release.Name }}-ml-ttk-sim1-sdk-api-svc:4000'
-        ALS_ENDPOINT: '{{ .Release.Name }}-ml-ttk-sim1-sdk-api-svc:4000'
-        QUOTES_ENDPOINT: '{{ .Release.Name }}-ml-ttk-sim1-sdk-api-svc:4000'
-        BULK_QUOTES_ENDPOINT: '{{ .Release.Name }}-ml-ttk-sim1-sdk-api-svc:4000'
-        TRANSACTION_REQUESTS_ENDPOINT: '{{ .Release.Name }}-ml-ttk-sim1-sdk-api-svc:4000'
-        TRANSFERS_ENDPOINT: '{{ .Release.Name }}-ml-ttk-sim1-sdk-api-svc:4000'
-        BULK_TRANSFERS_ENDPOINT: '{{ .Release.Name }}-ml-ttk-sim1-sdk-api-svc:4000'
 
     sdk-scheme-adapter-dom-evt-handler:
       # kafka:
@@ -186,7 +170,7 @@ mojaloop-ttk-sim3-svc:
 
   ## Local re-usable configs
   config:
-    simName: &CONFIG_SIM3_NAME ml-ttk-sim3
+    simName: &CONFIG_SIM3_NAME ttksim3
     database: &CONFIG_SIM3_DB 3
 
   sdk-scheme-adapter:

mojaloop/requirements.yaml

@@ -65,6 +65,11 @@ dependencies:
   version: 15.0.0
   repository: "file://../ml-testing-toolkit-cli"
   condition: ml-ttk-test-val-tp.tests.enabled
+- name: ml-testing-toolkit-cli
+  alias: ml-ttk-test-val-sdk-bulk
+  version: 15.0.0
+  repository: "file://../ml-testing-toolkit-cli"
+  condition: ml-ttk-test-val-sdk-bulk.tests.enabled
 - name: ml-testing-toolkit-cli
   alias: ml-ttk-posthook-setup
   version: 15.0.0
@@ -84,3 +89,7 @@ dependencies:
   version: 2.0.0
   repository: "file://../thirdparty"
   condition: thirdparty.enabled
+- name: mojaloop-ttk-simulators
+  version: 1.0.0
+  repository: "file://../mojaloop-ttk-simulators"
+  condition: mojaloop-ttk-simulators.enabled