X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2common%2Fconfig%2Fconfig.py;h=ef67e741651a44e7236fed3d596c26062725f6f0;hb=d9000f0859a254f2c3c32f30ed71a143e731e2ff;hp=97565351b3e1f9ba9213dd2b15be21c53a649caa;hpb=a9840e41848cbbffcedf76f0a53ffc5d9bc87c01;p=pti%2Fo2.git

diff --git a/o2common/config/config.py b/o2common/config/config.py
index 9756535..ef67e74 100644
--- a/o2common/config/config.py
+++ b/o2common/config/config.py
@@ -16,6 +16,7 @@ import os
 import sys
 from urllib.parse import urlparse
 
+from o2common import config
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
 
@@ -40,6 +41,9 @@ def get_postgres_uri():
 def get_api_url():
     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 != '':
+        host_external = config.conf.OCLOUD.API_HOST_EXTERNAL_FLOATING
     host = host_interal if host_external is None or host_external == '' \
         else host_external
 
@@ -78,6 +82,28 @@ def get_smo_o2endpoint():
     return smo_o2endpoint
 
 
+def get_stx_client_args():
+    client_args = dict(
+        auth_url=os.environ.get('OS_AUTH_URL', _DEFAULT_STX_URL),
+        username=os.environ.get('OS_USERNAME', "admin"),
+        api_key=os.environ.get('OS_PASSWORD', "fakepasswd1"),
+        project_name=os.environ.get('OS_PROJECT_NAME', "admin"),
+    )
+    if config.conf.OCLOUD.OS_AUTH_URL is not None and \
+            config.conf.OCLOUD.OS_AUTH_URL != '':
+        client_args['auth_url'] = config.conf.OCLOUD.OS_AUTH_URL
+    if config.conf.OCLOUD.OS_USERNAME is not None and \
+            config.conf.OCLOUD.OS_USERNAME != '':
+        client_args['username'] = config.conf.OCLOUD.OS_USERNAME
+    if config.conf.OCLOUD.OS_PASSWORD is not None and \
+            config.conf.OCLOUD.OS_PASSWORD != '':
+        client_args['api_key'] = config.conf.OCLOUD.OS_PASSWORD
+    if config.conf.OCLOUD.OS_PROJECT_NAME is not None and \
+            config.conf.OCLOUD.OS_PROJECT_NAME != '':
+        client_args['project_name'] = config.conf.OCLOUD.OS_PROJECT_NAME
+    return client_args
+
+
 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")
@@ -85,12 +111,13 @@ def get_stx_access_info(region_name="RegionOne", subcloud_hostname: str = "",
     # pswd = os.environ.get("STX_PASSWORD", "passwd1")
     # stx_access_info = (authurl, username, pswd)
     try:
-        client_args = dict(
-            auth_url=os.environ.get('OS_AUTH_URL', _DEFAULT_STX_URL),
-            username=os.environ.get('OS_USERNAME', "admin"),
-            api_key=os.environ.get('OS_PASSWORD', "fakepasswd1"),
-            project_name=os.environ.get('OS_PROJECT_NAME', "admin"),
-        )
+        # client_args = dict(
+        #     auth_url=os.environ.get('OS_AUTH_URL', _DEFAULT_STX_URL),
+        #     username=os.environ.get('OS_USERNAME', "admin"),
+        #     api_key=os.environ.get('OS_PASSWORD', "fakepasswd1"),
+        #     project_name=os.environ.get('OS_PROJECT_NAME', "admin"),
+        # )
+        client_args = get_stx_client_args()
     except KeyError:
         logger.error('Please source your RC file before execution, '
                      'e.g.: `source ~/downloads/admin-rc.sh`')
@@ -125,12 +152,13 @@ def get_stx_access_info(region_name="RegionOne", subcloud_hostname: str = "",
 
 def get_dc_access_info():
     try:
-        client_args = dict(
-            auth_url=os.environ.get('OS_AUTH_URL', _DEFAULT_STX_URL),
-            username=os.environ.get('OS_USERNAME', "admin"),
-            api_key=os.environ.get('OS_PASSWORD', "fakepasswd1"),
-            project_name=os.environ.get('OS_PROJECT_NAME', "admin"),
-        )
+        # client_args = dict(
+        #     auth_url=os.environ.get('OS_AUTH_URL', _DEFAULT_STX_URL),
+        #     username=os.environ.get('OS_USERNAME', "admin"),
+        #     api_key=os.environ.get('OS_PASSWORD', "fakepasswd1"),
+        #     project_name=os.environ.get('OS_PROJECT_NAME', "admin"),
+        # )
+        client_args = get_stx_client_args()
     except KeyError:
         logger.error('Please source your RC file before execution, '
                      'e.g.: `source ~/downloads/admin-rc.sh`')
@@ -157,12 +185,13 @@ def get_dc_access_info():
 
 def get_fm_access_info():
     try:
-        client_args = dict(
-            auth_url=os.environ.get('OS_AUTH_URL', _DEFAULT_STX_URL),
-            username=os.environ.get('OS_USERNAME', "admin"),
-            api_key=os.environ.get('OS_PASSWORD', "fakepasswd1"),
-            project_name=os.environ.get('OS_PROJECT_NAME', "admin"),
-        )
+        # client_args = dict(
+        #     auth_url=os.environ.get('OS_AUTH_URL', _DEFAULT_STX_URL),
+        #     username=os.environ.get('OS_USERNAME', "admin"),
+        #     api_key=os.environ.get('OS_PASSWORD', "fakepasswd1"),
+        #     project_name=os.environ.get('OS_PROJECT_NAME', "admin"),
+        # )
+        client_args = get_stx_client_args()
     except KeyError:
         logger.error('Please source your RC file before execution, '
                      'e.g.: `source ~/downloads/admin-rc.sh`')
@@ -246,6 +275,9 @@ def gen_k8s_config_dict(cluster_api_endpoint, cluster_ca_cert, admin_user,
 
 def get_helmcli_access():
     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 != '':
+        host_external = config.conf.OCLOUD.API_HOST_EXTERNAL_FLOATING
     host = "127.0.0.1" if host_external is None or host_external == '' \
         else host_external
     port = "10022" if host_external is None or host_external == '' \
@@ -271,25 +303,22 @@ def get_events_yaml_filename():
         return events_yaml_name
     return "/configs/events.yaml"
 
-# get k8s host from env:
-
 
+# get k8s host from env:
 def get_k8s_host():
     k8s_host = os.environ.get("KUBERNETES_SERVICE_HOST")
     if k8s_host is None:
         raise Exception('Get k8s host failed.')
     return k8s_host
 
-# get k8s host port from env:
-
 
+# get k8s host port from env:
 def get_k8s_port():
     k8s_port = os.environ.get("KUBERNETES_SERVICE_PORT_HTTPS", '443')
     return k8s_port
 
-# token review url
-
 
+# token review url
 def get_review_url():
     try:
         api = '/apis/authentication.k8s.io/v1/tokenreviews'
@@ -298,9 +327,8 @@ def get_review_url():
     except Exception:
         raise Exception('Get k8s review url failed')
 
-# get reviewer token
-
 
+# get reviewer token
 def get_reviewer_token():
     # token path default is below.
     token_path = '/var/run/secrets/kubernetes.io/serviceaccount/token'
@@ -311,3 +339,13 @@ def get_reviewer_token():
 
 def get_auth_provider():
     return 'k8s'
+
+
+def get_dms_support_profiles():
+    profiles = config.conf.API.DMS_SUPPORT_PROFILES
+    profiles = profiles.replace("'", "").replace(
+        '"', "").replace('[', "").replace(']', "")
+    profiles = profiles.split(',')
+    if 'native_k8sapi' not in profiles:
+        profiles.append('native_k8sapi')
+    return profiles