Commit e1c050f9 authored by Sergio Gimenez's avatar Sergio Gimenez
Browse files

Allow config file passed by env var, that way we can have several conf files.

parent 7d116cc4

src/adapters/fm_adapter/federation_management.py

+3 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
# -------------------------------------------------------------------------- #

from configparser import ConfigParser

from mongoengine.errors import ValidationError

import os





from models.federation_context_id import FederationContextId  # noqa: E501
@@ -27,7 +28,8 @@ from adapters.error import APIError 




CONFIG = ConfigParser()

CONFIG.read("conf/config.cfg")

config_file = os.environ.get("FM_CONFIG_FILE", "conf/config.cfg")

CONFIG.read(config_file)

partnerOPFederationId = CONFIG.get("op_data", "partnerOPFederationId")

partnerOPCountryCode = CONFIG.get("op_data", "partnerOPCountryCode")

partnerOPMobileNetworkCode_MCC = CONFIG.get("op_data", "partnerOPMobileNetworkCode_MCC")

src/adapters/tf_adapter/artefact_management.py

+5 −2
Original line number Diff line number Diff line
@@ -26,9 +26,11 @@ from models.mongo_document import OriginatingApplicationOnboardingManagement 
from clients import artefact_manager

from clients import tf_sdk

from configparser import ConfigParser

import os



CONFIG = ConfigParser()

CONFIG.read("conf/config.cfg")

config_file = os.environ.get("FM_CONFIG_FILE", "conf/config.cfg")

CONFIG.read(config_file)

ARTEFACT_MANAGER_ENABLED = CONFIG.getboolean("artefact_manager", "enabled")

DST_REGISTRY = CONFIG.get("artefact_manager", "dst_registry")

DST_USERNAME = CONFIG.get("artefact_manager", "dst_username")
@@ -271,7 +273,8 @@ def upload_artefact(body, federation_context_id, bearer_token=None, partner_api_ 
    # Onboarding artefact to Edge Cloud Platform

    try:

        response = tf_sdk.onboarding_artefact(body.to_gsma_input())

        if response.status_code != 200:

        print(f"DEBUG: ECP response status: {response.status_code}, body: {response.text}")

        if response.status_code not in [200, 201]:

            response_data = response.json()

            return response_data, 409

    except Exception as error:

src/adapters/tf_adapter/federation_management.py

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
import json

from configparser import ConfigParser

from mongoengine.errors import ValidationError

import os



from models.federation_context_id import FederationContextId  # noqa: E501

from models.federation_response_data import FederationResponseData  # noqa: E501
@@ -28,7 +29,8 @@ from adapters.error import APIError 
from clients import tf_sdk



CONFIG = ConfigParser()

CONFIG.read("conf/config.cfg")

config_file = os.environ.get("FM_CONFIG_FILE", "conf/config.cfg")

CONFIG.read(config_file)

partnerOPFederationId = CONFIG.get("op_data", "partnerOPFederationId")

partnerOPCountryCode = CONFIG.get("op_data", "partnerOPCountryCode")

partnerOPMobileNetworkCode_MCC = CONFIG.get("op_data", "partnerOPMobileNetworkCode_MCC")

src/api/federation_management.py

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
import connexion

from configparser import ConfigParser

from flask import abort

import os



from adapters.error import APIError

import util
@@ -25,7 +26,8 @@ from models.federation_context_id_partner_body import FederationContextIdPartner 
from adapters.injector import resolve_adapter



CONFIG = ConfigParser()

CONFIG.read("conf/config.cfg")

config_file = os.environ.get("FM_CONFIG_FILE", "conf/config.cfg")

CONFIG.read(config_file)

partnerOPFederationId = CONFIG.get("op_data", "partnerOPFederationId")

partnerOPCountryCode = CONFIG.get("op_data", "partnerOPCountryCode")

partnerOPMobileNetworkCode_MCC = CONFIG.get("op_data", "partnerOPMobileNetworkCode_MCC")

src/clients/artefact_manager.py

+3 −1
Original line number Diff line number Diff line
@@ -15,11 +15,13 @@ 
# -------------------------------------------------------------------------- #

import requests

from configparser import ConfigParser

import os



from requests import Response



CONFIG = ConfigParser()

CONFIG.read("conf/config.cfg")

config_file = os.environ.get("FM_CONFIG_FILE", "conf/config.cfg")

CONFIG.read(config_file)

HOST = CONFIG.get("artefact_manager", "host")

PORT = int(CONFIG.get("artefact_manager", "port"))

TIMEOUT_REQUESTS = 20