Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "replace host_url with application_url"

Browse Source
This commit is contained in:
Zuul
2019-11-30 02:22:11 +00:00
committed by Gerrit Code Review
parent 012c653432 0032ed9237
commit 8ae9375e6b
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/api/controllers/link.py
View File

@@ -23,7 +23,7 @@ from watcher.api.controllers import base
def build_url(resource, resource_args, bookmark=False, base_url=None):
if base_url is None:
base_url = pecan.request.host_url
base_url = pecan.request.application_url
template = '%(url)s/%(res)s' if bookmark else '%(url)s/v1/%(res)s'
# FIXME(lucasagomes): I'm getting a 404 when doing a GET on

3
watcher/api/controllers/root.py
View File

@@ -59,7 +59,8 @@ class Version(base.APIBase):
version.status = status
version.max_version = v.max_version_string()
version.min_version = v.min_version_string()
version.links = [link.Link.make_link('self', pecan.request.host_url,
version.links = [link.Link.make_link('self',
pecan.request.application_url,
id, '', bookmark=True)]
return version

31
watcher/api/controllers/v1/__init__.py
View File

@@ -137,7 +137,8 @@ class V1(APIBase):
def convert():
v1 = V1()
v1.id = "v1"
v1.links = [link.Link.make_link('self', pecan.request.host_url,
base_url = pecan.request.application_url
v1.links = [link.Link.make_link('self', base_url,
'v1', '', bookmark=True),
link.Link.make_link('describedby',
'http://docs.openstack.org',
@@ -148,54 +149,54 @@ class V1(APIBase):
v1.media_types = [MediaType('application/json',
'application/vnd.openstack.watcher.v1+json')]
v1.audit_templates = [link.Link.make_link('self',
pecan.request.host_url,
base_url,
'audit_templates', ''),
link.Link.make_link('bookmark',
pecan.request.host_url,
base_url,
'audit_templates', '',
bookmark=True)
]
v1.audits = [link.Link.make_link('self', pecan.request.host_url,
v1.audits = [link.Link.make_link('self', base_url,
'audits', ''),
link.Link.make_link('bookmark',
pecan.request.host_url,
base_url,
'audits', '',
bookmark=True)
]
v1.data_model = [link.Link.make_link('self', pecan.request.host_url,
v1.data_model = [link.Link.make_link('self', base_url,
'data_model', ''),
link.Link.make_link('bookmark',
pecan.request.host_url,
base_url,
'data_model', '',
bookmark=True)
]
v1.actions = [link.Link.make_link('self', pecan.request.host_url,
v1.actions = [link.Link.make_link('self', base_url,
'actions', ''),
link.Link.make_link('bookmark',
pecan.request.host_url,
base_url,
'actions', '',
bookmark=True)
]
v1.action_plans = [link.Link.make_link(
'self', pecan.request.host_url, 'action_plans', ''),
'self', base_url, 'action_plans', ''),
link.Link.make_link('bookmark',
pecan.request.host_url,
base_url,
'action_plans', '',
bookmark=True)
]
v1.scoring_engines = [link.Link.make_link(
'self', pecan.request.host_url, 'scoring_engines', ''),
'self', base_url, 'scoring_engines', ''),
link.Link.make_link('bookmark',
pecan.request.host_url,
base_url,
'scoring_engines', '',
bookmark=True)
]
v1.services = [link.Link.make_link(
'self', pecan.request.host_url, 'services', ''),
'self', base_url, 'services', ''),
link.Link.make_link('bookmark',
pecan.request.host_url,
base_url,
'services', '',
bookmark=True)
]