diff --git a/capsulflask/hub_model.py b/capsulflask/hub_model.py index c40cea4..478100c 100644 --- a/capsulflask/hub_model.py +++ b/capsulflask/hub_model.py @@ -91,7 +91,10 @@ class CapsulFlaskHub(VirtualizationInterface): pass if not result_has_valid_status: - current_app.logger.error(f"""error reading assignment_status for operation {operation_id} from host {host.id}: + operation_desc = "" + if operation_id: + operation_desc = f"for operation {operation_id}" + current_app.logger.error(f"""error reading assignment_status {operation_desc} from host {host.id}: result_is_json: {result_is_json} result_is_dict: {result_is_dict} result_has_status: {result_has_status} @@ -155,7 +158,6 @@ class CapsulFlaskHub(VirtualizationInterface): except: all_valid = False if not all_valid: - result_json_string = json.dumps({"error_message": "invalid capsul id returned"}) current_app.logger.error(f"""error reading ids for list_ids operation, host {host.id}""") else: result_json_string = json.dumps({"error_message": "invalid response, missing 'ids' list"}) @@ -210,7 +212,7 @@ class CapsulFlaskHub(VirtualizationInterface): result_status = None host = get_model().host_of_capsul(id) if host is not None: - payload = json.dumps(dict(type="destroy", id=id)) + payload = json.dumps(dict(type="destroy", email=email, id=id)) results = self.synchronous_operation([host], payload) result_json_string = "" for result in results: @@ -223,4 +225,4 @@ class CapsulFlaskHub(VirtualizationInterface): pass if not result_status == "success": - raise ValueError(f"""failed to destroy vm "{id}" on host "{host}" for {email}: {result_json_string}""") + raise ValueError(f"""failed to destroy vm "{id}" on host "{host.id}" for {email}: {result_json_string}""")