Fix INF-359 and INF-352 about the alarm event record

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

diff --git a/o2common/config/config.py b/o2common/config/config.py
index 9c1d610..54d6d0f 100644 (file)
--- a/o2common/config/config.py
+++ b/o2common/config/config.py
@@ -36,8 +36,9 @@ def get_smo_ca_config_path():
 
 
 def get_postgres_uri():
-    host = os.environ.get("DB_HOST", "localhost")
+    # 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"
@@ -45,7 +46,8 @@ def get_postgres_uri():
 
 
 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 != '':
@@ -77,8 +79,9 @@ def get_o2dms_api_base():
 
 
 def get_redis_host_and_port():
-    host = os.environ.get("REDIS_HOST", "localhost")
+    # host = os.environ.get("REDIS_HOST", "localhost")
     # port = 63791 if host == "localhost" else 6379
+    host = "localhost"
     port = 6379
     return dict(host=host, port=port)
 
@@ -190,7 +193,8 @@ 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),
@@ -207,11 +211,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')