X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2common%2Fconfig%2Fconfig.py;h=b8186b86eb43b5fe88e83a5ab127d0a650df67b2;hb=refs%2Fchanges%2F52%2F8452%2F3;hp=b0d3c0f420522ddfd388d526610564ce7190f8a8;hpb=330e15935177e9d9e8442eb67354f9122f2871b1;p=pti%2Fo2.git

diff --git a/o2common/config/config.py b/o2common/config/config.py
index b0d3c0f..b8186b8 100644
--- a/o2common/config/config.py
+++ b/o2common/config/config.py
@@ -14,11 +14,16 @@
 
 import os
 import sys
+from urllib.parse import urlparse
 
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
 
 
+_DEFAULT_DCMANAGER_URL = "http://192.168.204.1:8119/v1.0"
+_DEFAULT_STX_URL = "http://192.168.204.1:5000/v3"
+
+
 def get_postgres_uri():
     host = os.environ.get("DB_HOST", "localhost")
     port = 54321 if host == "localhost" else 5432
@@ -68,28 +73,19 @@ def get_smo_o2endpoint():
     return smo_o2endpoint
 
 
-def get_stx_access_info():
+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")
     # 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"),
+            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"),
         )
-        # 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`')
@@ -98,9 +94,59 @@ def get_stx_access_info():
     os_client_args = {}
     for key, val in client_args.items():
         os_client_args['os_{key}'.format(key=key)] = val
+    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))
+        # new_auth_url = new_auth_url._replace(
+        #     netloc=new_auth_url.netloc.replace(str(new_auth_url.port),
+        # "18002"))
+        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['insecure'] = True
+        os_client_args['os_auth_url'] = new_auth_url.geturl()
+        os_client_args['os_endpoint_type'] = 'public'
+    # os_client_args['system_url'] = os_client_args['os_auth_url']
     os_client_args['os_password'] = os_client_args.pop('os_api_key')
-    os_client_args['os_region_name'] = 'RegionOne'
+    os_client_args['os_region_name'] = region_name
     os_client_args['api_version'] = 1
+    # os_client_args['user_domain_name'] = 'Default'
+    # os_client_args['project_domain_name'] = 'Default'
+    return os_client_args
+
+
+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"),
+        )
+    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
+    auth_url = urlparse(os_client_args.pop('os_auth_url'))
+    dcmanager_url = urlparse(_DEFAULT_DCMANAGER_URL)
+    dcmanager_url = dcmanager_url._replace(netloc=dcmanager_url.netloc.replace(
+        dcmanager_url.hostname, auth_url.hostname))
+
+    os_client_args['dcmanager_url'] = dcmanager_url.geturl()
+    os_client_args['auth_url'] = auth_url.geturl()
+    os_client_args['username'] = os_client_args.pop('os_username')
+    os_client_args['api_key'] = os_client_args.pop('os_api_key')
+    os_client_args['project_name'] = os_client_args.pop('os_project_name')
+    os_client_args['user_domain_name'] = 'Default'
+    os_client_args['project_domain_name'] = 'Default'
+
     return os_client_args
 
 
@@ -113,3 +159,7 @@ def get_k8s_api_endpoint():
 
 def get_helm_cli():
     return '/usr/local/bin/helm'
+
+
+def get_system_controller_as_respool():
+    return True