Add the image size to the composer-cli status output

This commit is contained in:
Brian C. Lane 2018-03-23 16:40:23 -07:00
parent 211f1bf764
commit 020d9de4b3

View File

@ -74,6 +74,7 @@ def compose_status(socket_path, api_version, args, show_json=False, testmode=0):
"recipe": compose["recipe"], "recipe": compose["recipe"],
"version": compose["version"], "version": compose["version"],
"compose_type": compose["compose_type"], "compose_type": compose["compose_type"],
"image_size": compose["image_size"],
"status": compose["queue_status"]} "status": compose["queue_status"]}
# Sort the status in a specific order # Sort the status in a specific order
@ -107,7 +108,13 @@ def compose_status(socket_path, api_version, args, show_json=False, testmode=0):
# Print them as UUID RECIPE STATUS # Print them as UUID RECIPE STATUS
for c in status: for c in status:
print("%s %-8s %-15s %s %s" % (c["id"], c["status"], c["recipe"], c["version"], c["compose_type"])) if c["image_size"] > 0:
image_size = str(c["image_size"])
else:
image_size = ""
print("%s %-8s %-15s %s %-16s %s" % (c["id"], c["status"], c["recipe"], c["version"], c["compose_type"],
image_size))
def compose_types(socket_path, api_version, args, show_json=False, testmode=0): def compose_types(socket_path, api_version, args, show_json=False, testmode=0):
@ -321,11 +328,18 @@ def compose_details(socket_path, api_version, args, show_json=False, testmode=0)
print(result["error"]["msg"]) print(result["error"]["msg"])
return 1 return 1
print("%s %-8s %-15s %s %s" % (result["id"], if result["image_size"] > 0:
image_size = str(result["image_size"])
else:
image_size = ""
print("%s %-8s %-15s %s %-16s %s" % (result["id"],
result["queue_status"], result["queue_status"],
result["recipe"]["name"], result["recipe"]["name"],
result["recipe"]["version"], result["recipe"]["version"],
result["compose_type"])) result["compose_type"],
image_size))
print("Recipe Packages:") print("Recipe Packages:")
for p in result["recipe"]["packages"]: for p in result["recipe"]["packages"]:
print(" %s-%s" % (p["name"], p["version"])) print(" %s-%s" % (p["name"], p["version"]))