daemon: added type hinting throughout config services

daemon/core/configservices/nrlservices/services.py

@@ -1,26 +1,27 @@
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 import netaddr
 
 from core import utils
+from core.config import Configuration
 from core.configservice.base import ConfigService, ConfigServiceMode
 
-GROUP = "ProtoSvc"
+GROUP: str = "ProtoSvc"
 
 
 class MgenSinkService(ConfigService):
-    name = "MGEN_Sink"
-    group = GROUP
-    directories = []
-    files = ["mgensink.sh", "sink.mgen"]
-    executables = ["mgen"]
-    dependencies = []
-    startup = ["sh mgensink.sh"]
-    validate = ["pidof mgen"]
-    shutdown = ["killall mgen"]
-    validation_mode = ConfigServiceMode.BLOCKING
-    default_configs = []
-    modes = {}
+    name: str = "MGEN_Sink"
+    group: str = GROUP
+    directories: List[str] = []
+    files: List[str] = ["mgensink.sh", "sink.mgen"]
+    executables: List[str] = ["mgen"]
+    dependencies: List[str] = []
+    startup: List[str] = ["sh mgensink.sh"]
+    validate: List[str] = ["pidof mgen"]
+    shutdown: List[str] = ["killall mgen"]
+    validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
+    default_configs: List[Configuration] = []
+    modes: Dict[str, Dict[str, str]] = {}
 
     def data(self) -> Dict[str, Any]:
         ifnames = []
@@ -31,18 +32,18 @@ class MgenSinkService(ConfigService):
 
 
 class NrlNhdp(ConfigService):
-    name = "NHDP"
-    group = GROUP
-    directories = []
-    files = ["nrlnhdp.sh"]
-    executables = ["nrlnhdp"]
-    dependencies = []
-    startup = ["sh nrlnhdp.sh"]
-    validate = ["pidof nrlnhdp"]
-    shutdown = ["killall nrlnhdp"]
-    validation_mode = ConfigServiceMode.BLOCKING
-    default_configs = []
-    modes = {}
+    name: str = "NHDP"
+    group: str = GROUP
+    directories: List[str] = []
+    files: List[str] = ["nrlnhdp.sh"]
+    executables: List[str] = ["nrlnhdp"]
+    dependencies: List[str] = []
+    startup: List[str] = ["sh nrlnhdp.sh"]
+    validate: List[str] = ["pidof nrlnhdp"]
+    shutdown: List[str] = ["killall nrlnhdp"]
+    validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
+    default_configs: List[Configuration] = []
+    modes: Dict[str, Dict[str, str]] = {}
 
     def data(self) -> Dict[str, Any]:
         has_smf = "SMF" in self.node.config_services
@@ -53,18 +54,18 @@ class NrlNhdp(ConfigService):
 
 
 class NrlSmf(ConfigService):
-    name = "SMF"
-    group = GROUP
-    directories = []
-    files = ["startsmf.sh"]
-    executables = ["nrlsmf", "killall"]
-    dependencies = []
-    startup = ["sh startsmf.sh"]
-    validate = ["pidof nrlsmf"]
-    shutdown = ["killall nrlsmf"]
-    validation_mode = ConfigServiceMode.BLOCKING
-    default_configs = []
-    modes = {}
+    name: str = "SMF"
+    group: str = GROUP
+    directories: List[str] = []
+    files: List[str] = ["startsmf.sh"]
+    executables: List[str] = ["nrlsmf", "killall"]
+    dependencies: List[str] = []
+    startup: List[str] = ["sh startsmf.sh"]
+    validate: List[str] = ["pidof nrlsmf"]
+    shutdown: List[str] = ["killall nrlsmf"]
+    validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
+    default_configs: List[Configuration] = []
+    modes: Dict[str, Dict[str, str]] = {}
 
     def data(self) -> Dict[str, Any]:
         has_arouted = "arouted" in self.node.config_services
@@ -91,18 +92,18 @@ class NrlSmf(ConfigService):
 
 
 class NrlOlsr(ConfigService):
-    name = "OLSR"
-    group = GROUP
-    directories = []
-    files = ["nrlolsrd.sh"]
-    executables = ["nrlolsrd"]
-    dependencies = []
-    startup = ["sh nrlolsrd.sh"]
-    validate = ["pidof nrlolsrd"]
-    shutdown = ["killall nrlolsrd"]
-    validation_mode = ConfigServiceMode.BLOCKING
-    default_configs = []
-    modes = {}
+    name: str = "OLSR"
+    group: str = GROUP
+    directories: List[str] = []
+    files: List[str] = ["nrlolsrd.sh"]
+    executables: List[str] = ["nrlolsrd"]
+    dependencies: List[str] = []
+    startup: List[str] = ["sh nrlolsrd.sh"]
+    validate: List[str] = ["pidof nrlolsrd"]
+    shutdown: List[str] = ["killall nrlolsrd"]
+    validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
+    default_configs: List[Configuration] = []
+    modes: Dict[str, Dict[str, str]] = {}
 
     def data(self) -> Dict[str, Any]:
         has_smf = "SMF" in self.node.config_services
@@ -115,18 +116,18 @@ class NrlOlsr(ConfigService):
 
 
 class NrlOlsrv2(ConfigService):
-    name = "OLSRv2"
-    group = GROUP
-    directories = []
-    files = ["nrlolsrv2.sh"]
-    executables = ["nrlolsrv2"]
-    dependencies = []
-    startup = ["sh nrlolsrv2.sh"]
-    validate = ["pidof nrlolsrv2"]
-    shutdown = ["killall nrlolsrv2"]
-    validation_mode = ConfigServiceMode.BLOCKING
-    default_configs = []
-    modes = {}
+    name: str = "OLSRv2"
+    group: str = GROUP
+    directories: List[str] = []
+    files: List[str] = ["nrlolsrv2.sh"]
+    executables: List[str] = ["nrlolsrv2"]
+    dependencies: List[str] = []
+    startup: List[str] = ["sh nrlolsrv2.sh"]
+    validate: List[str] = ["pidof nrlolsrv2"]
+    shutdown: List[str] = ["killall nrlolsrv2"]
+    validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
+    default_configs: List[Configuration] = []
+    modes: Dict[str, Dict[str, str]] = {}
 
     def data(self) -> Dict[str, Any]:
         has_smf = "SMF" in self.node.config_services
@@ -137,18 +138,18 @@ class NrlOlsrv2(ConfigService):
 
 
 class OlsrOrg(ConfigService):
-    name = "OLSRORG"
-    group = GROUP
-    directories = ["/etc/olsrd"]
-    files = ["olsrd.sh", "/etc/olsrd/olsrd.conf"]
-    executables = ["olsrd"]
-    dependencies = []
-    startup = ["sh olsrd.sh"]
-    validate = ["pidof olsrd"]
-    shutdown = ["killall olsrd"]
-    validation_mode = ConfigServiceMode.BLOCKING
-    default_configs = []
-    modes = {}
+    name: str = "OLSRORG"
+    group: str = GROUP
+    directories: List[str] = ["/etc/olsrd"]
+    files: List[str] = ["olsrd.sh", "/etc/olsrd/olsrd.conf"]
+    executables: List[str] = ["olsrd"]
+    dependencies: List[str] = []
+    startup: List[str] = ["sh olsrd.sh"]
+    validate: List[str] = ["pidof olsrd"]
+    shutdown: List[str] = ["killall olsrd"]
+    validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
+    default_configs: List[Configuration] = []
+    modes: Dict[str, Dict[str, str]] = {}
 
     def data(self) -> Dict[str, Any]:
         has_smf = "SMF" in self.node.config_services
@@ -159,33 +160,33 @@ class OlsrOrg(ConfigService):
 
 
 class MgenActor(ConfigService):
-    name = "MgenActor"
-    group = GROUP
-    directories = []
-    files = ["start_mgen_actor.sh"]
-    executables = ["mgen"]
-    dependencies = []
-    startup = ["sh start_mgen_actor.sh"]
-    validate = ["pidof mgen"]
-    shutdown = ["killall mgen"]
-    validation_mode = ConfigServiceMode.BLOCKING
-    default_configs = []
-    modes = {}
+    name: str = "MgenActor"
+    group: str = GROUP
+    directories: List[str] = []
+    files: List[str] = ["start_mgen_actor.sh"]
+    executables: List[str] = ["mgen"]
+    dependencies: List[str] = []
+    startup: List[str] = ["sh start_mgen_actor.sh"]
+    validate: List[str] = ["pidof mgen"]
+    shutdown: List[str] = ["killall mgen"]
+    validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
+    default_configs: List[Configuration] = []
+    modes: Dict[str, Dict[str, str]] = {}
 
 
 class Arouted(ConfigService):
-    name = "arouted"
-    group = GROUP
-    directories = []
-    files = ["startarouted.sh"]
-    executables = ["arouted"]
-    dependencies = []
-    startup = ["sh startarouted.sh"]
-    validate = ["pidof arouted"]
-    shutdown = ["pkill arouted"]
-    validation_mode = ConfigServiceMode.BLOCKING
-    default_configs = []
-    modes = {}
+    name: str = "arouted"
+    group: str = GROUP
+    directories: List[str] = []
+    files: List[str] = ["startarouted.sh"]
+    executables: List[str] = ["arouted"]
+    dependencies: List[str] = []
+    startup: List[str] = ["sh startarouted.sh"]
+    validate: List[str] = ["pidof arouted"]
+    shutdown: List[str] = ["pkill arouted"]
+    validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
+    default_configs: List[Configuration] = []
+    modes: Dict[str, Dict[str, str]] = {}
 
     def data(self) -> Dict[str, Any]:
         ip4_prefix = None