X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2common%2Fconfig%2Fconfig.py;h=d4e7107d05b5cff48a29cd9afdd311f98c650f7b;hb=refs%2Fchanges%2F19%2F9619%2F1;hp=690f4e95141162c1df90dbc6b95fa6185de58400;hpb=531c7749760c6dfdf7ac9c5f2d74688fa7214b42;p=pti%2Fo2.git diff --git a/o2common/config/config.py b/o2common/config/config.py index 690f4e9..d4e7107 100644 --- a/o2common/config/config.py +++ b/o2common/config/config.py @@ -36,15 +36,18 @@ def get_smo_ca_config_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 != '': @@ -56,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(): @@ -76,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)