almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Allow '*' as a uuid in /compose/status/<uuid>

Browse Source 
This will display all UUIDs that match the filter arguments

(cherry picked from commit deff4d325f)
This commit is contained in:
David Shea 2018-08-09 10:25:01 -04:00 committed by Brian C. Lane
parent 1938e8ef92
commit 5057fef248
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pylorax/api/v0.py
View File

@ -804,7 +804,8 @@ POST `/api/v0/compose`
`/api/v0/compose/status/<uuids>[?blueprint=<blueprint_name>&status=<compose_status>&type=<compose_type>]` `/api/v0/compose/status/<uuids>[?blueprint=<blueprint_name>&status=<compose_status>&type=<compose_type>]`
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Return the details for each of the comma-separated list of uuids. Return the details for each of the comma-separated list of uuids. A uuid of '*' will return
details for all composes.
Example:: Example::
@ -1828,13 +1829,22 @@ def v0_api(api):
results = [] results = []
errors = [] errors = []
if uuids.strip() == '*':
queue_status_dict = queue_status(api.config["COMPOSER_CFG"])
queue_new = queue_status_dict["new"]
queue_running = queue_status_dict["run"]
candidates = queue_new + queue_running + build_status(api.config["COMPOSER_CFG"])
else:
candidates = []
for uuid in [n.strip().lower() for n in uuids.split(",")]: for uuid in [n.strip().lower() for n in uuids.split(",")]:
details = uuid_status(api.config["COMPOSER_CFG"], uuid) details = uuid_status(api.config["COMPOSER_CFG"], uuid)
if details is None: if details is None:
errors.append({"id": UNKNOWN_UUID, "msg": "%s is not a valid build uuid" % uuid}) errors.append({"id": UNKNOWN_UUID, "msg": "%s is not a valid build uuid" % uuid})
continue else:
candidates.append(details)
for details in candidates:
if blueprint is not None and details['blueprint'] != blueprint: if blueprint is not None and details['blueprint'] != blueprint:
continue continue