From 631fd0b5d76eef96e29c5ee881454e3e1ee7e9af Mon Sep 17 00:00:00 2001 From: Vijay Date: Wed, 12 Oct 2022 19:15:20 +0530 Subject: [PATCH 1/7] feat: added mojaloop-ttk-simulators chart as dependency to mojaloop --- mojaloop/requirements.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mojaloop/requirements.yaml b/mojaloop/requirements.yaml index 3cbe722a5..5348adf29 100644 --- a/mojaloop/requirements.yaml +++ b/mojaloop/requirements.yaml @@ -84,3 +84,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 \ No newline at end of file From f0ac3146e9340a8bc97ad2e87eaf6ae009c2225c Mon Sep 17 00:00:00 2001 From: Vijay Date: Thu, 13 Oct 2022 18:15:41 +0530 Subject: [PATCH 2/7] chore: changed sim names --- .../chart-sim1/values.yaml | 20 ++++++++--------- .../chart-sim2/values.yaml | 20 ++++++++--------- .../chart-sim3/values.yaml | 20 ++++++++--------- mojaloop-ttk-simulators/values.yaml | 22 +++---------------- 4 files changed, 33 insertions(+), 49 deletions(-) diff --git a/mojaloop-ttk-simulators/chart-sim1/values.yaml b/mojaloop-ttk-simulators/chart-sim1/values.yaml index 338ec0fdb..55efa3164 100644 --- a/mojaloop-ttk-simulators/chart-sim1/values.yaml +++ b/mojaloop-ttk-simulators/chart-sim1/values.yaml @@ -5,12 +5,12 @@ 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' redis: database: *CONFIG_SIM1_DB # This is a number between 0 to 15 @@ -30,7 +30,7 @@ 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' redis: database: *CONFIG_SIM1_DB # This is a number between 0 to 15 @@ -45,7 +45,7 @@ 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' redis: database: *CONFIG_SIM1_DB # This is a number between 0 to 15 @@ -68,10 +68,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 +88,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/sdk-scheme-adapter/mvp/bulk-sdk/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/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 +107,7 @@ ml-testing-toolkit: ml-testing-toolkit-frontend: enabled: true - nameOverride: 'ml-ttk-sim1-ttk-frontend' + nameOverride: 'ttksim1-ttk-frontend' # ingress: # enabled: true # hosts: diff --git a/mojaloop-ttk-simulators/chart-sim2/values.yaml b/mojaloop-ttk-simulators/chart-sim2/values.yaml index 46020f700..f8b165018 100644 --- a/mojaloop-ttk-simulators/chart-sim2/values.yaml +++ b/mojaloop-ttk-simulators/chart-sim2/values.yaml @@ -5,12 +5,12 @@ 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' redis: database: *CONFIG_SIM2_DB # This is a number between 0 to 15 @@ -36,14 +36,14 @@ sdk-scheme-adapter: 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' redis: database: *CONFIG_SIM2_DB # This is a number between 0 to 15 @@ -66,10 +66,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 +86,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/sdk-scheme-adapter/mvp/bulk-sdk/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/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 +106,7 @@ ml-testing-toolkit: ml-testing-toolkit-frontend: enabled: true - nameOverride: 'ml-ttk-sim2-ttk-frontend' + nameOverride: 'ttksim2-ttk-frontend' # ingress: # enabled: true # hosts: diff --git a/mojaloop-ttk-simulators/chart-sim3/values.yaml b/mojaloop-ttk-simulators/chart-sim3/values.yaml index 2d037e9af..2560808c4 100644 --- a/mojaloop-ttk-simulators/chart-sim3/values.yaml +++ b/mojaloop-ttk-simulators/chart-sim3/values.yaml @@ -5,12 +5,12 @@ 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' redis: database: *CONFIG_SIM3_DB # This is a number between 0 to 15 @@ -36,14 +36,14 @@ sdk-scheme-adapter: 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' redis: database: *CONFIG_SIM3_DB # This is a number between 0 to 15 @@ -66,10 +66,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 +86,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/sdk-scheme-adapter/mvp/bulk-sdk/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/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 +106,7 @@ ml-testing-toolkit: ml-testing-toolkit-frontend: enabled: true - nameOverride: 'ml-ttk-sim3-ttk-frontend' + nameOverride: 'ttksim3-ttk-frontend' # ingress: # enabled: true # hosts: diff --git a/mojaloop-ttk-simulators/values.yaml b/mojaloop-ttk-simulators/values.yaml index 244312eb9..1cfd084fe 100644 --- a/mojaloop-ttk-simulators/values.yaml +++ b/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: From e4a0d941d3d79a1b00e3e67998fb8ce516dc38fa Mon Sep 17 00:00:00 2001 From: Vijay Date: Fri, 14 Oct 2022 20:05:51 +0530 Subject: [PATCH 3/7] chore: changed rules file --- .../chart-sim1/values.yaml | 2 +- .../chart-sim2/values.yaml | 2 +- .../chart-sim3/values.yaml | 2 +- mojaloop/values.yaml | 84 ++++++++++++++++++- sdk-scheme-adapter/chart-service/values.yaml | 19 +++++ 5 files changed, 105 insertions(+), 4 deletions(-) diff --git a/mojaloop-ttk-simulators/chart-sim1/values.yaml b/mojaloop-ttk-simulators/chart-sim1/values.yaml index 55efa3164..7074ef368 100644 --- a/mojaloop-ttk-simulators/chart-sim1/values.yaml +++ b/mojaloop-ttk-simulators/chart-sim1/values.yaml @@ -88,7 +88,7 @@ ml-testing-toolkit: } ] } - rules_response__default.json: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/bulk-sdk/test/func/config/ml-testing-toolkit/spec_files/rules_response/default.json' + 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: diff --git a/mojaloop-ttk-simulators/chart-sim2/values.yaml b/mojaloop-ttk-simulators/chart-sim2/values.yaml index f8b165018..2896afa3c 100644 --- a/mojaloop-ttk-simulators/chart-sim2/values.yaml +++ b/mojaloop-ttk-simulators/chart-sim2/values.yaml @@ -86,7 +86,7 @@ ml-testing-toolkit: } ] } - rules_response__default.json: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/bulk-sdk/test/func/config/ml-testing-toolkit/spec_files/rules_response/default.json' + 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' diff --git a/mojaloop-ttk-simulators/chart-sim3/values.yaml b/mojaloop-ttk-simulators/chart-sim3/values.yaml index 2560808c4..05b3a25ad 100644 --- a/mojaloop-ttk-simulators/chart-sim3/values.yaml +++ b/mojaloop-ttk-simulators/chart-sim3/values.yaml @@ -86,7 +86,7 @@ ml-testing-toolkit: } ] } - rules_response__default.json: 'https://raw.githubusercontent.com/mojaloop/sdk-scheme-adapter/mvp/bulk-sdk/test/func/config/ml-testing-toolkit/spec_files/rules_response/default.json' + 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' diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index 887c940d1..dd047ec7e 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -6341,6 +6341,70 @@ mojaloop-simulator: ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] +mojaloop-ttk-simulators: + enabled: false + + mojaloop-ttk-sim1-svc: + enabled: true + ml-testing-toolkit: + ml-testing-toolkit-backend: + ingress: + enabled: true + hosts: + specApi: + host: 'ttksim1-specapi.local' + adminApi: + host: 'ttksim1.local' + ml-testing-toolkit-frontend: + ingress: + enabled: true + hosts: + ui: + host: ttksim1.local + config: + API_BASE_URL: 'http://ttksim1.local' + + mojaloop-ttk-sim2-svc: + enabled: true + ml-testing-toolkit: + ml-testing-toolkit-backend: + ingress: + enabled: true + hosts: + specApi: + host: 'ttksim2-specapi.local' + adminApi: + host: 'ttksim2.local' + ml-testing-toolkit-frontend: + ingress: + enabled: true + hosts: + ui: + host: 'ttksim2.local' + config: + API_BASE_URL: 'http://ttksim2.local' + + mojaloop-ttk-sim3-svc: + enabled: true + ml-testing-toolkit: + ml-testing-toolkit-backend: + ingress: + enabled: true + hosts: + specApi: + host: 'ttksim3-specapi.local' + adminApi: + host: 'ttksim3.local' + ml-testing-toolkit-frontend: + ingress: + enabled: true + hosts: + ui: + host: 'ttksim3.local' + config: + API_BASE_URL: 'http://ttksim3.local' + + mojaloop-bulk: enabled: false @@ -7393,6 +7457,9 @@ ml-testing-toolkit: simNameTestfsp3: 'testfsp3' simNameTestfsp4: 'testfsp4' simNameNoResponsePayeefsp: 'noresponsepayeefsp' + simNameTTKSim1: 'ttksim1' + simNameTTKSim2: 'ttksim2' + simNameTTKSim3: 'ttksim3' extraEnvironments: hub-k8s-default-environment.json: &ttkInputValues { @@ -7622,7 +7689,22 @@ ml-testing-toolkit: "DFSPB_BACKEND_TESTAPI_URL": "http://$release_name-sim-tp-dfspb-backend:3003", "DFSPB_CALLBACK_URL": "http://$release_name-sim-tp-dfspb-scheme-adapter:4000", "DFSPB_SDK_TESTAPI_URL": "http://$release_name-sim-tp-dfspb-scheme-adapter:4002", - "DFSPB_SDK_TESTAPI_WS_URL": "ws://$release_name-sim-tp-dfspb-scheme-adapter:4002" + "DFSPB_SDK_TESTAPI_WS_URL": "ws://$release_name-sim-tp-dfspb-scheme-adapter:4002", + "TTKSIM1_NAME": "$param_simNameTTKSim1", + "TTKSIM2_NAME": "$param_simNameTTKSim2", + "TTKSIM3_NAME": "$param_simNameTTKSim3", + "TTKSIM1_MSISDN": "16135551212", + "TTKSIM2_MSISDN": "56781234", + "TTKSIM3_MSISDN": "56781235", + "TTKSIM1_CALLBACK_URL": "http://$release_name-$param_simNameTTKSim1-sdk-api-svc:4000", + "TTKSIM1_SDK_TESTAPI_URL": "http://$release_name-$param_simNameTTKSim1-sdk-api-svc:4002", + "TTKSIM1_SDK_TESTAPI_WS_URL": "ws://$release_name-$param_simNameTTKSim1-sdk-api-svc:4002", + "TTKSIM2_CALLBACK_URL": "http://$release_name-$param_simNameTTKSim2-sdk-api-svc:4000", + "TTKSIM2_SDK_TESTAPI_URL": "http://$release_name-$param_simNameTTKSim2-sdk-api-svc:4002", + "TTKSIM2_SDK_TESTAPI_WS_URL": "ws://$release_name-$param_simNameTTKSim2-sdk-api-svc:4002", + "TTKSIM3_CALLBACK_URL": "http://$release_name-$param_simNameTTKSim3-sdk-api-svc:4000", + "TTKSIM3_SDK_TESTAPI_URL": "http://$release_name-$param_simNameTTKSim3-sdk-api-svc:4002", + "TTKSIM3_SDK_TESTAPI_WS_URL": "ws://$release_name-$param_simNameTTKSim3-sdk-api-svc:4002" } } diff --git a/sdk-scheme-adapter/chart-service/values.yaml b/sdk-scheme-adapter/chart-service/values.yaml index d20ca48ae..9012dedfd 100644 --- a/sdk-scheme-adapter/chart-service/values.yaml +++ b/sdk-scheme-adapter/chart-service/values.yaml @@ -362,6 +362,25 @@ initContainers: | value: {{ .Values.kafka.host | default .Values.global.kafka.host | quote }} - name: KAFKA_PORT value: {{ .Values.kafka.port | default .Values.global.kafka.port | quote }} + - name: kafka-topics-create + image: docker.io/bitnami/kafka:3.2 + imagePullPolicy: IfNotPresent + command: + - sh + - -c + - kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --list; + echo 'Creating kafka topics'; + kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --create --if-not-exists --topic ${SIM_NAME}-topic-sdk-outbound-command-events --replication-factor 1 --partitions 1; + kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --create --if-not-exists --topic ${SIM_NAME}-topic-sdk-outbound-domain-events --replication-factor 1 --partitions 1; + echo -e 'Successfully created the following topics:'; + kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --list; + env: + - name: KAFKA_HOST + value: {{ .Values.kafka.host | default .Values.global.kafka.host | quote }} + - name: KAFKA_PORT + value: {{ .Values.kafka.port | default .Values.global.kafka.port | quote }} + - name: SIM_NAME + value: {{ .Values.config.simName }} - name: wait-for-redis image: redis:7.0.5 imagePullPolicy: IfNotPresent From 1dbb9e3cd27a8b60012d66a493ddf92e9aa70d86 Mon Sep 17 00:00:00 2001 From: Vijay Date: Fri, 14 Oct 2022 20:10:21 +0530 Subject: [PATCH 4/7] fix: some fixes --- .../chart-sim1/values.yaml | 18 ++++++ .../chart-sim2/values.yaml | 18 ++++++ .../chart-sim3/values.yaml | 18 ++++++ sdk-scheme-adapter/values.yaml | 57 +++++++++++++++++++ 4 files changed, 111 insertions(+) diff --git a/mojaloop-ttk-simulators/chart-sim1/values.yaml b/mojaloop-ttk-simulators/chart-sim1/values.yaml index 7074ef368..fa7e286d2 100644 --- a/mojaloop-ttk-simulators/chart-sim1/values.yaml +++ b/mojaloop-ttk-simulators/chart-sim1/values.yaml @@ -12,6 +12,12 @@ sdk-scheme-adapter: enabled: true nameOverride: 'ttksim1-sdk-api-svc' + ## TODO: remote the following test image when the official image is available with all the fixes + image: + registry: docker.io + repository: vijayg10/sdk-scheme-adapter + tag: v1.0.1-bulk + redis: database: *CONFIG_SIM1_DB # This is a number between 0 to 15 @@ -32,6 +38,12 @@ sdk-scheme-adapter: enabled: true nameOverride: 'ttksim1-sdk-dom-evt-handler' + ## TODO: remote the following test image when the official image is available with all the fixes + image: + registry: docker.io + repository: vijayg10/sdk-scheme-adapter + tag: v1.0.1-bulk + redis: database: *CONFIG_SIM1_DB # This is a number between 0 to 15 @@ -47,6 +59,12 @@ sdk-scheme-adapter: enabled: true nameOverride: 'ttksim1-sdk-cmd-evt-handler' + ## TODO: remote the following test image when the official image is available with all the fixes + image: + registry: docker.io + repository: vijayg10/sdk-scheme-adapter + tag: v1.0.1-bulk + redis: database: *CONFIG_SIM1_DB # This is a number between 0 to 15 diff --git a/mojaloop-ttk-simulators/chart-sim2/values.yaml b/mojaloop-ttk-simulators/chart-sim2/values.yaml index 2896afa3c..c913022c9 100644 --- a/mojaloop-ttk-simulators/chart-sim2/values.yaml +++ b/mojaloop-ttk-simulators/chart-sim2/values.yaml @@ -12,6 +12,12 @@ sdk-scheme-adapter: enabled: true nameOverride: 'ttksim2-sdk-api-svc' + ## TODO: remote the following test image when the official image is available with all the fixes + image: + registry: docker.io + repository: vijayg10/sdk-scheme-adapter + tag: v1.0.1-bulk + redis: database: *CONFIG_SIM2_DB # This is a number between 0 to 15 @@ -30,6 +36,12 @@ sdk-scheme-adapter: sdk-scheme-adapter-dom-evt-handler: enabled: true + ## TODO: remote the following test image when the official image is available with all the fixes + image: + registry: docker.io + repository: vijayg10/sdk-scheme-adapter + tag: v1.0.1-bulk + redis: database: *CONFIG_SIM2_DB # This is a number between 0 to 15 @@ -45,6 +57,12 @@ sdk-scheme-adapter: enabled: true nameOverride: 'ttksim2-sdk-cmd-evt-handler' + ## TODO: remote the following test image when the official image is available with all the fixes + image: + registry: docker.io + repository: vijayg10/sdk-scheme-adapter + tag: v1.0.1-bulk + redis: database: *CONFIG_SIM2_DB # This is a number between 0 to 15 diff --git a/mojaloop-ttk-simulators/chart-sim3/values.yaml b/mojaloop-ttk-simulators/chart-sim3/values.yaml index 05b3a25ad..5c58c4f0d 100644 --- a/mojaloop-ttk-simulators/chart-sim3/values.yaml +++ b/mojaloop-ttk-simulators/chart-sim3/values.yaml @@ -12,6 +12,12 @@ sdk-scheme-adapter: enabled: true nameOverride: 'ttksim3-sdk-api-svc' + ## TODO: remote the following test image when the official image is available with all the fixes + image: + registry: docker.io + repository: vijayg10/sdk-scheme-adapter + tag: v1.0.1-bulk + redis: database: *CONFIG_SIM3_DB # This is a number between 0 to 15 @@ -30,6 +36,12 @@ sdk-scheme-adapter: sdk-scheme-adapter-dom-evt-handler: enabled: true + ## TODO: remote the following test image when the official image is available with all the fixes + image: + registry: docker.io + repository: vijayg10/sdk-scheme-adapter + tag: v1.0.1-bulk + redis: database: *CONFIG_SIM3_DB # This is a number between 0 to 15 @@ -45,6 +57,12 @@ sdk-scheme-adapter: enabled: true nameOverride: 'ttksim3-sdk-cmd-evt-handler' + ## TODO: remote the following test image when the official image is available with all the fixes + image: + registry: docker.io + repository: vijayg10/sdk-scheme-adapter + tag: v1.0.1-bulk + redis: database: *CONFIG_SIM3_DB # This is a number between 0 to 15 diff --git a/sdk-scheme-adapter/values.yaml b/sdk-scheme-adapter/values.yaml index 61eb77eb5..b5ee00a29 100644 --- a/sdk-scheme-adapter/values.yaml +++ b/sdk-scheme-adapter/values.yaml @@ -338,6 +338,25 @@ sdk-scheme-adapter-api-svc: value: {{ .Values.kafka.host | default .Values.global.kafka.host | quote }} - name: KAFKA_PORT value: {{ .Values.kafka.port | default .Values.global.kafka.port | quote }} + - name: kafka-topics-create + image: docker.io/bitnami/kafka:3.2 + imagePullPolicy: IfNotPresent + command: + - sh + - -c + - kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --list; + echo 'Creating kafka topics'; + kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --create --if-not-exists --topic ${SIM_NAME}-topic-sdk-outbound-command-events --replication-factor 1 --partitions 1; + kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --create --if-not-exists --topic ${SIM_NAME}-topic-sdk-outbound-domain-events --replication-factor 1 --partitions 1; + echo -e 'Successfully created the following topics:'; + kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --list; + env: + - name: KAFKA_HOST + value: {{ .Values.kafka.host | default .Values.global.kafka.host | quote }} + - name: KAFKA_PORT + value: {{ .Values.kafka.port | default .Values.global.kafka.port | quote }} + - name: SIM_NAME + value: {{ .Values.config.simName }} - name: wait-for-redis image: redis:7.0.5 imagePullPolicy: IfNotPresent @@ -731,6 +750,25 @@ sdk-scheme-adapter-dom-evt-handler: value: {{ .Values.kafka.host | default .Values.global.kafka.host | quote }} - name: KAFKA_PORT value: {{ .Values.kafka.port | default .Values.global.kafka.port | quote }} + - name: kafka-topics-create + image: docker.io/bitnami/kafka:3.2 + imagePullPolicy: IfNotPresent + command: + - sh + - -c + - kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --list; + echo 'Creating kafka topics'; + kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --create --if-not-exists --topic ${SIM_NAME}-topic-sdk-outbound-command-events --replication-factor 1 --partitions 1; + kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --create --if-not-exists --topic ${SIM_NAME}-topic-sdk-outbound-domain-events --replication-factor 1 --partitions 1; + echo -e 'Successfully created the following topics:'; + kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --list; + env: + - name: KAFKA_HOST + value: {{ .Values.kafka.host | default .Values.global.kafka.host | quote }} + - name: KAFKA_PORT + value: {{ .Values.kafka.port | default .Values.global.kafka.port | quote }} + - name: SIM_NAME + value: {{ .Values.config.simName }} - name: wait-for-redis image: redis:7.0.5 imagePullPolicy: IfNotPresent @@ -1127,6 +1165,25 @@ sdk-scheme-adapter-cmd-evt-handler: value: {{ .Values.kafka.host | default .Values.global.kafka.host | quote }} - name: KAFKA_PORT value: {{ .Values.kafka.port | default .Values.global.kafka.port | quote }} + - name: kafka-topics-create + image: docker.io/bitnami/kafka:3.2 + imagePullPolicy: IfNotPresent + command: + - sh + - -c + - kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --list; + echo 'Creating kafka topics'; + kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --create --if-not-exists --topic ${SIM_NAME}-topic-sdk-outbound-command-events --replication-factor 1 --partitions 1; + kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --create --if-not-exists --topic ${SIM_NAME}-topic-sdk-outbound-domain-events --replication-factor 1 --partitions 1; + echo -e 'Successfully created the following topics:'; + kafka-topics.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT} --list; + env: + - name: KAFKA_HOST + value: {{ .Values.kafka.host | default .Values.global.kafka.host | quote }} + - name: KAFKA_PORT + value: {{ .Values.kafka.port | default .Values.global.kafka.port | quote }} + - name: SIM_NAME + value: {{ .Values.config.simName }} - name: wait-for-redis image: redis:7.0.5 imagePullPolicy: IfNotPresent From 9d25e75451338d467dd1e4e3f8b80e74dafc299b Mon Sep 17 00:00:00 2001 From: Vijay Date: Mon, 17 Oct 2022 21:41:32 +0530 Subject: [PATCH 5/7] feat: added helm test command --- README.md | 9 ++++++++ mojaloop/requirements.yaml | 5 ++++ mojaloop/values.yaml | 47 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 59951ebdb..4e06e856b 100644 --- a/README.md +++ b/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 install 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=-kafka --set global.redis.host=-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` is set_) Or alternatively add `--set` for each of the above parameters on the install command: diff --git a/mojaloop/requirements.yaml b/mojaloop/requirements.yaml index 5348adf29..c8cea22fc 100644 --- a/mojaloop/requirements.yaml +++ b/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 diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index dd047ec7e..29e4c402c 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -7826,8 +7826,11 @@ ml-ttk-test-setup: weight: -6 config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases - testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: *ttkGitPathSetup + # testCasesZipUrl: *ttkGitUrl + # testCasesPathInZip: *ttkGitPathSetup + ## TODO: We can remove the following lines and uncomment the above two lines after we merge the test-cases related sdk-bulk to master branch and release a version + testCasesZipUrl: https://github.com/mojaloop/testing-toolkit-test-cases/archive/refs/heads/mvp/bulk-sdk.zip + testCasesPathInZip: testing-toolkit-test-cases-mvp-bulk-sdk/collections/hub/provisioning ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 parameters: <<: *simNames @@ -7984,3 +7987,43 @@ ml-ttk-test-val-tp: parameters: <<: *simNames testCaseEnvironmentFile: *ttkInputValues + +ml-ttk-test-val-sdk-bulk: + tests: + enabled: false + weight: -1 + config: + ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases + # testCasesZipUrl: *ttkGitUrl + ## TODO: We can remove the following line and uncomment the above line after we merge the test-cases related sdk-bulk to master branch and release a version + testCasesZipUrl: https://github.com/mojaloop/testing-toolkit-test-cases/archive/refs/heads/mvp/bulk-sdk.zip + testCasesPathInZip: testing-toolkit-test-cases-mvp-bulk-sdk/collections/hub/sdk-bulk + ## Optional config for uploading reports to S3 Buckets. If enabled: WS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION under the 'configCreds' is required. + # awsS3BucketName: aws-s3-bucket-name + # awsS3FilePath: ttk-tests/reports + ttkBackendURL: http://$release_name-ttksim1-ttk-backend:5050 + testSuiteName: SDK Bulk Tests + environmentName: Development + + # configCreds: + # AWS_ACCESS_KEY_ID: 'some_aws_access_key' + # AWS_SECRET_ACCESS_KEY: 'some_aws_secret_key' + # AWS_REGION: 'us-west-2' + # SLACK_WEBHOOK_URL: 'slack_inbound_webhook' + + ## Optionally specify the config file defaults for TTK CLI + ## You should specify at least mode here + # configFileDefaults: { + # "mode": "outbound", + # "reportFormat": "html", + # "baseURL": "", + # "reportTarget": "", + # "reportAutoFilenameEnable": true, + # "slackWebhookUrl": "", + # "slackPassedImage": "", + # "slackFailedImage": "", + # "logLevel": "2" + # } + parameters: + <<: *simNames + testCaseEnvironmentFile: *ttkInputValues From 71fbbd52bfb5ccdadc7db377a338b125314a4844 Mon Sep 17 00:00:00 2001 From: Vijay Date: Mon, 17 Oct 2022 22:09:47 +0530 Subject: [PATCH 6/7] chore: changed the image to snapshot --- mojaloop-ttk-simulators/chart-sim1/values.yaml | 18 +++++++++--------- mojaloop-ttk-simulators/chart-sim2/values.yaml | 18 +++++++++--------- mojaloop-ttk-simulators/chart-sim3/values.yaml | 18 +++++++++--------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/mojaloop-ttk-simulators/chart-sim1/values.yaml b/mojaloop-ttk-simulators/chart-sim1/values.yaml index fa7e286d2..1c2fc438f 100644 --- a/mojaloop-ttk-simulators/chart-sim1/values.yaml +++ b/mojaloop-ttk-simulators/chart-sim1/values.yaml @@ -12,11 +12,11 @@ sdk-scheme-adapter: enabled: true nameOverride: 'ttksim1-sdk-api-svc' - ## TODO: remote the following test image when the official image is available with all the fixes + ## TODO: remove the following test image when the official image is available with all the fixes image: registry: docker.io - repository: vijayg10/sdk-scheme-adapter - tag: v1.0.1-bulk + 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 @@ -38,11 +38,11 @@ sdk-scheme-adapter: enabled: true nameOverride: 'ttksim1-sdk-dom-evt-handler' - ## TODO: remote the following test image when the official image is available with all the fixes + ## TODO: remove the following test image when the official image is available with all the fixes image: registry: docker.io - repository: vijayg10/sdk-scheme-adapter - tag: v1.0.1-bulk + 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 @@ -59,11 +59,11 @@ sdk-scheme-adapter: enabled: true nameOverride: 'ttksim1-sdk-cmd-evt-handler' - ## TODO: remote the following test image when the official image is available with all the fixes + ## TODO: remove the following test image when the official image is available with all the fixes image: registry: docker.io - repository: vijayg10/sdk-scheme-adapter - tag: v1.0.1-bulk + 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 diff --git a/mojaloop-ttk-simulators/chart-sim2/values.yaml b/mojaloop-ttk-simulators/chart-sim2/values.yaml index c913022c9..6898566cf 100644 --- a/mojaloop-ttk-simulators/chart-sim2/values.yaml +++ b/mojaloop-ttk-simulators/chart-sim2/values.yaml @@ -12,11 +12,11 @@ sdk-scheme-adapter: enabled: true nameOverride: 'ttksim2-sdk-api-svc' - ## TODO: remote the following test image when the official image is available with all the fixes + ## TODO: remove the following test image when the official image is available with all the fixes image: registry: docker.io - repository: vijayg10/sdk-scheme-adapter - tag: v1.0.1-bulk + 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 @@ -36,11 +36,11 @@ sdk-scheme-adapter: sdk-scheme-adapter-dom-evt-handler: enabled: true - ## TODO: remote the following test image when the official image is available with all the fixes + ## TODO: remove the following test image when the official image is available with all the fixes image: registry: docker.io - repository: vijayg10/sdk-scheme-adapter - tag: v1.0.1-bulk + 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 @@ -57,11 +57,11 @@ sdk-scheme-adapter: enabled: true nameOverride: 'ttksim2-sdk-cmd-evt-handler' - ## TODO: remote the following test image when the official image is available with all the fixes + ## TODO: remove the following test image when the official image is available with all the fixes image: registry: docker.io - repository: vijayg10/sdk-scheme-adapter - tag: v1.0.1-bulk + 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 diff --git a/mojaloop-ttk-simulators/chart-sim3/values.yaml b/mojaloop-ttk-simulators/chart-sim3/values.yaml index 5c58c4f0d..8315c2bcb 100644 --- a/mojaloop-ttk-simulators/chart-sim3/values.yaml +++ b/mojaloop-ttk-simulators/chart-sim3/values.yaml @@ -12,11 +12,11 @@ sdk-scheme-adapter: enabled: true nameOverride: 'ttksim3-sdk-api-svc' - ## TODO: remote the following test image when the official image is available with all the fixes + ## TODO: remove the following test image when the official image is available with all the fixes image: registry: docker.io - repository: vijayg10/sdk-scheme-adapter - tag: v1.0.1-bulk + 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 @@ -36,11 +36,11 @@ sdk-scheme-adapter: sdk-scheme-adapter-dom-evt-handler: enabled: true - ## TODO: remote the following test image when the official image is available with all the fixes + ## TODO: remove the following test image when the official image is available with all the fixes image: registry: docker.io - repository: vijayg10/sdk-scheme-adapter - tag: v1.0.1-bulk + 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 @@ -57,11 +57,11 @@ sdk-scheme-adapter: enabled: true nameOverride: 'ttksim3-sdk-cmd-evt-handler' - ## TODO: remote the following test image when the official image is available with all the fixes + ## TODO: remove the following test image when the official image is available with all the fixes image: registry: docker.io - repository: vijayg10/sdk-scheme-adapter - tag: v1.0.1-bulk + 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 From 44ee3a2d3861f92ff9703cea89d581535f1c6e16 Mon Sep 17 00:00:00 2001 From: vijayg10 <33152110+vijayg10@users.noreply.github.com> Date: Tue, 18 Oct 2022 14:43:01 +0530 Subject: [PATCH 7/7] Update README.md Co-authored-by: Miguel de Barros --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4e06e856b..633c1623f 100644 --- a/README.md +++ b/README.md @@ -168,7 +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` 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: