X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2common%2Fconfig%2Fconfig.py;h=d4e7107d05b5cff48a29cd9afdd311f98c650f7b;hb=4aabbc42db31fb781f16eecf59223776cff3b034;hp=27695292bab819b412fb00ef8768e327510a42a0;hpb=eff417e84fdb8bea1b99b980267caea1006dbeaa;p=pti%2Fo2.git diff --git a/o2common/config/config.py b/o2common/config/config.py index 2769529..d4e7107 100644 --- a/o2common/config/config.py +++ b/o2common/config/config.py @@ -30,16 +30,24 @@ def get_config_path(): return path +def get_smo_ca_config_path(): + path = os.environ.get("SMO_CA_CONFIG", "/configs/smoca.crt") + return path + + def get_postgres_uri(): - host = os.environ.get("DB_HOST", "localhost") - port = 54321 if host == "localhost" else 5432 + # host = os.environ.get("DB_HOST", "localhost") + # port = 54321 if host == "localhost" else 5432 + host = "localhost" + port = 5432 password = os.environ.get("DB_PASSWORD", "o2ims123") user, db_name = "o2ims", "o2ims" return f"postgresql://{user}:{password}@{host}:{port}/{db_name}" def get_api_url(): - host_interal = os.environ.get("API_HOST", "localhost") + # host_interal = os.environ.get("API_HOST", "localhost") + host_interal = "localhost" host_external = os.environ.get("API_HOST_EXTERNAL_FLOATING") if config.conf.OCLOUD.API_HOST_EXTERNAL_FLOATING is not None and \ config.conf.OCLOUD.API_HOST_EXTERNAL_FLOATING != '': @@ -51,7 +59,7 @@ def get_api_url(): port_external = 30205 port = port_internal if host_external is None or host_external == '' \ else port_external - return f"http://{host}:{port}" + return f"https://{host}:{port}" def get_root_api_base(): @@ -71,8 +79,10 @@ def get_o2dms_api_base(): def get_redis_host_and_port(): - host = os.environ.get("REDIS_HOST", "localhost") - port = 63791 if host == "localhost" else 6379 + # host = os.environ.get("REDIS_HOST", "localhost") + # port = 63791 if host == "localhost" else 6379 + host = "localhost" + port = 6379 return dict(host=host, port=port) @@ -303,25 +313,22 @@ def get_events_yaml_filename(): return events_yaml_name return "/configs/events.yaml" -# get k8s host from env: - +# get k8s host from env: def get_k8s_host(): k8s_host = os.environ.get("KUBERNETES_SERVICE_HOST") if k8s_host is None: raise Exception('Get k8s host failed.') return k8s_host -# get k8s host port from env: - +# get k8s host port from env: def get_k8s_port(): k8s_port = os.environ.get("KUBERNETES_SERVICE_PORT_HTTPS", '443') return k8s_port -# token review url - +# token review url def get_review_url(): try: api = '/apis/authentication.k8s.io/v1/tokenreviews' @@ -330,9 +337,8 @@ def get_review_url(): except Exception: raise Exception('Get k8s review url failed') -# get reviewer token - +# get reviewer token def get_reviewer_token(): # token path default is below. token_path = '/var/run/secrets/kubernetes.io/serviceaccount/token' @@ -343,3 +349,16 @@ def get_reviewer_token(): def get_auth_provider(): return 'k8s' + + +def get_dms_support_profiles(): + profiles = config.conf.API.DMS_SUPPORT_PROFILES + if profiles is None or profiles == '': + profiles = [] + elif "[" in profiles and "]" in profiles: + profiles = profiles.replace("'", "").replace( + '"', "").replace('[', "").replace(']', "") + profiles = profiles.split(',') + if 'native_k8sapi' not in profiles: + profiles.append('native_k8sapi') + return profiles