From 283c2642a51dbbbe964aa7c6d23119747a1ad0e8 Mon Sep 17 00:00:00 2001
From: JorgeEcheva26 <jorge.echevarriauribarri.practicas@telefonica.es>
Date: Tue, 24 Sep 2024 12:29:13 +0200
Subject: [PATCH] ENV variables of discovery_filter
---
config/config.json | 2 +-
sdk/sdk.py | 31 +++++++++++++++++++++++++------
2 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/config/config.json b/config/config.json
index b842e19..85981c9 100644
--- a/config/config.json
+++ b/config/config.json
@@ -19,7 +19,7 @@
"aefs": "2",
"debug_mode": "True",
"discover_filter" : {
- "api-name": "",
+ "api-name": "Deployment",
"api-version": "",
"comm-type": "",
"protocol": "",
diff --git a/sdk/sdk.py b/sdk/sdk.py
index 7b27843..5272ab5 100644
--- a/sdk/sdk.py
+++ b/sdk/sdk.py
@@ -1657,6 +1657,26 @@ class ServiceDiscoverer:
capif_invoker_username = os.getenv('CAPIF_USERNAME', config.get('capif_username', '')).strip()
+ config=config["discover_filter"]
+ self.discover_filter = {
+ "api-name": os.getenv('API-NAME', config.get('api-name', '')).strip(),
+ "api-version": os.getenv('API-VERSION', config.get('api-version', '')).strip(),
+ "comm-type": os.getenv('COMM-TYPE', config.get('comm-type', '')).strip(),
+ "protocol": os.getenv('PROTOCOL', config.get('protocol', '')).strip(),
+ "aef-id": os.getenv('AEF-ID', config.get('aef-id', '')).strip(),
+ "data-format": os.getenv('DATA-FORMAT', config.get('data-format', '')).strip(),
+ "api-cat": os.getenv('API-CAT', config.get('api-cat', '')).strip(),
+ "preferred-aef-loc": os.getenv('PREFERRED-AEF-LOC', config.get('preferred-aef-loc', '')).strip(),
+ "req-api-prov-name": os.getenv('REQ-API-PROV-NAME', config.get('req-api-prov-name', '')).strip(),
+ "supported-features": os.getenv('SUPPORTED-FEATURES', config.get('supported-features', '')).strip(),
+ "api-supported-features": os.getenv('API-SUPPORTED-FEATURES', config.get('api-supported-features', '')).strip(),
+ "ue-ip-addr": os.getenv('UE-IP-ADDR', config.get('ue-ip-addr', '')).strip(),
+ "service-kpis": os.getenv('SERVICE-KPIS', config.get('service-kpis', '')).strip()
+ }
+
+
+
+
self.capif_invoker_username=capif_invoker_username
self.capif_host = capif_host
@@ -1905,19 +1925,18 @@ class ServiceDiscoverer:
"""
# Cargar los parámetros desde el archivo JSON
- json_path = self.config_path +"config.json"
- with open(json_path, 'r') as f:
- filters = json.load(f)
-
+
# Filtrar parámetros que no sean vacÃos "
- filters=filters["discover_filter"]
- query_params = {k: v for k, v in filters.items() if v }
+ filters=self.discover_filter
+ print(filters)
+ query_params = {k: v for k, v in filters.items() if v.strip() }
# Formar la URL con los parámetros de query
query_string = "&".join([f"{k}={v}" for k, v in query_params.items()])
url = f"https://{self.capif_host}:{self.capif_https_port}/{self.capif_api_details['discover_services_url']}{self.capif_api_details['api_invoker_id']}"
+
if query_string:
url += f"&{query_string}"
--
GitLab