xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-09-29 00:31:09 +00:00
Code Issues Projects Releases Wiki Activity

Properly respond with not found under by-type and by-model

Browse Source 
Previously, a KeyError would trigger Unexpected error, correct this.
This commit is contained in:
Jarrod Johnson
2017-05-08 16:53:55 -04:00
parent 777c419cb8
commit 0e9e5da102
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
confluent_server/confluent/discovery/core.py
+4
View File
@@ -228,8 +228,12 @@ def handle_api_request(configmanager, inputdata, operation, pathcomponents):
return disco_info[pathcomponents[1]](ident=pathcomponents[2])
elif len(pathcomponents) == 4:
if pathcomponents[1] == 'by-model':
if pathcomponents[3] not in disco_info:
raise exc.NotFoundException()
return disco_info[pathcomponents[3]](model=pathcomponents[2])
elif pathcomponents[1] == 'by-type':
if pathcomponents[3] not in disco_info:
raise exc.NotFoundException()
return disco_info[pathcomponents[3]](infotype=pathcomponents[2])
elif len(pathcomponents) == 5:
ident = pathcomponents[-1]