From b708aea6c4c633a50a3d424429477f969648e227 Mon Sep 17 00:00:00 2001 From: JorgeEcheva26 Date: Mon, 23 Sep 2024 13:11:56 +0200 Subject: [PATCH] More details --- doc/sdk-configuration.md | 2 +- samples/enviroment-variables-sample.txt | 23 +++++++++++++++++++ .../provider_api_description_sample.json | 0 scripts/utilities.py | 2 +- sdk/sdk.py | 12 ++++++++-- 5 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 samples/enviroment-variables-sample.txt rename {api-samples => samples}/provider_api_description_sample.json (100%) diff --git a/doc/sdk-configuration.md b/doc/sdk-configuration.md index 17ab21f..4b9fd47 100644 --- a/doc/sdk-configuration.md +++ b/doc/sdk-configuration.md @@ -5,7 +5,7 @@ Before configuration it's needed to have completed the [prerequirements](./sdk-p IMPORTANT: All jsons configuration files **MUST** be in the same folder ### **1. Configuration via Config.json** -This configuration could also be fullfilled by enviroment variables (EXAMPLE) +This file could also be fullfilled by [enviroment variables](../samples/enviroment-variables-sample.txt) - invoker_folder: The path (relative or absolute) of the folder you want to store your invoker information diff --git a/samples/enviroment-variables-sample.txt b/samples/enviroment-variables-sample.txt new file mode 100644 index 0000000..5226c79 --- /dev/null +++ b/samples/enviroment-variables-sample.txt @@ -0,0 +1,23 @@ +export CAPIF_HOST="capif-prev.mobilesandbox.cloud" +export REGISTER_HOST="registercapif-prev.mobilesandbox.cloud" +export CAPIF_HTTP_PORT="8080" +export CAPIF_HTTPS_PORT="36212" +export CAPIF_REGISTER_PORT="36211" +export CAPIF_INVOKER_USERNAME="echeva_0" +export CAPIF_INVOKER_PASSWORD="echevapass" +export CAPIF_REGISTER_USERNAME="admin" +export CAPIF_REGISTER_PASSWORD="password123" +export CAPIF_CALLBACK_URL="http://localhost:5000" +export DESCRIPTION="Dummy invoker" +export CSR_COMMON_NAME="test03" +export CSR_ORGANIZATIONAL_UNIT="test_app_ou" +export CSR_ORGANIZATION="test_app_o" +export CRS_LOCALITY="Madrid" +export CSR_STATE_OR_PROVINCE_NAME="Madrid" +export CSR_COUNTRY_NAME="ES" +export CSR_EMAIL_ADDRESS="test@example.com" +export CAPIF_INVOKER_FOLDER="/Users/IDB0128/Documents/OpenCapif/test_invoker_certificate_folder" +export CAPIF_PROVIDER_FOLDER="/Users/IDB0128/Documents/OpenCapif/test_provider_certificate_folder" +export CAPIF_APFS="1" +export CAPIF_AEFS="1" +export DEBUG_MODE="True" diff --git a/api-samples/provider_api_description_sample.json b/samples/provider_api_description_sample.json similarity index 100% rename from api-samples/provider_api_description_sample.json rename to samples/provider_api_description_sample.json diff --git a/scripts/utilities.py b/scripts/utilities.py index 911c8ad..0d5e833 100755 --- a/scripts/utilities.py +++ b/scripts/utilities.py @@ -7,5 +7,5 @@ def get_register_file()-> str : return "/Users/IDB0128/git_repos/pesp_capif_sdk/config/register.json" def provider_exposer_get_api_description_path() -> str: - return "/Users/IDB0128/git_repos/pesp_capif_sdk/api-samples/provider_api_description_sample.json" + return "/Users/IDB0128/git_repos/pesp_capif_sdk/samples/provider_api_description_sample.json" diff --git a/sdk/sdk.py b/sdk/sdk.py index df21552..54f71e1 100644 --- a/sdk/sdk.py +++ b/sdk/sdk.py @@ -7,7 +7,7 @@ import urllib3 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) -# Ahora realiza tu solicitud HTTPS a 'localhost' + from OpenSSL.SSL import FILETYPE_PEM from OpenSSL.crypto import ( @@ -27,11 +27,19 @@ from requests.exceptions import RequestsDependencyWarning warnings.filterwarnings("ignore", category=RequestsDependencyWarning) # Configuración básica del logger + +log_path = '../logs/sdk_logs.log' + +log_dir = os.path.dirname(log_path) + +if not os.path.exists(log_dir): + os.makedirs(log_dir) + logging.basicConfig( level=logging.NOTSET, # Nivel mínimo de severidad a registrar format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', # Formato del mensaje de log handlers=[ - logging.FileHandler("../Functionalities/sdk_logs.log"), # Registra en un archivo + logging.FileHandler(log_path), # Registra en un archivo logging.StreamHandler() # También muestra en la consola ] ) -- GitLab