updates to collector args

Author: alexandraBara

nodescraper/plugins/inband/dimm/collector_args.py

@@ -28,4 +28,4 @@
 
 
 class DimmCollectorArgs(CollectorArgs):
-    skip_sudo = False
+    skip_sudo: bool = False

nodescraper/plugins/inband/dimm/dimm_collector.py

@@ -23,23 +23,29 @@
 # SOFTWARE.
 #
 ###############################################################################
+from typing import Optional
+
 from nodescraper.base import InBandDataCollector
 from nodescraper.enums import EventCategory, EventPriority, ExecutionStatus, OSFamily
 from nodescraper.models import TaskResult
 
+from .collector_args import DimmCollectorArgs
 from .dimmdata import DimmDataModel
 
 
-class DimmCollector(InBandDataCollector[DimmDataModel, None]):
+class DimmCollector(InBandDataCollector[DimmDataModel, DimmCollectorArgs]):
     """Collect data on installed DIMMs"""
 
     DATA_MODEL = DimmDataModel
 
     def collect_data(
         self,
-        args=None,
+        args: Optional[DimmCollectorArgs] = None,
     ) -> tuple[TaskResult, DimmDataModel | None]:
         """Collect data on installed DIMMs"""
+        if args is None:
+            args = DimmCollectorArgs()
+
         if args.skip_sudo:
             self.result.message = "Skipping sudo plugin"
             self.result.status = ExecutionStatus.NOT_RAN

nodescraper/plugins/inband/dimm/dimm_plugin.py

@@ -30,7 +30,7 @@
 from .dimmdata import DimmDataModel
 
 
-class DimmPlugin(InBandDataPlugin[DimmDataModel, None, None]):
+class DimmPlugin(InBandDataPlugin[DimmDataModel, DimmCollectorArgs, None]):
     """Plugin for collection and analysis of DIMM data"""
 
     DATA_MODEL = DimmDataModel

nodescraper/plugins/inband/dmesg/collector_args.py

@@ -28,4 +28,4 @@
 
 
 class DmesgCollectorArgs(CollectorArgs):
-    skip_sudo = False
+    skip_sudo: bool = False

nodescraper/plugins/inband/dmesg/dmesg_plugin.py

@@ -32,7 +32,7 @@
 from .dmesgdata import DmesgData
 
 
-class DmesgPlugin(InBandDataPlugin[DmesgData, None, DmesgAnalyzerArgs]):
+class DmesgPlugin(InBandDataPlugin[DmesgData, DmesgCollectorArgs, DmesgAnalyzerArgs]):
     """Plugin for collection and analysis of dmesg data"""
 
     DATA_MODEL = DmesgData

nodescraper/plugins/inband/storage/collector_args.py

@@ -28,4 +28,4 @@
 
 
 class StorageCollectorArgs(CollectorArgs):
-    skip_sudo = False
+    skip_sudo: bool = False

nodescraper/plugins/inband/storage/storage_plugin.py

@@ -32,7 +32,7 @@
 from .storagedata import StorageDataModel
 
 
-class StoragePlugin(InBandDataPlugin[StorageDataModel, None, StorageAnalyzerArgs]):
+class StoragePlugin(InBandDataPlugin[StorageDataModel, StorageCollectorArgs, StorageAnalyzerArgs]):
     """Plugin for collection and analysis of disk usage data"""
 
     DATA_MODEL = StorageDataModel