Commit 8f467f47 authored by JorgeEcheva26's avatar JorgeEcheva26
Browse files

ENV variables of discovery_filter

parent aaf5661f

config/config.json

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    "aefs": "2",

    "debug_mode": "True",

    "discover_filter" : {

        "api-name": "",

        "api-name": "Deployment",

        "api-version": "",

        "comm-type": "",

        "protocol": "",

sdk/sdk.py

+25 −6
Original line number Diff line number Diff line
@@ -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}"