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=2e474144597e0bff3be0a1430611258428853597;hpb=390fb9bef1d6850db6d643754375ae8d5f22aaa7;p=pti%2Fo2.git

diff --git a/o2common/config/config.py b/o2common/config/config.py
index 2e47414..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,6 +14,7 @@
 
 import os
 import sys
+import ipaddress
 from urllib.parse import urlparse
 
 from o2common import config
@@ -36,18 +37,15 @@ 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 = "localhost"
-    port = 5432
+    host = os.environ.get("DB_HOST", "localhost")
+    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}"
 
 
 def get_api_url():
-    # host_interal = os.environ.get("API_HOST", "localhost")
-    host_interal = "localhost"
+    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 != '':
@@ -87,10 +85,8 @@ 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 = "localhost"
-    port = 6379
+    host = os.environ.get("REDIS_HOST", "localhost")
+    port = int(os.environ.get("REDIS_PORT", 6379))
     return dict(host=host, port=port)
 
 
@@ -122,6 +118,15 @@ def get_stx_client_args():
     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")
@@ -145,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(