Docs: update the h-release notes and the API docs

[pti/o2.git] / o2common / config / config.py

diff --git a/o2common/config/config.py b/o2common/config/config.py
index 3d1f857..2e47414 100644 (file)
--- 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)
 
 
@@ -244,6 +257,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
 
@@ -361,13 +378,13 @@ def get_auth_provider():
 
 
 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
+    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