X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fconfig.py;h=7db2d0af0afd2457156548b97bdfd3d0a5a597ef;hb=d4513e022d7d75d9967072cec1e0d7db34571120;hp=f42ec72cfa6809d05bbcf5c1d57dca13abf9dd92;hpb=81e3575a77366f30c2049f98c48a3087db0ea992;p=pti%2Fo2.git

diff --git a/o2ims/config.py b/o2ims/config.py
index f42ec72..7db2d0a 100644
--- a/o2ims/config.py
+++ b/o2ims/config.py
@@ -13,6 +13,10 @@
 #  limitations under the License.
 
 import os
+import sys
+
+from o2common.helper import o2logging
+logger = o2logging.get_logger(__name__)
 
 
 def get_postgres_uri():
@@ -46,8 +50,36 @@ def get_smo_o2endpoint():
 
 
 def get_stx_access_info():
-    authurl = os.environ.get("STX_AUTH_URL", "http://192.168.204.1:5000/v3")
-    username = os.environ.get("STX_USERNAME", "admin")
-    pswd = os.environ.get("STX_PASSWORD", "passwd1")
-    stx_access_info = (authurl, username, pswd)
-    return stx_access_info
+    # authurl = os.environ.get("STX_AUTH_URL", "http://192.168.204.1:5000/v3")
+    # username = os.environ.get("STX_USERNAME", "admin")
+    # 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',
+                                    "http://192.168.204.1:5000/v3"),
+            username=os.environ.get('OS_USERNAME', "admin"),
+            api_key=os.environ.get('OS_PASSWORD', "fakepasswd1"),
+            project_name=os.environ.get('OS_PROJECT_NAME', "admin"),
+        )
+        # dc_client_args = dict(
+        #     auth_url=os.environ['OS_AUTH_URL'],
+        #     username=os.environ['OS_USERNAME'],
+        #     api_key=os.environ['OS_PASSWORD'],
+        #     project_name=os.environ['OS_PROJECT_NAME'],
+        #     user_domain_name=os.environ['OS_USER_DOMAIN_NAME'],
+        #     project_domain_name=os.environ['OS_PROJECT_NAME'],
+        #     project_domain_id=os.environ['OS_PROJECT_DOMAIN_ID']
+        # )
+    except KeyError:
+        logger.error('Please source your RC file before execution, '
+                     'e.g.: `source ~/downloads/admin-rc.sh`')
+        sys.exit(1)
+
+    os_client_args = {}
+    for key, val in client_args.items():
+        os_client_args['os_{key}'.format(key=key)] = val
+    os_client_args['os_password'] = os_client_args.pop('os_api_key')
+    os_client_args['os_region_name'] = 'RegionOne'
+    os_client_args['api_version'] = 1
+    return os_client_args