X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2common%2Fconfig%2Fconfig.py;fp=o2common%2Fconfig%2Fconfig.py;h=54d6d0ff103ab57b6fb2a94ab6844e947263f56a;hb=83909d65c95d15dfc1508f152640f0fbedef6874;hp=d4e7107d05b5cff48a29cd9afdd311f98c650f7b;hpb=4aabbc42db31fb781f16eecf59223776cff3b034;p=pti%2Fo2.git diff --git a/o2common/config/config.py b/o2common/config/config.py index d4e7107..54d6d0f 100644 --- a/o2common/config/config.py +++ b/o2common/config/config.py @@ -193,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), @@ -210,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')