X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2common%2Fconfig%2Fconfig.py;h=54d6d0ff103ab57b6fb2a94ab6844e947263f56a;hb=157a0e594ef55da669ed6ca8ff2d62aae409fb9f;hp=ef67e741651a44e7236fed3d596c26062725f6f0;hpb=d639eecedfed31ca751dfddb23526c499c694c01;p=pti%2Fo2.git

diff --git a/o2common/config/config.py b/o2common/config/config.py
index ef67e74..54d6d0f 100644
--- a/o2common/config/config.py
+++ b/o2common/config/config.py
@@ -30,16 +30,24 @@ def get_config_path():
     return path
 
 
+def get_smo_ca_config_path():
+    path = os.environ.get("SMO_CA_CONFIG", "/configs/smoca.crt")
+    return 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 != '':
@@ -51,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():
@@ -71,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)
 
 
@@ -183,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),
@@ -200,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')
@@ -343,9 +367,12 @@ def get_auth_provider():
 
 def get_dms_support_profiles():
     profiles = config.conf.API.DMS_SUPPORT_PROFILES
-    profiles = profiles.replace("'", "").replace(
-        '"', "").replace('[', "").replace(']', "")
-    profiles = profiles.split(',')
+    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