From f844a2b7de8a7ae54da7e8f7938c9d971922ad67 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 14 Jul 2025 09:29:59 +0200 Subject: [PATCH 1/3] Fix configmap of discover service --- .../charts/ocf-discover-service-api/templates/configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/helm/capif/charts/ocf-discover-service-api/templates/configmap.yaml b/helm/capif/charts/ocf-discover-service-api/templates/configmap.yaml index 96d0c367..1db82bbf 100644 --- a/helm/capif/charts/ocf-discover-service-api/templates/configmap.yaml +++ b/helm/capif/charts/ocf-discover-service-api/templates/configmap.yaml @@ -11,6 +11,7 @@ data: 'col': 'serviceapidescriptions', 'invokers_col': 'invokerdetails', 'capif_users_col': "user", + 'certs_col': "certs", 'host': 'mongo', 'port': "27017" } -- GitLab From e631ec759ba8530bdb68e7e1bb955c67d189dfdd Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 14 Jul 2025 12:51:03 +0200 Subject: [PATCH 2/3] Add configmap with certs table to each service that need it --- .../charts/ocf-api-invocation-logs/templates/configmap.yaml | 3 ++- .../ocf-api-invoker-management/templates/configmap.yaml | 4 ++-- .../ocf-api-provider-management/templates/configmap.yaml | 2 +- .../charts/ocf-auditing-api-logs/templates/configmap.yaml | 3 ++- .../charts/ocf-discover-service-api/templates/configmap.yaml | 4 ++-- helm/capif/charts/ocf-events/templates/configmap.yaml | 2 +- .../charts/ocf-publish-service-api/templates/configmap.yaml | 4 ++-- helm/capif/charts/ocf-security/templates/configmap.yaml | 2 +- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/helm/capif/charts/ocf-api-invocation-logs/templates/configmap.yaml b/helm/capif/charts/ocf-api-invocation-logs/templates/configmap.yaml index bd13f9f1..8d814ea3 100644 --- a/helm/capif/charts/ocf-api-invocation-logs/templates/configmap.yaml +++ b/helm/capif/charts/ocf-api-invocation-logs/templates/configmap.yaml @@ -12,7 +12,8 @@ data: 'invoker_col': 'invokerdetails', 'prov_col': 'providerenrolmentdetails', 'serv_col': 'serviceapidescriptions', - 'capif_users_col': "user", + 'capif_users_col': 'user', + 'certs_col': 'certs', 'host': 'mongo', 'port': "27017" } diff --git a/helm/capif/charts/ocf-api-invoker-management/templates/configmap.yaml b/helm/capif/charts/ocf-api-invoker-management/templates/configmap.yaml index 4d83c986..f0688893 100644 --- a/helm/capif/charts/ocf-api-invoker-management/templates/configmap.yaml +++ b/helm/capif/charts/ocf-api-invoker-management/templates/configmap.yaml @@ -9,8 +9,8 @@ data: 'password': '{{ .Values.env.mongoInitdbRootPassword }}', 'db': 'capif', 'col': 'invokerdetails', - 'capif_users_col': "user", - 'certs_col': "certs", + 'capif_users_col': 'user', + 'certs_col': 'certs', 'service_col': 'serviceapidescriptions', 'host': 'mongo', 'port': "27017" diff --git a/helm/capif/charts/ocf-api-provider-management/templates/configmap.yaml b/helm/capif/charts/ocf-api-provider-management/templates/configmap.yaml index e59cfe17..6da59dd8 100644 --- a/helm/capif/charts/ocf-api-provider-management/templates/configmap.yaml +++ b/helm/capif/charts/ocf-api-provider-management/templates/configmap.yaml @@ -9,7 +9,7 @@ data: 'password': '{{ .Values.env.mongoInitdbRootPassword }}', 'db': 'capif', 'col': 'providerenrolmentdetails', - 'certs_col': "certs", + 'certs_col': 'certs', 'capif_users': 'user', 'host': 'mongo', 'port': "27017" diff --git a/helm/capif/charts/ocf-auditing-api-logs/templates/configmap.yaml b/helm/capif/charts/ocf-auditing-api-logs/templates/configmap.yaml index 729d751f..b06b6d15 100644 --- a/helm/capif/charts/ocf-auditing-api-logs/templates/configmap.yaml +++ b/helm/capif/charts/ocf-auditing-api-logs/templates/configmap.yaml @@ -9,7 +9,8 @@ data: 'password': '{{ .Values.env.mongoInitdbRootPassword }}', 'db': 'capif', 'logs_col': 'invocationlogs', - 'capif_users_col': "user", + 'capif_users_col': 'user', + 'certs_col': 'certs', 'host': 'mongo', 'port': "27017" } diff --git a/helm/capif/charts/ocf-discover-service-api/templates/configmap.yaml b/helm/capif/charts/ocf-discover-service-api/templates/configmap.yaml index 1db82bbf..1e217915 100644 --- a/helm/capif/charts/ocf-discover-service-api/templates/configmap.yaml +++ b/helm/capif/charts/ocf-discover-service-api/templates/configmap.yaml @@ -10,8 +10,8 @@ data: 'db': 'capif', 'col': 'serviceapidescriptions', 'invokers_col': 'invokerdetails', - 'capif_users_col': "user", - 'certs_col': "certs", + 'capif_users_col': 'user', + 'certs_col': 'certs', 'host': 'mongo', 'port': "27017" } diff --git a/helm/capif/charts/ocf-events/templates/configmap.yaml b/helm/capif/charts/ocf-events/templates/configmap.yaml index e599fef3..92697a2c 100644 --- a/helm/capif/charts/ocf-events/templates/configmap.yaml +++ b/helm/capif/charts/ocf-events/templates/configmap.yaml @@ -9,7 +9,7 @@ data: 'password': '{{ .Values.env.mongoInitdbRootPassword }}', 'db': 'capif', 'col': 'eventsdetails', - 'certs_col': "certs", + 'certs_col': 'certs', 'capif_invokers_col': 'invokerdetails', 'capif_providers_col': 'providerenrolmentdetails', 'capif_acls_col': 'acls', diff --git a/helm/capif/charts/ocf-publish-service-api/templates/configmap.yaml b/helm/capif/charts/ocf-publish-service-api/templates/configmap.yaml index a76b2f2b..651ad05b 100644 --- a/helm/capif/charts/ocf-publish-service-api/templates/configmap.yaml +++ b/helm/capif/charts/ocf-publish-service-api/templates/configmap.yaml @@ -9,8 +9,8 @@ data: 'password': '{{ .Values.env.mongoInitdbRootPassword }}', 'db': 'capif', 'col': 'serviceapidescriptions', - 'certs_col': "certs", - 'capif_provider_col': "providerenrolmentdetails", + 'certs_col': 'certs', + 'capif_provider_col': 'providerenrolmentdetails', 'host': 'mongo', 'port': "27017" } diff --git a/helm/capif/charts/ocf-security/templates/configmap.yaml b/helm/capif/charts/ocf-security/templates/configmap.yaml index 5d099d19..19e0c99b 100644 --- a/helm/capif/charts/ocf-security/templates/configmap.yaml +++ b/helm/capif/charts/ocf-security/templates/configmap.yaml @@ -10,7 +10,7 @@ data: 'db': 'capif', 'col': 'security', 'capif_service_col': 'serviceapidescriptions', - 'certs_col': "certs", + 'certs_col': 'certs', 'capif_invokers' : 'invokerdetails', 'host': 'mongo', 'port': "27017" -- GitLab From b64590c4f4db91ed1644e768da0fc24c306861f0 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Tue, 15 Jul 2025 13:48:45 +0200 Subject: [PATCH 3/3] event req moved to a new folder under tests folders --- tests/features/Event Req/__init__.robot | 2 ++ tests/features/{Event Filter => Event Req}/event_req.robot | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 tests/features/Event Req/__init__.robot rename tests/features/{Event Filter => Event Req}/event_req.robot (99%) diff --git a/tests/features/Event Req/__init__.robot b/tests/features/Event Req/__init__.robot new file mode 100644 index 00000000..2b28f206 --- /dev/null +++ b/tests/features/Event Req/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Force Tags event_filter \ No newline at end of file diff --git a/tests/features/Event Filter/event_req.robot b/tests/features/Event Req/event_req.robot similarity index 99% rename from tests/features/Event Filter/event_req.robot rename to tests/features/Event Req/event_req.robot index caddaf9f..26b1b635 100644 --- a/tests/features/Event Filter/event_req.robot +++ b/tests/features/Event Req/event_req.robot @@ -20,7 +20,7 @@ ${SUBSCRIPTION_ID_NOT_VALID} not-valid *** Test Cases *** Invoker subscribe to Service API Available - [Tags] pelayo-1 mockserver + [Tags] event_req-1 mockserver # Initialize Mock server Init Mock Server -- GitLab