X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2common%2Fconfig%2Fconfig.py;h=e36c889dd5b10d1c8f7869becc801bd787a09210;hb=4bb01071b48929e34720fd97d3177954a72f06c7;hp=3d1f857a51c19d6afb7dd3f08eaf749d0ac71456;hpb=4fabba9d441a1762e8ebd99cca3cea11dd0f0b62;p=pti%2Fo2.git diff --git a/o2common/config/config.py b/o2common/config/config.py index 3d1f857..e36c889 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 != '': @@ -67,6 +70,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' @@ -76,8 +87,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)