Merge pull request #10 from Telefonica/api-description-generation (3eaa4779) · Commits · OCF / sdk

network_app_samples/network_app_invoker_sample/capif_sdk_config_sample.json

+2 −2

Original line number	Diff line number	Diff line
		@@ -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": ""

network_app_samples/network_app_provider_sample/capif_sdk_config_sample.json

+2 −2

Original line number	Diff line number	Diff line
		@@ -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": ""

opencapif_sdk/capif_invoker_connector.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -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

opencapif_sdk/capif_provider_connector.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -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

pyproject.toml

+2 −2

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

		[project]
		name = "opencapif_sdk"
		version = "0.1.13"
		version = "0.1.15"
		authors = [
		{ name="JorgeEcheva", email="jorge.echevarriauribarri.practicas@telefonica.com" },
		{ name="dgs-cgm", email="daniel.garciasanchez@telefonica.com" }
		@@ -27,7 +27,7 @@ dependencies = [
		"Jinja2==3.1.4",
		"MarkupSafe==2.1.5",
		"six==1.16.0",
		"typing-extensions==3.10.0.2",
		"typing-extensions>=4.8.0",
		"Werkzeug==3.0.4",
		"pytest==8.3.2",
		"flake8==3.9.2",