From 11f3b8b190bcd4fb16f86bdf0e2f069b43c34c64 Mon Sep 17 00:00:00 2001
From: JorgeEcheva26 <jorge.echevarriauribarri.practicas@telefonica.es>
Date: Tue, 24 Sep 2024 10:11:31 +0200
Subject: [PATCH] Unique configuration file
---
config/config.json | 8 ++++----
config/discover_filter.json | 15 ---------------
config/publish.json | 5 -----
samples/provider_api_description_sample.json | 4 ++--
scripts/invoker_capif_connector.py | 2 +-
scripts/invoker_capif_connector_offboarding.py | 2 +-
scripts/provider_update_api.py | 2 +-
sdk/sdk.py | 4 ++--
8 files changed, 11 insertions(+), 31 deletions(-)
delete mode 100644 config/discover_filter.json
delete mode 100644 config/publish.json
diff --git a/config/config.json b/config/config.json
index 084ec7b..52db48b 100644
--- a/config/config.json
+++ b/config/config.json
@@ -16,7 +16,7 @@
"capif_username": "echeva_0",
"capif_password": "echevapass",
"APFs": "1",
- "AEFs": "1",
+ "AEFs": "2",
"debug_mode": "True",
"discover_filter" : {
"api-name": "",
@@ -34,8 +34,8 @@
"service-kpis": ""
},
"publish_req" : {
- "serviceApiId":"",
- "publisherAPFid":"",
- "publisherAEFsids":["","",""]
+ "serviceApiId":"addd0af19a424e54c87fc8b1fe4fba",
+ "publisherAPFid":"APFd7feeefab02e127ec6817e7cda9ac7",
+ "publisherAEFsids":["AEFb1f5ab26a98e3c24d5dfad26507a28","AEFb0fa4e048bea75f0f335cfa8b2a0aa"]
}
}
\ No newline at end of file
diff --git a/config/discover_filter.json b/config/discover_filter.json
deleted file mode 100644
index 48854aa..0000000
--- a/config/discover_filter.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "api-name": "",
- "api-version": "",
- "comm-type": "",
- "protocol": "",
- "aef-id": "",
- "data-format": "",
- "api-cat": "",
- "preferred-aef-loc": "",
- "req-api-prov-name": "",
- "supported-features": "",
- "api-supported-features": "",
- "ue-ip-addr": "",
- "service-kpis": ""
-}
diff --git a/config/publish.json b/config/publish.json
deleted file mode 100644
index f7cd404..0000000
--- a/config/publish.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "serviceApiId":"",
- "publisherAPFid":"",
- "publisherAEFsids":["","",""]
-}
\ No newline at end of file
diff --git a/samples/provider_api_description_sample.json b/samples/provider_api_description_sample.json
index 1704320..016a34d 100755
--- a/samples/provider_api_description_sample.json
+++ b/samples/provider_api_description_sample.json
@@ -2,7 +2,7 @@
"apiName": "Api-de-prueba-2",
"aefProfiles": [
{
- "aefId": "",
+ "aefId": "AEFb1f5ab26a98e3c24d5dfad26507a28",
"versions": [
{
"apiVersion": "v1",
@@ -61,7 +61,7 @@
]
},
{
- "aefId": "",
+ "aefId": "AEFb0fa4e048bea75f0f335cfa8b2a0aa",
"versions": [
{
"apiVersion": "v1",
diff --git a/scripts/invoker_capif_connector.py b/scripts/invoker_capif_connector.py
index b07b440..a604812 100755
--- a/scripts/invoker_capif_connector.py
+++ b/scripts/invoker_capif_connector.py
@@ -19,7 +19,7 @@ def showcase_capif_connector():
capif_connector = CAPIFInvokerConnector(config_file=utilities.get_config_file())
- capif_connector.register_and_onboard_invoker()
+ capif_connector.onboard_invoker()
print("COMPLETED")
if __name__ == "__main__":
diff --git a/scripts/invoker_capif_connector_offboarding.py b/scripts/invoker_capif_connector_offboarding.py
index f865e8e..38b9a63 100755
--- a/scripts/invoker_capif_connector_offboarding.py
+++ b/scripts/invoker_capif_connector_offboarding.py
@@ -15,7 +15,7 @@ from sdk import CAPIFInvokerConnector
def showcase_offboard_and_deregister_invoker():
capif_connector = CAPIFInvokerConnector(config_file=utilities.get_config_file())
- capif_connector.offboard_and_deregister_invoker()
+ capif_connector.offboard_invoker()
print("COMPLETED")
diff --git a/scripts/provider_update_api.py b/scripts/provider_update_api.py
index bdebaa0..68a0d2d 100644
--- a/scripts/provider_update_api.py
+++ b/scripts/provider_update_api.py
@@ -16,7 +16,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_sample_api_description_path())
+ service_api_description_json_full_path=utilities.provider_exposer_get_api_description_path())
print("COMPLETED")
if __name__ == "__main__":
diff --git a/sdk/sdk.py b/sdk/sdk.py
index 61e17fc..486ddb1 100644
--- a/sdk/sdk.py
+++ b/sdk/sdk.py
@@ -1569,7 +1569,7 @@ class CAPIFProviderConnector:
role_prefix = indexed_roles[i]
if any(file_name.startswith(prefix) and role_prefix==prefix for prefix in [f"APF-{i+1}", f"AEF-{i+1}", "AMF"]):
file_path = os.path.join(root, file_name)
- print(file_name)
+
# Leer la clave pública del archivo
with open(file_path, "r") as csr_file:
api_func["regInfo"]["apiProvPubKey"] = csr_file.read()
@@ -1582,7 +1582,7 @@ class CAPIFProviderConnector:
# Si no se encuentra un archivo con la clave pública, generar una nueva clave
if not found_key:
- print(indexed_roles[i])
+
public_key = self.__create_private_and_public_keys(indexed_roles[i])
api_func["regInfo"]["apiProvPubKey"] = public_key.decode("utf-8")
--
GitLab