From 7448cd90da34cf813b716a77766d4c8b12228314 Mon Sep 17 00:00:00 2001 From: j3s Date: Sat, 16 May 2020 16:55:18 -0500 Subject: [PATCH] Properly decode output of create and destroy --- capsulflask/virt_model.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/capsulflask/virt_model.py b/capsulflask/virt_model.py index 39d472f..4b0bce7 100644 --- a/capsulflask/virt_model.py +++ b/capsulflask/virt_model.py @@ -137,6 +137,7 @@ class ShellScriptVirtualization(VirtualizationInterface): self.validate_completed_process(completedProcess, email) lines = completedProcess.stdout.splitlines() + status = lines[len(lines)-1].decode("utf-8") vmSettings = f""" id={id} @@ -146,7 +147,7 @@ class ShellScriptVirtualization(VirtualizationInterface): ssh_public_keys={ssh_keys_string} """ - if not lines[len(lines)-1] == "success": + if not status == "success": raise ValueError(f"""failed to create vm for {email} with: {vmSettings} stdout: @@ -160,8 +161,9 @@ class ShellScriptVirtualization(VirtualizationInterface): completedProcess = run([join(current_app.root_path, 'shell_scripts/destroy.sh'), id], capture_output=True) self.validate_completed_process(completedProcess, email) lines = completedProcess.stdout.splitlines() + status = lines[len(lines)-1].decode("utf-8") - if not lines[len(lines)-1] == "success": + if not status == "success": raise ValueError(f"""failed to destroy vm "{id}" for {email}: stdout: {completedProcess.stdout}