diff --git a/README.md b/README.md index 50179afa459af4ef6ac4222688dad28f797c1e47..eeed01831d17574b31840fc7e30f9e3ff445c02d 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ pip install -r requirements.txt # How to use OpenCAPIF SDK -1 - First it is required to complete the emulator utils file with the absolute paths of target environment in order to complete the configuration of the SDK: +1 - First it is required to complete the utilities file with the absolute paths of target environment in order to complete the configuration of the SDK: - NOTE register file is not needed for the use of the SDK, - NOTE provider_exposer_get_sample_api_description_path is mandatory if publish functionalities are required. @@ -156,6 +156,7 @@ IMPORTANT: In order to leverage OpenCAPIF SDK it is required to have registered "debug_mode": Boolean | If you want to recieve logs from SDK-S6G Example:True/False +This configuration could also be fullfilled by enviroment variables Mandatory fields no matter the target role to be onboarded, either invoker or provider: diff --git a/scripts/deregister_and_login.py b/scripts/deregister_and_login.py index 317c9bbe02403e4aba9f6eb28a1f19d1e4f2bea3..efaa0902177653fbff38bc58f62660e9e731e238 100644 --- a/scripts/deregister_and_login.py +++ b/scripts/deregister_and_login.py @@ -2,7 +2,7 @@ import json import logging import requests import urllib3 -import emulator_utils +import utilities from requests.auth import HTTPBasicAuth urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -19,7 +19,7 @@ logging.basicConfig( def main(): - variables=__load_config_file(config_file=emulator_utils.get_register_file()) + variables=__load_config_file(config_file=utilities.get_register_file()) log_result = __log_to_capif(variables) admintoken = log_result["access_token"] de_register_from_capif(admintoken,variables) diff --git a/scripts/invoker_capif_connector.py b/scripts/invoker_capif_connector.py index 61fd3993cc14470c22d74152acb4aca16c949b17..abc7ae7e1d01d56a445de7a836a2e78c074dad13 100755 --- a/scripts/invoker_capif_connector.py +++ b/scripts/invoker_capif_connector.py @@ -1,7 +1,7 @@ import sys import os -import emulator_utils +import utilities # Añadir el directorio del SDK al PYTHONPATH usando una ruta relativa script_dir = os.path.dirname(os.path.abspath(__file__)) # Directorio actual del script @@ -17,7 +17,7 @@ def showcase_capif_connector(): """ - capif_connector = CAPIFInvokerConnector(config_file=emulator_utils.get_config_file()) + capif_connector = CAPIFInvokerConnector(config_file=utilities.get_config_file()) capif_connector.register_and_onboard_Invoker() print("COMPLETED") diff --git a/scripts/invoker_capif_connector_offboarding.py b/scripts/invoker_capif_connector_offboarding.py index 94660893e4aca5affbae947fcbdeeda189d29792..cceed636476d11bcf504c037df9d6b53bcff325a 100755 --- a/scripts/invoker_capif_connector_offboarding.py +++ b/scripts/invoker_capif_connector_offboarding.py @@ -2,7 +2,7 @@ import sys import os -import emulator_utils +import utilities # Añadir el directorio del SDK al PYTHONPATH usando una ruta relativa script_dir = os.path.dirname(os.path.abspath(__file__)) # Directorio actual del script @@ -14,7 +14,7 @@ from sdk import CAPIFInvokerConnector def showcase_offboard_and_deregister_invoker(): - capif_connector = CAPIFInvokerConnector(config_file=emulator_utils.get_config_file()) + capif_connector = CAPIFInvokerConnector(config_file=utilities.get_config_file()) capif_connector.offboard_and_deregister_Invoker() print("COMPLETED") diff --git a/scripts/invoker_service_discovery.py b/scripts/invoker_service_discovery.py index 744d2a0ba13573ef9c1ab94a1f1155d074295319..05fc4b319c27136367e55e1f8e567d8cce8b5515 100755 --- a/scripts/invoker_service_discovery.py +++ b/scripts/invoker_service_discovery.py @@ -1,6 +1,6 @@ import sys import os -import emulator_utils +import utilities # Añadir el directorio del SDK al PYTHONPATH usando una ruta relativa script_dir = os.path.dirname(os.path.abspath(__file__)) # Directorio actual del script @@ -13,7 +13,7 @@ from sdk import ServiceDiscoverer def showcase_access_token_retrieval_from_capif(): - service_discoverer = ServiceDiscoverer(config_file=emulator_utils.get_config_file()) + service_discoverer = ServiceDiscoverer(config_file=utilities.get_config_file()) service_discoverer.discover() diff --git a/scripts/invoker_service_get_token.py b/scripts/invoker_service_get_token.py index 6621491f9ce7fb48c9b171135bda034df68c96ac..cc87de6169aa92693a4acac88995ba903909b19c 100755 --- a/scripts/invoker_service_get_token.py +++ b/scripts/invoker_service_get_token.py @@ -1,6 +1,6 @@ import sys import os -import emulator_utils +import utilities # Añadir el directorio del SDK al PYTHONPATH usando una ruta relativa script_dir = os.path.dirname(os.path.abspath(__file__)) # Directorio actual del script @@ -14,7 +14,7 @@ from sdk import ServiceDiscoverer def showcase_access_token_retrieval_from_capif(): - service_discoverer = ServiceDiscoverer(config_file=emulator_utils.get_config_file()) + service_discoverer = ServiceDiscoverer(config_file=utilities.get_config_file()) service_discoverer.get_tokens() diff --git a/scripts/provider_capif_connector.py b/scripts/provider_capif_connector.py index b2fb5d017251608c19a6ca4b1aac00200e039a20..1df3d212f8369d1bd7bfecc8d236842749d17f81 100755 --- a/scripts/provider_capif_connector.py +++ b/scripts/provider_capif_connector.py @@ -1,6 +1,6 @@ import sys import os -import emulator_utils +import utilities # Añadir el directorio del SDK al PYTHONPATH usando una ruta relativa script_dir = os.path.dirname(os.path.abspath(__file__)) # Directorio actual del script @@ -13,7 +13,7 @@ def showcase_capif_nef_connector(): """ """ - capif_connector = CAPIFProviderConnector(config_file=emulator_utils.get_config_file()) + capif_connector = CAPIFProviderConnector(config_file=utilities.get_config_file()) capif_connector.register_and_onboard_provider() diff --git a/scripts/provider_capif_connector_offboarding.py b/scripts/provider_capif_connector_offboarding.py index 18fc3a7c0634ec5a448931bdeb17976a9c63829b..93028bb5c1340be154de7a0e1d69747701610d75 100755 --- a/scripts/provider_capif_connector_offboarding.py +++ b/scripts/provider_capif_connector_offboarding.py @@ -1,6 +1,6 @@ import sys import os -import emulator_utils +import utilities # Añadir el directorio del SDK al PYTHONPATH usando una ruta relativa script_dir = os.path.dirname(os.path.abspath(__file__)) # Directorio actual del script @@ -13,7 +13,7 @@ from sdk import CAPIFProviderConnector def offboard_capif_nef_connector(): """ """ - capif_connector = CAPIFProviderConnector(config_file=emulator_utils.get_config_file()) + capif_connector = CAPIFProviderConnector(config_file=utilities.get_config_file()) capif_connector.offboard_and_deregister_nef() print("COMPLETED") diff --git a/scripts/provider_get_all_published_api.py b/scripts/provider_get_all_published_api.py index 64044634242fab23d761ca0d6fced7c9c7cce0a7..5e7b04655cd8aad05a5fa749b258da87bf681bf6 100644 --- a/scripts/provider_get_all_published_api.py +++ b/scripts/provider_get_all_published_api.py @@ -1,6 +1,6 @@ import sys import os -import emulator_utils +import utilities # Añadir el directorio del SDK al PYTHONPATH usando una ruta relativa script_dir = os.path.dirname(os.path.abspath(__file__)) # Directorio actual del script @@ -13,7 +13,7 @@ def showcase_capif_nef_connector(): """ """ - capif_connector = CAPIFProviderConnector(config_file=emulator_utils.get_config_file()) + capif_connector = CAPIFProviderConnector(config_file=utilities.get_config_file()) capif_connector.get_all_services() print("COMPLETED") diff --git a/scripts/provider_get_published_api.py b/scripts/provider_get_published_api.py index aa603c2bbe2863601a870fed7908cf35e113b4fe..68767078075ae16351ee987e30be18569a7f5e97 100644 --- a/scripts/provider_get_published_api.py +++ b/scripts/provider_get_published_api.py @@ -1,6 +1,6 @@ import sys import os -import emulator_utils +import utilities # Añadir el directorio del SDK al PYTHONPATH usando una ruta relativa script_dir = os.path.dirname(os.path.abspath(__file__)) # Directorio actual del script @@ -13,7 +13,7 @@ def showcase_capif_nef_connector(): """ """ - capif_connector = CAPIFProviderConnector(config_file=emulator_utils.get_config_file()) + capif_connector = CAPIFProviderConnector(config_file=utilities.get_config_file()) capif_connector.get_service() print("COMPLETED") diff --git a/scripts/provider_publish_api.py b/scripts/provider_publish_api.py index 694326e2ab5a4dade07feb78a2159c75f8f13177..68af744ad4d8ae8e07a30b08cc2f0c9cfc04fcd2 100644 --- a/scripts/provider_publish_api.py +++ b/scripts/provider_publish_api.py @@ -1,6 +1,6 @@ import sys import os -import emulator_utils +import utilities # Añadir el directorio del SDK al PYTHONPATH usando una ruta relativa script_dir = os.path.dirname(os.path.abspath(__file__)) # Directorio actual del script @@ -13,10 +13,10 @@ def showcase_capif_nef_connector(): """ """ - capif_connector = CAPIFProviderConnector(config_file=emulator_utils.get_config_file()) + capif_connector = CAPIFProviderConnector(config_file=utilities.get_config_file()) capif_connector.publish_services( - service_api_description_json_full_path=emulator_utils.provider_exposer_get_sample_api_description_path()) + service_api_description_json_full_path=utilities.provider_exposer_get_sample_api_description_path()) print("COMPLETED") if __name__ == "__main__": diff --git a/scripts/provider_unpublish_api.py b/scripts/provider_unpublish_api.py index 6e9305a5d734553c58f10fd33c881bda14953594..607a9805b690369c2c9505baf034850ccb760b7a 100644 --- a/scripts/provider_unpublish_api.py +++ b/scripts/provider_unpublish_api.py @@ -1,6 +1,6 @@ import sys import os -import emulator_utils +import utilities # Añadir el directorio del SDK al PYTHONPATH usando una ruta relativa script_dir = os.path.dirname(os.path.abspath(__file__)) # Directorio actual del script @@ -13,7 +13,7 @@ def showcase_capif_nef_connector(): """ """ - capif_connector = CAPIFProviderConnector(config_file=emulator_utils.get_config_file()) + capif_connector = CAPIFProviderConnector(config_file=utilities.get_config_file()) capif_connector.unpublish_service() print("COMPLETED") diff --git a/scripts/provider_update_api.py b/scripts/provider_update_api.py index 6e7b18ef98a2515b0c145857b086fe4a3b005f38..bdebaa0e015c8ad7af33dc4e91c7782144a7325b 100644 --- a/scripts/provider_update_api.py +++ b/scripts/provider_update_api.py @@ -1,6 +1,6 @@ import sys import os -import emulator_utils +import utilities # Añadir el directorio del SDK al PYTHONPATH usando una ruta relativa script_dir = os.path.dirname(os.path.abspath(__file__)) # Directorio actual del script @@ -13,10 +13,10 @@ def showcase_capif_nef_connector(): """ """ - capif_connector = CAPIFProviderConnector(config_file=emulator_utils.get_config_file()) + capif_connector = CAPIFProviderConnector(config_file=utilities.get_config_file()) capif_connector.update_service( - service_api_description_json_full_path=emulator_utils.provider_exposer_get_sample_api_description_path()) + service_api_description_json_full_path=utilities.provider_exposer_get_sample_api_description_path()) print("COMPLETED") if __name__ == "__main__": diff --git a/scripts/register_and_login.py b/scripts/register_and_login.py index 30e66fcfddd6bdbba42b91bdf2ecb22cc8cc7ce7..fdc0cc4bb106d6726df69fbe67a1f0439fb5fcf0 100644 --- a/scripts/register_and_login.py +++ b/scripts/register_and_login.py @@ -2,7 +2,7 @@ import json import logging import requests import urllib3 -import emulator_utils +import utilities from requests.auth import HTTPBasicAuth urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) @@ -19,7 +19,7 @@ logging.basicConfig( def main(): - variables=__load_config_file(config_file=emulator_utils.get_register_file()) + variables=__load_config_file(config_file=utilities.get_register_file()) log_result = __log_to_capif(variables) admintoken = log_result["access_token"] postcreation = __create_user(admintoken,variables) diff --git a/scripts/emulator_utils.py b/scripts/utilities.py similarity index 100% rename from scripts/emulator_utils.py rename to scripts/utilities.py