Merge branch 'develop' into feature/config-service

This commit is contained in:
Blake Harnden 2020-01-16 16:13:22 -08:00
commit ff018cfd01
23 changed files with 106 additions and 109 deletions

View file

@ -55,7 +55,6 @@ def _get_default(config_type_name: str, config_value: List[str]) -> str:
:param config_value: emane configuration value list :param config_value: emane configuration value list
:return: default core config value :return: default core config value
""" """
config_default = "" config_default = ""
if config_type_name == "bool": if config_type_name == "bool":

View file

@ -908,7 +908,6 @@ class PtpNet(CoreNetwork):
:param flags: message flags :param flags: message flags
:return: list of link data :return: list of link data
""" """
all_links = [] all_links = []
if len(self._netif) != 2: if len(self._netif) != 2:

View file

@ -724,7 +724,6 @@ class CoreServices:
:param wait: determines if we should wait to validate startup :param wait: determines if we should wait to validate startup
:return: status of startup :return: status of startup
""" """
cmds = service.startup cmds = service.startup
if not service.custom: if not service.custom:
cmds = service.get_startup(node) cmds = service.get_startup(node)

View file

@ -12,7 +12,7 @@ class NrlService(CoreService):
""" """
Parent class for NRL services. Defines properties and methods Parent class for NRL services. Defines properties and methods
common to NRL's routing daemons. common to NRL's routing daemons.
""" "" """
name = None name = None
group = "ProtoSvc" group = "ProtoSvc"