From 894733136e8da37fbc13180926a70f7fd3420b16 Mon Sep 17 00:00:00 2001 From: JorgeEcheva26 Date: Tue, 12 Nov 2024 11:31:49 +0100 Subject: [PATCH] csr fail --- .../network_app_invoker_sample/capif_sdk_config_sample.json | 4 ++-- .../capif_sdk_config_sample.json | 4 ++-- opencapif_sdk/capif_invoker_connector.py | 6 +++--- opencapif_sdk/capif_provider_connector.py | 6 +++--- pyproject.toml | 2 +- samples/config_sample.json | 4 ++-- samples/enviroment_variables_sample.txt | 4 ++-- scripts/register_and_login.py | 2 +- setup.py | 2 +- test/capif_sdk_config_sample_test.json | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/network_app_samples/network_app_invoker_sample/capif_sdk_config_sample.json b/network_app_samples/network_app_invoker_sample/capif_sdk_config_sample.json index 1532d3a..c68a7ac 100644 --- a/network_app_samples/network_app_invoker_sample/capif_sdk_config_sample.json +++ b/network_app_samples/network_app_invoker_sample/capif_sdk_config_sample.json @@ -18,7 +18,7 @@ "csr_common_name": "", "csr_organizational_unit": "", "csr_organization": "", - "crs_locality": "", + "csr_locality": "", "csr_state_or_province_name": "", "csr_country_name": "", "csr_email_address": "" @@ -55,7 +55,7 @@ "csr_common_name": "", "csr_organizational_unit": "", "csr_organization": "", - "crs_locality": "", + "csr_locality": "", "csr_state_or_province_name": "", "csr_country_name": "", "csr_email_address": "" diff --git a/network_app_samples/network_app_provider_sample/capif_sdk_config_sample.json b/network_app_samples/network_app_provider_sample/capif_sdk_config_sample.json index a024f59..f2c2c79 100644 --- a/network_app_samples/network_app_provider_sample/capif_sdk_config_sample.json +++ b/network_app_samples/network_app_provider_sample/capif_sdk_config_sample.json @@ -17,7 +17,7 @@ "csr_common_name": "", "csr_organizational_unit": "", "csr_organization": "", - "crs_locality": "", + "csr_locality": "", "csr_state_or_province_name": "", "csr_country_name": "", "csr_email_address": "" @@ -44,7 +44,7 @@ "csr_common_name": "", "csr_organizational_unit": "", "csr_organization": "", - "crs_locality": "", + "csr_locality": "", "csr_state_or_province_name": "", "csr_country_name": "", "csr_email_address": "" diff --git a/opencapif_sdk/capif_invoker_connector.py b/opencapif_sdk/capif_invoker_connector.py index 20734aa..528fb75 100644 --- a/opencapif_sdk/capif_invoker_connector.py +++ b/opencapif_sdk/capif_invoker_connector.py @@ -94,7 +94,7 @@ class capif_invoker_connector: csr_common_name = os.getenv('INVOKER_CSR_COMMON_NAME', csr_config.get('csr_common_name', '')).strip() csr_organizational_unit = os.getenv('INVOKER_CSR_ORGANIZATIONAL_UNIT', csr_config.get('csr_organizational_unit', '')).strip() csr_organization = os.getenv('INVOKER_CSR_ORGANIZATION', csr_config.get('csr_organization', '')).strip() - crs_locality = os.getenv('INVOKER_CRS_LOCALITY', csr_config.get('crs_locality', '')).strip() + csr_locality = os.getenv('INVOKER_CSR_LOCALITY', csr_config.get('csr_locality', '')).strip() csr_state_or_province_name = os.getenv('INVOKER_CSR_STATE_OR_PROVINCE_NAME', csr_config.get('csr_state_or_province_name', '')).strip() csr_country_name = os.getenv('INVOKER_CSR_COUNTRY_NAME', csr_config.get('csr_country_name', '')).strip() csr_email_address = os.getenv('INVOKER_CSR_EMAIL_ADDRESS', csr_config.get('csr_email_address', '')).strip() @@ -125,7 +125,7 @@ class capif_invoker_connector: self.csr_common_name = "invoker_" + csr_common_name self.csr_organizational_unit = csr_organizational_unit self.csr_organization = csr_organization - self.crs_locality = crs_locality + self.csr_locality = csr_locality self.csr_state_or_province_name = csr_state_or_province_name self.csr_country_name = csr_country_name self.csr_email_address = csr_email_address @@ -248,7 +248,7 @@ class capif_invoker_connector: req.get_subject().CN = self.csr_common_name req.get_subject().O = self.csr_organization req.get_subject().OU = self.csr_organizational_unit - req.get_subject().L = self.crs_locality + req.get_subject().L = self.csr_locality req.get_subject().ST = self.csr_state_or_province_name req.get_subject().C = self.csr_country_name req.get_subject().emailAddress = self.csr_email_address diff --git a/opencapif_sdk/capif_provider_connector.py b/opencapif_sdk/capif_provider_connector.py index 9df76a9..c96578e 100644 --- a/opencapif_sdk/capif_provider_connector.py +++ b/opencapif_sdk/capif_provider_connector.py @@ -93,7 +93,7 @@ class capif_provider_connector: csr_common_name = os.getenv('PROVIDER_CSR_COMMON_NAME', cert_generation.get('csr_common_name', '')).strip() csr_organizational_unit = os.getenv('PROVIDER_CSR_ORGANIZATIONAL_UNIT', cert_generation.get('csr_organizational_unit', '')).strip() csr_organization = os.getenv('PROVIDER_CSR_ORGANIZATION', cert_generation.get('csr_organization', '')).strip() - crs_locality = os.getenv('PROVIDER_CRS_LOCALITY', cert_generation.get('crs_locality', '')).strip() + csr_locality = os.getenv('PROVIDER_CSR_LOCALITY', cert_generation.get('csr_locality', '')).strip() csr_state_or_province_name = os.getenv('PROVIDER_CSR_STATE_OR_PROVINCE_NAME', cert_generation.get('csr_state_or_province_name', '')).strip() csr_country_name = os.getenv('PROVIDER_CSR_COUNTRY_NAME', cert_generation.get('csr_country_name', '')).strip() csr_email_address = os.getenv('PROVIDER_CSR_EMAIL_ADDRESS', cert_generation.get('csr_email_address', '')).strip() @@ -123,7 +123,7 @@ class capif_provider_connector: self.csr_common_name = csr_common_name self.csr_organizational_unit = csr_organizational_unit self.csr_organization = csr_organization - self.crs_locality = crs_locality + self.csr_locality = csr_locality self.csr_state_or_province_name = csr_state_or_province_name self.csr_country_name = csr_country_name self.csr_email_address = csr_email_address @@ -232,7 +232,7 @@ class capif_provider_connector: subject.CN = api_prov_func_role.lower() subject.O = self.csr_organization subject.OU = self.csr_organizational_unit - subject.L = self.crs_locality + subject.L = self.csr_locality subject.ST = self.csr_state_or_province_name subject.C = self.csr_country_name subject.emailAddress = self.csr_email_address diff --git a/pyproject.toml b/pyproject.toml index 0322a8f..7d676f6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "opencapif_sdk" -version = "0.1.13" +version = "0.1.14" authors = [ { name="JorgeEcheva", email="jorge.echevarriauribarri.practicas@telefonica.com" }, { name="dgs-cgm", email="daniel.garciasanchez@telefonica.com" } diff --git a/samples/config_sample.json b/samples/config_sample.json index 7a1d6ae..1a75d7d 100644 --- a/samples/config_sample.json +++ b/samples/config_sample.json @@ -18,7 +18,7 @@ "csr_common_name": "", "csr_organizational_unit": "", "csr_organization": "", - "crs_locality": "", + "csr_locality": "", "csr_state_or_province_name": "", "csr_country_name": "", "csr_email_address": "" @@ -56,7 +56,7 @@ "csr_common_name": "", "csr_organizational_unit": "", "csr_organization": "", - "crs_locality": "", + "csr_locality": "", "csr_state_or_province_name": "", "csr_country_name": "", "csr_email_address": "" diff --git a/samples/enviroment_variables_sample.txt b/samples/enviroment_variables_sample.txt index e7c4a06..9741ada 100644 --- a/samples/enviroment_variables_sample.txt +++ b/samples/enviroment_variables_sample.txt @@ -15,7 +15,7 @@ export INVOKER_CAPIF_CALLBACK_URL=https://your_callback_url export INVOKER_CSR_COMMON_NAME=your_csr_common_name export INVOKER_CSR_ORGANIZATIONAL_UNIT=your_organizational_unit export INVOKER_CSR_ORGANIZATION=your_organization -export INVOKER_CRS_LOCALITY=your_locality +export INVOKER_CSR_LOCALITY=your_locality export INVOKER_CSR_STATE_OR_PROVINCE_NAME=your_state_or_province export INVOKER_CSR_COUNTRY_NAME=your_country_name export INVOKER_CSR_EMAIL_ADDRESS=your_email_address @@ -45,7 +45,7 @@ export PROVIDER_FOLDER=/path/to/provider/folder export PROVIDER_CSR_COMMON_NAME=your_csr_common_name export PROVIDER_CSR_ORGANIZATIONAL_UNIT=your_organizational_unit export PROVIDER_CSR_ORGANIZATION=your_organization -export PROVIDER_CRS_LOCALITY=your_locality +export PROVIDER_CSR_LOCALITY=your_locality export PROVIDER_CSR_STATE_OR_PROVINCE_NAME=your_state_or_province export PROVIDER_CSR_COUNTRY_NAME=your_country_name export PROVIDER_CSR_EMAIL_ADDRESS=your_email_address diff --git a/scripts/register_and_login.py b/scripts/register_and_login.py index 7fd2691..76646b7 100644 --- a/scripts/register_and_login.py +++ b/scripts/register_and_login.py @@ -55,7 +55,7 @@ def __create_user(admin_token, variables): "description": "description", "email": "csr_email_address@tid.es", "enterprise": "csr_organization", - "country": "crs_locality", + "country": "csr_locality", "purpose": "SDK for SAFE 6G", } headers = { diff --git a/setup.py b/setup.py index cd7f912..7c753ef 100644 --- a/setup.py +++ b/setup.py @@ -5,5 +5,5 @@ from setuptools import setup, find_packages setup( name='opencapif_sdk', packages=find_packages(include=["opencapif_sdk"]), - version="0.1.13", + version="0.1.14", ) \ No newline at end of file diff --git a/test/capif_sdk_config_sample_test.json b/test/capif_sdk_config_sample_test.json index b398741..49502a9 100644 --- a/test/capif_sdk_config_sample_test.json +++ b/test/capif_sdk_config_sample_test.json @@ -18,7 +18,7 @@ "csr_common_name": "Echeva", "csr_organizational_unit": "discovery", "csr_organization": "telefonica", - "crs_locality": "madrid", + "csr_locality": "madrid", "csr_state_or_province_name": "madrid", "csr_country_name": "ES", "csr_email_address": "adios@gmail.com" @@ -45,7 +45,7 @@ "csr_common_name": "provider", "csr_organizational_unit": "discovery", "csr_organization": "telefonica", - "crs_locality": "madrid", + "csr_locality": "madrid", "csr_state_or_province_name": "madrid", "csr_country_name": "ES", "csr_email_address": "hola@gmail.com" -- GitLab