From 6fa969adf401467858a2bcb02fc6deb331ebb31c Mon Sep 17 00:00:00 2001 From: nicolargo Date: Fri, 16 Aug 2024 09:25:37 +0200 Subject: [PATCH] api/4/vms returns a dict, thus breaking make test-restful #2918 --- glances/plugins/vms/__init__.py | 5 ++--- glances/plugins/vms/engines/multipass.py | 8 +++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/glances/plugins/vms/__init__.py b/glances/plugins/vms/__init__.py index 1e4f21fc..299da53e 100644 --- a/glances/plugins/vms/__init__.py +++ b/glances/plugins/vms/__init__.py @@ -15,7 +15,7 @@ from glances.globals import iteritems from glances.logger import logger from glances.plugins.plugin.model import GlancesPluginModel from glances.plugins.vms.engines import VmsExtension -from glances.plugins.vms.engines.multipass import VmExtension, import_multipass_error_tag +from glances.plugins.vms.engines.multipass import VmExtension from glances.processes import glances_processes from glances.processes import sort_stats as sort_stats_processes @@ -109,8 +109,7 @@ class PluginModel(GlancesPluginModel): self.watchers: Dict[str, VmsExtension] = {} # Init the Multipass API - if not import_multipass_error_tag: - self.watchers['multipass'] = VmExtension() + self.watchers['multipass'] = VmExtension() # Sort key self.sort_key = None diff --git a/glances/plugins/vms/engines/multipass.py b/glances/plugins/vms/engines/multipass.py index 983fd5ec..5de20139 100644 --- a/glances/plugins/vms/engines/multipass.py +++ b/glances/plugins/vms/engines/multipass.py @@ -30,9 +30,6 @@ class VmExtension: CONTAINER_ACTIVE_STATUS = ['running'] def __init__(self): - if import_multipass_error_tag: - raise Exception(f"Multipass binary ({MULTIPASS_PATH}) is mandatory to get VM stats") - self.ext_name = "Multipass (Vm)" def update_version(self): @@ -95,6 +92,11 @@ class VmExtension: def update(self, all_tag) -> Tuple[Dict, List[Dict]]: """Update Vm stats using the input method.""" + # Can not run multipass on this system then... + if import_multipass_error_tag: + return {}, [] + + # Get the stats from the system version_stats = self.update_version() # TODO: manage all_tag option