diff --git a/config/config.json b/config/config.json index 52db48bfb40247cb9092cd82dcd92e89bfeda751..56133c140df93b45527b071f441ce8fade88cebc 100644 --- a/config/config.json +++ b/config/config.json @@ -37,5 +37,6 @@ "serviceApiId":"addd0af19a424e54c87fc8b1fe4fba", "publisherAPFid":"APFd7feeefab02e127ec6817e7cda9ac7", "publisherAEFsids":["AEFb1f5ab26a98e3c24d5dfad26507a28","AEFb0fa4e048bea75f0f335cfa8b2a0aa"] - } + }, + "api_description_path":"" } \ No newline at end of file diff --git a/scripts/provider_publish_api.py b/scripts/provider_publish_api.py index e447c8a37aeb442d3bf18a06edb089fb25368a02..dddee28c2eeeb8acf12e549cc8cb0200c3409f04 100644 --- a/scripts/provider_publish_api.py +++ b/scripts/provider_publish_api.py @@ -15,8 +15,7 @@ def showcase_capif_nef_connector(): """ capif_connector = CAPIFProviderConnector(config_file=utilities.get_config_file()) - capif_connector.publish_services( - service_api_description_json_full_path=utilities.provider_exposer_get_api_description_path()) + capif_connector.publish_services() print("COMPLETED") if __name__ == "__main__": diff --git a/scripts/provider_update_api.py b/scripts/provider_update_api.py index 68a0d2d3ac51f834feab64b3e65d4dd21753c170..515a005747620a62d9d01d3ee673603b6dd11f98 100644 --- a/scripts/provider_update_api.py +++ b/scripts/provider_update_api.py @@ -15,8 +15,7 @@ def showcase_capif_nef_connector(): """ capif_connector = CAPIFProviderConnector(config_file=utilities.get_config_file()) - capif_connector.update_service( - service_api_description_json_full_path=utilities.provider_exposer_get_api_description_path()) + capif_connector.update_service() print("COMPLETED") if __name__ == "__main__": diff --git a/scripts/utilities.py b/scripts/utilities.py index 0d5e8334c3eebbfb42dd88c008543c516b5d9baa..3d3f73d275260c1e3fd216f9e43649d305459604 100755 --- a/scripts/utilities.py +++ b/scripts/utilities.py @@ -6,6 +6,4 @@ def get_config_file()-> str : 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/samples/provider_api_description_sample.json" diff --git a/sdk/sdk.py b/sdk/sdk.py index 486ddb1ae4acd549639a667c923f8fdbd8c4dbca..d2646203c76c108f96ec2b0c284d397882bdf25e 100644 --- a/sdk/sdk.py +++ b/sdk/sdk.py @@ -511,7 +511,7 @@ class CAPIFProviderConnector: csr_email_address = os.getenv('CSR_EMAIL_ADDRESS', config.get('csr_email_address', '')).strip() APFs = os.getenv('APFS', config.get('APFs', '')).strip() AEFs = os.getenv('AEFS', config.get('AEFs', '')).strip() - + api_description_path = os.getenv('API_DESCRIPTION_PATH', config.get('api_description_path', '')).strip() if not capif_host: self.logger.warning("CAPIF_HOST is not provided; defaulting to an empty string") @@ -536,7 +536,7 @@ class CAPIFProviderConnector: self.csr_email_address = csr_email_address self.AEFs = int(AEFs) self.APFs = int(APFs) - + self.api_description_path=api_description_path self.capif_https_port = str(capif_https_port) @@ -781,7 +781,7 @@ class CAPIFProviderConnector: - def publish_services(self, service_api_description_json_full_path: str) -> dict: + def publish_services(self) -> dict: """ Publishes services to CAPIF and returns the published services dictionary. @@ -820,7 +820,7 @@ class CAPIFProviderConnector: if apf_number is None: self.logger.error(f"No matching APF found for publisherAPFid: {APF_api_prov_func_id}") raise ValueError("Invalid publisherAPFid") - + service_api_description_json_full_path = self.api_description_path # Leer y modificar la descripción de la API de servicio self.logger.info(f"Reading and modifying service API description from {service_api_description_json_full_path}") @@ -1178,7 +1178,7 @@ class CAPIFProviderConnector: self.logger.error(f"Unexpected error during services reception: {e} - Response: {response.text}") raise - def update_service(self, service_api_description_json_full_path: str) -> dict: + def update_service(self) -> dict: """ Publishes services to CAPIF and returns the published services dictionary. @@ -1219,6 +1219,7 @@ class CAPIFProviderConnector: self.logger.error(f"No matching APF found for publisherAPFid: {APF_api_prov_func_id}") raise ValueError("Invalid publisherAPFid") + service_api_description_json_full_path = self.api_description_path # Leer y modificar la descripción de la API de servicio self.logger.info(f"Reading and modifying service API description from {service_api_description_json_full_path}")