Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Adjust API level on swagger and set API doc expansion by default
[pti/o2.git]
/
o2ims
/
config.py
diff --git
a/o2ims/config.py
b/o2ims/config.py
index
e55d00b
..
55d4755
100644
(file)
--- a/
o2ims/config.py
+++ b/
o2ims/config.py
@@
-14,7
+14,9
@@
import os
import sys
import os
import sys
-import logging
+
+from o2common.helper import o2logging
+logger = o2logging.get_logger(__name__)
def get_postgres_uri():
def get_postgres_uri():
@@
-31,8
+33,16
@@
def get_api_url():
return f"http://{host}:{port}"
return f"http://{host}:{port}"
+def get_root_api_base():
+ return "/"
+
+
def get_o2ims_api_base():
def get_o2ims_api_base():
- return '/o2ims_infrastructureInventory/v1'
+ return get_root_api_base() + 'o2ims_infrastructureInventory/v1'
+
+
+def get_o2dms_api_base():
+ return get_root_api_base() + "o2dms/v1"
def get_redis_host_and_port():
def get_redis_host_and_port():
@@
-70,8
+80,8
@@
def get_stx_access_info():
# project_domain_id=os.environ['OS_PROJECT_DOMAIN_ID']
# )
except KeyError:
# project_domain_id=os.environ['OS_PROJECT_DOMAIN_ID']
# )
except KeyError:
- logg
ing
.error('Please source your RC file before execution, '
-
'e.g.: `source ~/downloads/admin-rc.sh`')
+ logg
er
.error('Please source your RC file before execution, '
+ 'e.g.: `source ~/downloads/admin-rc.sh`')
sys.exit(1)
os_client_args = {}
sys.exit(1)
os_client_args = {}