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 1532d3a800fe890923174dc7d5e45c4bcde24938..c68a7ac08d0962dc5216c860d26698b231dc8a07 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 a024f595e40b90230df398b190d0757c1985b953..f2c2c796dae3df8f6348c38bef715ea5aaa32040 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 20734aac833b518495f1786a8d8050446d03742b..528fb75d3688c939a231f9641eca2e12af47651c 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 9df76a940f0eefc35393563737de49e9394cc081..c96578e69977f802b7b5e626e4eda7ec34a54500 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 0322a8f8e00e19c5a40c67a90676bdc56b0df909..7d676f6f996e590eefc6cfb00cc1095c37e0a893 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 7a1d6aee70a53b84aa37e1bffb859c2029367553..1a75d7da7835b30ae7c2a0f20c0eb7824f5beb5d 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 e7c4a06c7f6265e6d4d24225f09a11035ad6d4f6..9741ada8af90ac1dcf0a063324583334b74eda3b 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 7fd26913fcd9d1feda2d97e6ea1c2ceed0ae390e..76646b7f331afac2b5bff5d86441786517450c6f 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 cd7f91260727f8909a4ae613173ecb035f4f02ad..7c753ef94eb9589d7ccf4ab7d193c4e279790fbd 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 b398741466308665995b7ecc84673a969216ccb2..49502a95d15470f10cd2c65a27b234f26ff1303f 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"