From 3528b712f12c98b67020a230ef62ff3edfa656b3 Mon Sep 17 00:00:00 2001 From: Charlie Crane Date: Mon, 13 Jan 2025 16:35:08 +0000 Subject: [PATCH] #2912 - Correct instances of verb: str to verb: ClassVar[str] where the parent class uses ClassVar[str] --- src/primaite/game/agent/actions/file.py | 16 ++++++++-------- src/primaite/game/agent/actions/folder.py | 10 +++++----- src/primaite/game/agent/actions/host_nic.py | 4 ++-- src/primaite/game/agent/actions/network.py | 4 ++-- src/primaite/game/agent/actions/node.py | 8 ++++---- src/primaite/game/agent/actions/service.py | 18 +++++++++--------- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/primaite/game/agent/actions/file.py b/src/primaite/game/agent/actions/file.py index bcfb27ac..ed666773 100644 --- a/src/primaite/game/agent/actions/file.py +++ b/src/primaite/game/agent/actions/file.py @@ -60,7 +60,7 @@ class NodeFileCreateAction(NodeFileAbstractAction, identifier="node_file_create" class ConfigSchema(NodeFileAbstractAction.ConfigSchema): """Configuration schema for NodeFileCreateAction.""" - verb: str = "create" + verb: ClassVar[str] = "create" force: bool = False @classmethod @@ -89,7 +89,7 @@ class NodeFileScanAction(NodeFileAbstractAction, identifier="node_file_scan"): class ConfigSchema(NodeFileAbstractAction.ConfigSchema): """Configuration schema for NodeFileScanAction.""" - verb: str = "scan" + verb: ClassVar[str] = "scan" class NodeFileDeleteAction(NodeFileAbstractAction, identifier="node_file_delete"): @@ -100,7 +100,7 @@ class NodeFileDeleteAction(NodeFileAbstractAction, identifier="node_file_delete" class ConfigSchema(NodeFileAbstractAction.ConfigSchema): """Configuration schema for NodeFileDeleteAction.""" - verb: str = "delete" + verb: ClassVar[str] = "delete" @classmethod def form_request(cls, config: ConfigSchema) -> RequestFormat: @@ -127,7 +127,7 @@ class NodeFileRestoreAction(NodeFileAbstractAction, identifier="node_file_restor class ConfigSchema(NodeFileAbstractAction.ConfigSchema): """Configuration schema for NodeFileRestoreAction.""" - verb: str = "restore" + verb: ClassVar[str] = "restore" class NodeFileCorruptAction(NodeFileAbstractAction, identifier="node_file_corrupt"): @@ -138,7 +138,7 @@ class NodeFileCorruptAction(NodeFileAbstractAction, identifier="node_file_corrup class ConfigSchema(NodeFileAbstractAction.ConfigSchema): """Configuration schema for NodeFileCorruptAction.""" - verb: str = "corrupt" + verb: ClassVar[str] = "corrupt" class NodeFileAccessAction(NodeFileAbstractAction, identifier="node_file_access"): @@ -149,7 +149,7 @@ class NodeFileAccessAction(NodeFileAbstractAction, identifier="node_file_access" class ConfigSchema(NodeFileAbstractAction.ConfigSchema): """Configuration schema for NodeFileAccessAction.""" - verb: str = "access" + verb: ClassVar[str] = "access" @classmethod def form_request(cls, config: ConfigSchema) -> RequestFormat: @@ -175,7 +175,7 @@ class NodeFileCheckhashAction(NodeFileAbstractAction, identifier="node_file_chec class ConfigSchema(NodeFileAbstractAction.ConfigSchema): """Configuration schema for NodeFileCheckhashAction.""" - verb: str = "checkhash" + verb: ClassVar[str] = "checkhash" class NodeFileRepairAction(NodeFileAbstractAction, identifier="node_file_repair"): @@ -186,4 +186,4 @@ class NodeFileRepairAction(NodeFileAbstractAction, identifier="node_file_repair" class ConfigSchema(NodeFileAbstractAction.ConfigSchema): """Configuration Schema for NodeFileRepairAction.""" - verb: str = "repair" + verb: ClassVar[str] = "repair" diff --git a/src/primaite/game/agent/actions/folder.py b/src/primaite/game/agent/actions/folder.py index 7fb90f75..3e1136ac 100644 --- a/src/primaite/game/agent/actions/folder.py +++ b/src/primaite/game/agent/actions/folder.py @@ -55,7 +55,7 @@ class NodeFolderScanAction(NodeFolderAbstractAction, identifier="node_folder_sca class ConfigSchema(NodeFolderAbstractAction.ConfigSchema): """Configuration schema for NodeFolderScanAction.""" - verb: str = "scan" + verb: ClassVar[str] = "scan" class NodeFolderCheckhashAction(NodeFolderAbstractAction, identifier="node_folder_checkhash"): @@ -66,7 +66,7 @@ class NodeFolderCheckhashAction(NodeFolderAbstractAction, identifier="node_folde class ConfigSchema(NodeFolderAbstractAction.ConfigSchema): """Configuration schema for NodeFolderCheckhashAction.""" - verb: str = "checkhash" + verb: ClassVar[str] = "checkhash" class NodeFolderRepairAction(NodeFolderAbstractAction, identifier="node_folder_repair"): @@ -77,7 +77,7 @@ class NodeFolderRepairAction(NodeFolderAbstractAction, identifier="node_folder_r class ConfigSchema(NodeFolderAbstractAction.ConfigSchema): """Configuration schema for NodeFolderRepairAction.""" - verb: str = "repair" + verb: ClassVar[str] = "repair" class NodeFolderRestoreAction(NodeFolderAbstractAction, identifier="node_folder_restore"): @@ -88,7 +88,7 @@ class NodeFolderRestoreAction(NodeFolderAbstractAction, identifier="node_folder_ class ConfigSchema(NodeFolderAbstractAction.ConfigSchema): """Configuration schema for NodeFolderRestoreAction.""" - verb: str = "restore" + verb: ClassVar[str] = "restore" class NodeFolderCreateAction(NodeFolderAbstractAction, identifier="node_folder_create"): @@ -99,7 +99,7 @@ class NodeFolderCreateAction(NodeFolderAbstractAction, identifier="node_folder_c class ConfigSchema(NodeFolderAbstractAction.ConfigSchema): """Configuration schema for NodeFolderCreateAction.""" - verb: str = "create" + verb: ClassVar[str] = "create" @classmethod def form_request(cls, config: ConfigSchema) -> RequestFormat: diff --git a/src/primaite/game/agent/actions/host_nic.py b/src/primaite/game/agent/actions/host_nic.py index 9e3cb71a..b9206b9c 100644 --- a/src/primaite/game/agent/actions/host_nic.py +++ b/src/primaite/game/agent/actions/host_nic.py @@ -48,7 +48,7 @@ class HostNICEnableAction(HostNICAbstractAction, identifier="host_nic_enable"): class ConfigSchema(HostNICAbstractAction.ConfigSchema): """Configuration schema for HostNICEnableAction.""" - verb: str = "enable" + verb: ClassVar[str] = "enable" class HostNICDisableAction(HostNICAbstractAction, identifier="host_nic_disable"): @@ -59,4 +59,4 @@ class HostNICDisableAction(HostNICAbstractAction, identifier="host_nic_disable") class ConfigSchema(HostNICAbstractAction.ConfigSchema): """Configuration schema for HostNICDisableAction.""" - verb: str = "disable" + verb: ClassVar[str] = "disable" diff --git a/src/primaite/game/agent/actions/network.py b/src/primaite/game/agent/actions/network.py index fa1c4451..7f1e069a 100644 --- a/src/primaite/game/agent/actions/network.py +++ b/src/primaite/game/agent/actions/network.py @@ -43,7 +43,7 @@ class NetworkPortEnableAction(NetworkPortAbstractAction, identifier="network_por class ConfigSchema(NetworkPortAbstractAction.ConfigSchema): """Configuration schema for NetworkPortEnableAction.""" - verb: str = "enable" + verb: ClassVar[str] = "enable" class NetworkPortDisableAction(NetworkPortAbstractAction, identifier="network_port_disable"): @@ -54,4 +54,4 @@ class NetworkPortDisableAction(NetworkPortAbstractAction, identifier="network_po class ConfigSchema(NetworkPortAbstractAction.ConfigSchema): """Configuration schema for NetworkPortDisableAction.""" - verb: str = "disable" + verb: ClassVar[str] = "disable" diff --git a/src/primaite/game/agent/actions/node.py b/src/primaite/game/agent/actions/node.py index c6b74f2e..4a7f725e 100644 --- a/src/primaite/game/agent/actions/node.py +++ b/src/primaite/game/agent/actions/node.py @@ -46,7 +46,7 @@ class NodeOSScanAction(NodeAbstractAction, identifier="node_os_scan"): class ConfigSchema(NodeAbstractAction.ConfigSchema): """Configuration schema for NodeOSScanAction.""" - verb: str = "scan" + verb: ClassVar[str] = "scan" class NodeShutdownAction(NodeAbstractAction, identifier="node_shutdown"): @@ -57,7 +57,7 @@ class NodeShutdownAction(NodeAbstractAction, identifier="node_shutdown"): class ConfigSchema(NodeAbstractAction.ConfigSchema): """Configuration schema for NodeShutdownAction.""" - verb: str = "shutdown" + verb: ClassVar[str] = "shutdown" class NodeStartupAction(NodeAbstractAction, identifier="node_startup"): @@ -68,7 +68,7 @@ class NodeStartupAction(NodeAbstractAction, identifier="node_startup"): class ConfigSchema(NodeAbstractAction.ConfigSchema): """Configuration schema for NodeStartupAction.""" - verb: str = "startup" + verb: ClassVar[str] = "startup" class NodeResetAction(NodeAbstractAction, identifier="node_reset"): @@ -79,7 +79,7 @@ class NodeResetAction(NodeAbstractAction, identifier="node_reset"): class ConfigSchema(NodeAbstractAction.ConfigSchema): """Configuration schema for NodeResetAction.""" - verb: str = "reset" + verb: ClassVar[str] = "reset" class NodeNMAPAbstractAction(AbstractAction, identifier="node_nmap_abstract_action"): diff --git a/src/primaite/game/agent/actions/service.py b/src/primaite/game/agent/actions/service.py index fa47ffb1..4a483f28 100644 --- a/src/primaite/game/agent/actions/service.py +++ b/src/primaite/game/agent/actions/service.py @@ -44,7 +44,7 @@ class NodeServiceScanAction(NodeServiceAbstractAction, identifier="node_service_ class ConfigSchema(NodeServiceAbstractAction.ConfigSchema): """Configuration Schema for NodeServiceScanAction.""" - verb: str = "scan" + verb: ClassVar[str] = "scan" class NodeServiceStopAction(NodeServiceAbstractAction, identifier="node_service_stop"): @@ -55,7 +55,7 @@ class NodeServiceStopAction(NodeServiceAbstractAction, identifier="node_service_ class ConfigSchema(NodeServiceAbstractAction.ConfigSchema): """Configuration Schema for NodeServiceStopAction.""" - verb: str = "stop" + verb: ClassVar[str] = "stop" class NodeServiceStartAction(NodeServiceAbstractAction, identifier="node_service_start"): @@ -66,7 +66,7 @@ class NodeServiceStartAction(NodeServiceAbstractAction, identifier="node_service class ConfigSchema(NodeServiceAbstractAction.ConfigSchema): """Configuration Schema for NodeServiceStartAction.""" - verb: str = "start" + verb: ClassVar[str] = "start" class NodeServicePauseAction(NodeServiceAbstractAction, identifier="node_service_pause"): @@ -77,7 +77,7 @@ class NodeServicePauseAction(NodeServiceAbstractAction, identifier="node_service class ConfigSchema(NodeServiceAbstractAction.ConfigSchema): """Configuration Schema for NodeServicePauseAction.""" - verb: str = "pause" + verb: ClassVar[str] = "pause" class NodeServiceResumeAction(NodeServiceAbstractAction, identifier="node_service_resume"): @@ -88,7 +88,7 @@ class NodeServiceResumeAction(NodeServiceAbstractAction, identifier="node_servic class ConfigSchema(NodeServiceAbstractAction.ConfigSchema): """Configuration Schema for NodeServiceResumeAction.""" - verb: str = "resume" + verb: ClassVar[str] = "resume" class NodeServiceRestartAction(NodeServiceAbstractAction, identifier="node_service_restart"): @@ -99,7 +99,7 @@ class NodeServiceRestartAction(NodeServiceAbstractAction, identifier="node_servi class ConfigSchema(NodeServiceAbstractAction.ConfigSchema): """Configuration Schema for NodeServiceRestartAction.""" - verb: str = "restart" + verb: ClassVar[str] = "restart" class NodeServiceDisableAction(NodeServiceAbstractAction, identifier="node_service_disable"): @@ -110,7 +110,7 @@ class NodeServiceDisableAction(NodeServiceAbstractAction, identifier="node_servi class ConfigSchema(NodeServiceAbstractAction.ConfigSchema): """Configuration Schema for NodeServiceDisableAction.""" - verb: str = "disable" + verb: ClassVar[str] = "disable" class NodeServiceEnableAction(NodeServiceAbstractAction, identifier="node_service_enable"): @@ -121,7 +121,7 @@ class NodeServiceEnableAction(NodeServiceAbstractAction, identifier="node_servic class ConfigSchema(NodeServiceAbstractAction.ConfigSchema): """Configuration Schema for NodeServiceEnableAction.""" - verb: str = "enable" + verb: ClassVar[str] = "enable" class NodeServiceFixAction(NodeServiceAbstractAction, identifier="node_service_fix"): @@ -132,4 +132,4 @@ class NodeServiceFixAction(NodeServiceAbstractAction, identifier="node_service_f class ConfigSchema(NodeServiceAbstractAction.ConfigSchema): """Configuration Schema for NodeServiceFixAction.""" - verb: str = "fix" + verb: ClassVar[str] = "fix"