From 63332108aa27e516f289e9ce54d0eed86385be90 Mon Sep 17 00:00:00 2001 From: forest Date: Fri, 10 Dec 2021 20:01:30 -0500 Subject: [PATCH] blah2 --- capsulflask/admin.py | 3 ++- capsulflask/consistency.py | 2 ++ capsulflask/spoke_model.py | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/capsulflask/admin.py b/capsulflask/admin.py index 3b3589c..811abcb 100644 --- a/capsulflask/admin.py +++ b/capsulflask/admin.py @@ -28,7 +28,8 @@ def index(): db_vms_by_id = get_all_vms_from_db() virt_vms_by_id = get_all_vms_from_hosts(db_vms_by_id) - current_app.logger.info(pprint.pformat(virt_vms_by_id)) + + current_app.logger.info(f"\n*******************1:\n{pprint.pformat(virt_vms_by_id)}\n\n\n\n") network_display_width_px = float(270) #operations = get_model().list_all_operations() diff --git a/capsulflask/consistency.py b/capsulflask/consistency.py index 873bbe7..1e65e1a 100644 --- a/capsulflask/consistency.py +++ b/capsulflask/consistency.py @@ -1,4 +1,5 @@ +import pprint from flask import current_app from capsulflask.db import get_model @@ -45,6 +46,7 @@ def get_all_vms_from_db() -> dict: # this returns the same shape of object as get_all_vms_from_db except it has 'state' instead of 'desired_state' def get_all_vms_from_hosts(db_vms_by_id: dict) -> dict: virt_vms_by_id = current_app.config["HUB_MODEL"].get_all_by_id() + current_app.logger.info(f"\n*******************2:\n{pprint.pformat(virt_vms_by_id)}\n\n\n\n") db_hosts = get_model().list_hosts_with_networks(None) for vm_id, virt_vm in virt_vms_by_id.items(): diff --git a/capsulflask/spoke_model.py b/capsulflask/spoke_model.py index 41f91d6..5b0dc70 100644 --- a/capsulflask/spoke_model.py +++ b/capsulflask/spoke_model.py @@ -209,6 +209,8 @@ class ShellScriptSpoke(VirtualizationInterface): else: current_app.logger.warn(f"get_all_by_id: {status['mac-address']} not in vm_id_by_mac") + current_app.logger.info(f"\n*******************3:\n{pprint.pformat(vms_by_id)}\n\n\n\n") + return vms_by_id