Move environment configuration to the config file

Signed-off-by: Zhang Rong(Jon) <rong.zhang@windriver.com>
Change-Id: I1a009889dc78ef81a859c7755f7ec27c0b405da1

diff --git a/configs/o2app.conf b/configs/o2app.conf
index 8957236..b59cab9 100644 (file)
--- a/configs/o2app.conf
+++ b/configs/o2app.conf
@@ -5,6 +5,12 @@ ocloud_global_id = 4e24b97c-8c49-4c4f-b53e-3de5235a4e37
 smo_register_url = http://127.0.0.1:8090/register
 smo_token_data = smo_token_payload
 
+[OCLOUD]
+OS_AUTH_URL = 
+OS_USERNAME = 
+OS_PASSWORD = 
+API_HOST_EXTERNAL_FLOATING = 
+
 [API]
 
 [WATCHER]

diff --git a/docs/installation-guide.rst b/docs/installation-guide.rst
index 0f07760..cac7eb6 100644 (file)
--- a/docs/installation-guide.rst
+++ b/docs/installation-guide.rst
@@ -191,6 +191,12 @@ The following instruction should be done outside of INF platform controller host
   smo_register_url = http://127.0.0.1:8090/register
   smo_token_data = ${SMO_TOKEN_DATA}
 
+  [OCLOUD]
+  OS_AUTH_URL: ${OS_AUTH_URL}
+  OS_USERNAME: ${OS_USERNAME}
+  OS_PASSWORD: ${OS_PASSWORD}
+  API_HOST_EXTERNAL_FLOATING: ${API_HOST_EXTERNAL_FLOATING}
+
   [API]
 
   [WATCHER]
@@ -254,12 +260,6 @@ The following instruction should be done outside of INF platform controller host
       pullPolicy: IfNotPresent
     logginglevel: "DEBUG"
 
-  ocloud:
-    OS_AUTH_URL: "${OS_AUTH_URL}"
-    OS_USERNAME: "${OS_USERNAME}"
-    OS_PASSWORD: "${OS_PASSWORD}"
-    API_HOST_EXTERNAL_FLOATING: "${API_HOST_EXTERNAL_FLOATING}"
-
   applicationconfig: ${applicationconfig}
   servercrt: ${servercrt}
   serverkey: ${serverkey}

diff --git a/o2common/config/config.py b/o2common/config/config.py
index 9756535..2769529 100644 (file)
--- 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 == '' \