collector args added to sudo plugins

Author: alexandraBara

nodescraper/pluginexecutor.py

@@ -240,8 +240,6 @@ def apply_global_args_to_plugin(
         for key in global_args:
             if key in ["collection_args", "analysis_args"] and isinstance(plugin_inst, DataPlugin):
                 continue
-            if key == "skip_sudo" and (global_args[key] or global_args[key] == 1):
-                global_args["collection_args"]["skip_sudo"] = 1
             else:
                 run_args[key] = global_args[key]
 

nodescraper/plugins/inband/dimm/collector_args.py

@@ -0,0 +1,31 @@
+###############################################################################
+#
+# MIT License
+#
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+###############################################################################
+
+from nodescraper.models import CollectorArgs
+
+
+class DimmCollectorArgs(CollectorArgs):
+    skip_sudo = False

nodescraper/plugins/inband/dimm/dimm_collector.py

@@ -40,8 +40,8 @@ def collect_data(
         args=None,
     ) -> tuple[TaskResult, DimmDataModel | None]:
         """Collect data on installed DIMMs"""
-        if args and "skip_sudo" in args.keys() and args["skip_sudo"]:
-            self.resultmessage = "Skipping sudo plugin"
+        if args.skip_sudo:
+            self.result.message = "Skipping sudo plugin"
             self.result.status = ExecutionStatus.NOT_RAN
             return self.result, None
         dimm_str = None

nodescraper/plugins/inband/dimm/dimm_plugin.py

@@ -25,6 +25,7 @@
 ###############################################################################
 from nodescraper.base import InBandDataPlugin
 
+from .collector_args import DimmCollectorArgs
 from .dimm_collector import DimmCollector
 from .dimmdata import DimmDataModel
 
@@ -35,3 +36,5 @@ class DimmPlugin(InBandDataPlugin[DimmDataModel, None, None]):
     DATA_MODEL = DimmDataModel
 
     COLLECTOR = DimmCollector
+
+    COLLECTOR_ARGS = DimmCollectorArgs

nodescraper/plugins/inband/dmesg/collector_args.py

@@ -0,0 +1,31 @@
+###############################################################################
+#
+# MIT License
+#
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+###############################################################################
+
+from nodescraper.models import CollectorArgs
+
+
+class DmesgCollectorArgs(CollectorArgs):
+    skip_sudo = False

nodescraper/plugins/inband/dmesg/dmesg_collector.py

@@ -67,8 +67,8 @@ def collect_data(
         Returns:
             tuple[TaskResult, DmesgData | None]: tuple containing the result of the task and the dmesg data if available
         """
-        if args and "skip_sudo" in args.keys() and args["skip_sudo"]:
-            self.resultmessage = "Skipping sudo plugin"
+        if args.skip_sudo:
+            self.result.message = "Skipping sudo plugin"
             self.result.status = ExecutionStatus.NOT_RAN
             return self.result, None
         dmesg_content = self._get_dmesg_content()

nodescraper/plugins/inband/dmesg/dmesg_plugin.py

@@ -26,6 +26,7 @@
 from nodescraper.base import InBandDataPlugin
 
 from .analyzer_args import DmesgAnalyzerArgs
+from .collector_args import DmesgCollectorArgs
 from .dmesg_analyzer import DmesgAnalyzer
 from .dmesg_collector import DmesgCollector
 from .dmesgdata import DmesgData
@@ -39,3 +40,5 @@ class DmesgPlugin(InBandDataPlugin[DmesgData, None, DmesgAnalyzerArgs]):
     COLLECTOR = DmesgCollector
 
     ANALYZER = DmesgAnalyzer
+
+    COLLECTOR_ARGS = DmesgCollectorArgs

nodescraper/plugins/inband/storage/collector_args.py

@@ -0,0 +1,31 @@
+###############################################################################
+#
+# MIT License
+#
+# Copyright (c) 2025 Advanced Micro Devices, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+###############################################################################
+
+from nodescraper.models import CollectorArgs
+
+
+class StorageCollectorArgs(CollectorArgs):
+    skip_sudo = False

nodescraper/plugins/inband/storage/storage_collector.py

@@ -39,8 +39,8 @@ class StorageCollector(InBandDataCollector[StorageDataModel, None]):
 
     def collect_data(self, args: None = None) -> tuple[TaskResult, StorageDataModel | None]:
         """read storage usage data"""
-        if args and "skip_sudo" in args.keys() and args["skip_sudo"]:
-            self.resultmessage = "Skipping sudo plugin"
+        if args.skip_sudo:
+            self.result.message = "Skipping sudo plugin"
             self.result.status = ExecutionStatus.NOT_RAN
             return self.result, None
         storage_data = {}

nodescraper/plugins/inband/storage/storage_plugin.py

@@ -26,6 +26,7 @@
 from nodescraper.base import InBandDataPlugin
 
 from .analyzer_args import StorageAnalyzerArgs
+from .collector_args import StorageCollectorArgs
 from .storage_analyzer import StorageAnalyzer
 from .storage_collector import StorageCollector
 from .storagedata import StorageDataModel
@@ -39,3 +40,5 @@ class StoragePlugin(InBandDataPlugin[StorageDataModel, None, StorageAnalyzerArgs
     COLLECTOR = StorageCollector
 
     ANALYZER = StorageAnalyzer
+
+    COLLECTOR_ARGS = StorageCollectorArgs