From 07c8d687ae186c9e5736787fc1c57032c6ed43d7 Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Thu, 13 Jun 2024 12:31:38 +0200 Subject: [PATCH 1/6] fix --- services/register/config.yaml | 12 ++++++++---- .../register_service/core/register_operations.py | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/services/register/config.yaml b/services/register/config.yaml index f63df9f..182818b 100644 --- a/services/register/config.yaml +++ b/services/register/config.yaml @@ -12,11 +12,15 @@ ca_factory: { "port": "8200", "token": "dev-only-token" } +ccf: { + "url": "capifcore", + "helper_remove_user": "/helper/deleteEntities/" +} register: { - register_uuid: '6ba7b810-9dad-11d1-80b4-00c04fd430c8', - refresh_expiration: 30, #days - token_expiration: 10, #mins - admin_users: {admin_user: "admin", + "register_uuid": '6ba7b810-9dad-11d1-80b4-00c04fd430c8', + "refresh_expiration": 30, #days + "token_expiration": 10, #mins + "admin_users": {admin_user: "admin", admin_pass: "password123"} } \ No newline at end of file diff --git a/services/register/register_service/core/register_operations.py b/services/register/register_service/core/register_operations.py index b76d092..5082d51 100644 --- a/services/register/register_service/core/register_operations.py +++ b/services/register/register_service/core/register_operations.py @@ -1,4 +1,4 @@ -from flask import Flask, jsonify, request, Response +from flask import Flask, jsonify, request, Response, current_app from flask_jwt_extended import create_access_token from ..db.db import MongoDatabse from datetime import datetime @@ -63,7 +63,7 @@ class RegisterOperations: try: - url = f"https://capifcore/helper/deleteEntities/{uuid}" + url = f"https://{self.config["ccf"]["url"]}{self.config["ccf"]["helper_remove_user"]}{uuid}" requests.delete(url, cert=("register_service/certs/superadmin.crt", "register_service/certs/superadmin.key"), verify="register_service/certs/ca_root.crt") mycol.delete_one({"uuid": uuid}) -- GitLab From 60e6c3d46f164759842958519375b433fe43b0ca Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Fri, 14 Jun 2024 11:40:12 +0200 Subject: [PATCH 2/6] fix --- services/register/config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/services/register/config.yaml b/services/register/config.yaml index 182818b..258821f 100644 --- a/services/register/config.yaml +++ b/services/register/config.yaml @@ -12,6 +12,7 @@ ca_factory: { "port": "8200", "token": "dev-only-token" } + ccf: { "url": "capifcore", "helper_remove_user": "/helper/deleteEntities/" -- GitLab From 40c0ed052fc15c88a4be17ffb52575584de5fceb Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Fri, 14 Jun 2024 11:54:11 +0200 Subject: [PATCH 3/6] ocf-register.env.capifHostname --- helm/capif/charts/ocf-register/templates/configmap.yaml | 4 ++++ helm/capif/charts/ocf-register/values.yaml | 1 + 2 files changed, 5 insertions(+) diff --git a/helm/capif/charts/ocf-register/templates/configmap.yaml b/helm/capif/charts/ocf-register/templates/configmap.yaml index cf801f4..22214a8 100644 --- a/helm/capif/charts/ocf-register/templates/configmap.yaml +++ b/helm/capif/charts/ocf-register/templates/configmap.yaml @@ -18,6 +18,10 @@ data: "port": "{{ .Values.env.vaultPort }}", "token": "{{ .Values.env.vaultAccessToken }}" } + ccf: { + "url": "{{ .Values.env.capifHostname }}", + "helper_remove_user": "/helper/deleteEntities/" + } register: { register_uuid: '6ba7b810-9dad-11d1-80b4-00c04fd430c8', refresh_expiration: 30, #days diff --git a/helm/capif/charts/ocf-register/values.yaml b/helm/capif/charts/ocf-register/values.yaml index b9e9e49..5605ef8 100644 --- a/helm/capif/charts/ocf-register/values.yaml +++ b/helm/capif/charts/ocf-register/values.yaml @@ -20,6 +20,7 @@ env: vaultHostname: vault vaultPort: 8200 vaultAccessToken: dev-only-token + capifHostname: capif-test.example.int serviceAccount: # Specifies whether a service account should be created -- GitLab From d1d7f7eae34064f5c452a824bed6f7d968181000 Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Fri, 14 Jun 2024 12:09:27 +0200 Subject: [PATCH 4/6] ocf-mon- --- helm/capif/charts/ocf-register/templates/configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/capif/charts/ocf-register/templates/configmap.yaml b/helm/capif/charts/ocf-register/templates/configmap.yaml index 22214a8..0c01aed 100644 --- a/helm/capif/charts/ocf-register/templates/configmap.yaml +++ b/helm/capif/charts/ocf-register/templates/configmap.yaml @@ -28,4 +28,4 @@ data: token_expiration: 10, #mins admin_users: {admin_user: "admin", admin_pass: "password123"} - } \ No newline at end of file + } -- GitLab From 203841f7e8d12e6a0e7cc740551f4f166329cb42 Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Fri, 14 Jun 2024 12:15:25 +0200 Subject: [PATCH 5/6] ocf-pre-staging env ocf-register --- helm/capif/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/capif/values.yaml b/helm/capif/values.yaml index a2c7347..d9c8a80 100644 --- a/helm/capif/values.yaml +++ b/helm/capif/values.yaml @@ -176,4 +176,4 @@ monitoring: # -- If ingressRoute enable=true, use monitoring.grafana.ingress.enabled="" ingressRoute: enable: "" - host: grafana.5gnacar.int + host: grafana.5gnacar.int \ No newline at end of file -- GitLab From fa88d4a4983f5d661acb4f30b3e751a4115086bc Mon Sep 17 00:00:00 2001 From: andresanaya21 Date: Fri, 14 Jun 2024 12:21:37 +0200 Subject: [PATCH 6/6] ocf-pre-staging --- helm/capif/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/capif/values.yaml b/helm/capif/values.yaml index d9c8a80..a2c7347 100644 --- a/helm/capif/values.yaml +++ b/helm/capif/values.yaml @@ -176,4 +176,4 @@ monitoring: # -- If ingressRoute enable=true, use monitoring.grafana.ingress.enabled="" ingressRoute: enable: "" - host: grafana.5gnacar.int \ No newline at end of file + host: grafana.5gnacar.int -- GitLab