X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2common%2Fconfig%2Fconfig.py;h=d045315300cfda8a19e7111b1ed65b26cad35298;hb=refs%2Fchanges%2F56%2F12756%2F1;hp=8946bdf0341b92826f23736f1ff5845dba687b44;hpb=5893fa9d751d3e00324b22dfbdea024722ab9272;p=pti%2Fo2.git diff --git a/o2common/config/config.py b/o2common/config/config.py index 8946bdf..d045315 100644 --- a/o2common/config/config.py +++ b/o2common/config/config.py @@ -1,4 +1,4 @@ -# Copyright (C) 2021-2022 Wind River Systems, Inc. +# Copyright (C) 2021-2024 Wind River Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,8 +14,10 @@ import os import sys +import ipaddress from urllib.parse import urlparse +from o2common import config from o2common.helper import o2logging logger = o2logging.get_logger(__name__) @@ -36,7 +38,7 @@ def get_smo_ca_config_path(): def get_postgres_uri(): host = os.environ.get("DB_HOST", "localhost") - port = 54321 if host == "localhost" else 5432 + port = int(os.environ.get("DB_PORT", 5432)) password = os.environ.get("DB_PASSWORD", "o2ims123") user, db_name = "o2ims", "o2ims" return f"postgresql://{user}:{password}@{host}:{port}/{db_name}" @@ -45,6 +47,9 @@ def get_postgres_uri(): def get_api_url(): host_interal = os.environ.get("API_HOST", "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 != '': + host_external = config.conf.OCLOUD.API_HOST_EXTERNAL_FLOATING host = host_interal if host_external is None or host_external == '' \ else host_external @@ -52,7 +57,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(): @@ -63,6 +68,14 @@ def get_o2ims_api_base(): return get_root_api_base() + 'o2ims-infrastructureInventory' +def get_o2ims_monitoring_api_v1(): + return '/v1' + + +def get_o2ims_inventory_api_v1(): + return '/v1' + + def get_o2ims_monitoring_api_base(): return get_root_api_base() + 'o2ims-infrastructureMonitoring' @@ -73,7 +86,7 @@ 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 + port = int(os.environ.get("REDIS_PORT", 6379)) return dict(host=host, port=port) @@ -83,6 +96,37 @@ def get_smo_o2endpoint(): return smo_o2endpoint +def get_stx_client_args(): + client_args = dict( + auth_url=os.environ.get('OS_AUTH_URL', _DEFAULT_STX_URL), + username=os.environ.get('OS_USERNAME', "admin"), + api_key=os.environ.get('OS_PASSWORD', "fakepasswd1"), + project_name=os.environ.get('OS_PROJECT_NAME', "admin"), + ) + if config.conf.OCLOUD.OS_AUTH_URL is not None and \ + config.conf.OCLOUD.OS_AUTH_URL != '': + client_args['auth_url'] = config.conf.OCLOUD.OS_AUTH_URL + if config.conf.OCLOUD.OS_USERNAME is not None and \ + config.conf.OCLOUD.OS_USERNAME != '': + client_args['username'] = config.conf.OCLOUD.OS_USERNAME + if config.conf.OCLOUD.OS_PASSWORD is not None and \ + config.conf.OCLOUD.OS_PASSWORD != '': + client_args['api_key'] = config.conf.OCLOUD.OS_PASSWORD + if config.conf.OCLOUD.OS_PROJECT_NAME is not None and \ + config.conf.OCLOUD.OS_PROJECT_NAME != '': + client_args['project_name'] = config.conf.OCLOUD.OS_PROJECT_NAME + return client_args + + +def is_ipv6(address): + try: + # Try to convert the address and check the IP version + ip = ipaddress.ip_address(address) + return ip.version == 6 + except ValueError: + return False + + def get_stx_access_info(region_name="RegionOne", subcloud_hostname: str = "", sub_is_https: bool = False): # authurl = os.environ.get("STX_AUTH_URL", "http://192.168.204.1:5000/v3") @@ -90,12 +134,13 @@ def get_stx_access_info(region_name="RegionOne", subcloud_hostname: str = "", # pswd = os.environ.get("STX_PASSWORD", "passwd1") # stx_access_info = (authurl, username, pswd) try: - client_args = dict( - auth_url=os.environ.get('OS_AUTH_URL', _DEFAULT_STX_URL), - username=os.environ.get('OS_USERNAME', "admin"), - api_key=os.environ.get('OS_PASSWORD', "fakepasswd1"), - project_name=os.environ.get('OS_PROJECT_NAME', "admin"), - ) + # client_args = dict( + # auth_url=os.environ.get('OS_AUTH_URL', _DEFAULT_STX_URL), + # username=os.environ.get('OS_USERNAME', "admin"), + # api_key=os.environ.get('OS_PASSWORD', "fakepasswd1"), + # project_name=os.environ.get('OS_PROJECT_NAME', "admin"), + # ) + client_args = get_stx_client_args() except KeyError: logger.error('Please source your RC file before execution, ' 'e.g.: `source ~/downloads/admin-rc.sh`') @@ -105,6 +150,8 @@ def get_stx_access_info(region_name="RegionOne", subcloud_hostname: str = "", for key, val in client_args.items(): os_client_args['os_{key}'.format(key=key)] = val if "" != subcloud_hostname: + if is_ipv6(subcloud_hostname): + subcloud_hostname = "[" + subcloud_hostname + "]" orig_auth_url = urlparse(_DEFAULT_STX_URL) new_auth_url = orig_auth_url._replace( netloc=orig_auth_url.netloc.replace( @@ -130,12 +177,13 @@ def get_stx_access_info(region_name="RegionOne", subcloud_hostname: str = "", def get_dc_access_info(): try: - client_args = dict( - auth_url=os.environ.get('OS_AUTH_URL', _DEFAULT_STX_URL), - username=os.environ.get('OS_USERNAME', "admin"), - api_key=os.environ.get('OS_PASSWORD', "fakepasswd1"), - project_name=os.environ.get('OS_PROJECT_NAME', "admin"), - ) + # client_args = dict( + # auth_url=os.environ.get('OS_AUTH_URL', _DEFAULT_STX_URL), + # username=os.environ.get('OS_USERNAME', "admin"), + # api_key=os.environ.get('OS_PASSWORD', "fakepasswd1"), + # project_name=os.environ.get('OS_PROJECT_NAME', "admin"), + # ) + client_args = get_stx_client_args() except KeyError: logger.error('Please source your RC file before execution, ' 'e.g.: `source ~/downloads/admin-rc.sh`') @@ -160,14 +208,16 @@ def get_dc_access_info(): return os_client_args -def get_fm_access_info(): +def get_fm_access_info(subcloud_hostname: str = "", + sub_is_https: bool = False): try: - client_args = dict( - auth_url=os.environ.get('OS_AUTH_URL', _DEFAULT_STX_URL), - username=os.environ.get('OS_USERNAME', "admin"), - api_key=os.environ.get('OS_PASSWORD', "fakepasswd1"), - project_name=os.environ.get('OS_PROJECT_NAME', "admin"), - ) + # client_args = dict( + # auth_url=os.environ.get('OS_AUTH_URL', _DEFAULT_STX_URL), + # username=os.environ.get('OS_USERNAME', "admin"), + # api_key=os.environ.get('OS_PASSWORD', "fakepasswd1"), + # project_name=os.environ.get('OS_PROJECT_NAME', "admin"), + # ) + client_args = get_stx_client_args() except KeyError: logger.error('Please source your RC file before execution, ' 'e.g.: `source ~/downloads/admin-rc.sh`') @@ -176,11 +226,24 @@ def get_fm_access_info(): os_client_args = {} for key, val in client_args.items(): os_client_args['os_{key}'.format(key=key)] = val + auth_url = urlparse(os_client_args.pop('os_auth_url')) + os_client_args['auth_url'] = auth_url.geturl() + + if "" != subcloud_hostname: + orig_auth_url = urlparse(_DEFAULT_STX_URL) + new_auth_url = orig_auth_url._replace( + netloc=orig_auth_url.netloc.replace( + orig_auth_url.hostname, subcloud_hostname)) + if sub_is_https: + new_auth_url = new_auth_url._replace( + scheme=new_auth_url.scheme. + replace(new_auth_url.scheme, 'https')) + os_client_args['auth_url'] = new_auth_url.geturl() + os_client_args['endpoint_type'] = 'publicURL' os_client_args['insecure'] = True - os_client_args['auth_url'] = auth_url.geturl() os_client_args['username'] = os_client_args.pop('os_username') os_client_args['password'] = os_client_args.pop('os_api_key') os_client_args['project_name'] = os_client_args.pop('os_project_name') @@ -201,6 +264,10 @@ def get_helm_cli(): return '/usr/local/bin/helm' +def get_containers_shared_folder(): + return '/share' + + def get_system_controller_as_respool(): return True @@ -251,6 +318,9 @@ def gen_k8s_config_dict(cluster_api_endpoint, cluster_ca_cert, admin_user, def get_helmcli_access(): 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 != '': + host_external = config.conf.OCLOUD.API_HOST_EXTERNAL_FLOATING host = "127.0.0.1" if host_external is None or host_external == '' \ else host_external port = "10022" if host_external is None or host_external == '' \ @@ -276,25 +346,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' @@ -303,9 +370,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' @@ -316,3 +382,16 @@ def get_reviewer_token(): def get_auth_provider(): return 'k8s' + + +def get_dms_support_profiles(): + profiles_list = [] + profiles_str = config.conf.API.DMS_SUPPORT_PROFILES + if profiles_str: + profiles_strip = profiles_str.strip(' []') + profiles_str = profiles_strip.replace("'", "").replace( + '"', "") + profiles_list = profiles_str.split(',') + if 'native_k8sapi' not in profiles_list: + profiles_list.append('native_k8sapi') + return profiles_list