afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

refactored service methods to be shorter, updated some logging to debug, added some more service tests

Browse source
This commit is contained in:
Blake J. Harnden 2018-06-22 15:47:02 -07:00
parent 8186f3716c
commit bb533406a6
23 changed files with 226 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

22
daemon/core/services/nrl.py
View file

@ -21,7 +21,7 @@ class NrlService(CoreService):
shutdown = ()
@classmethod
def generateconfig(cls, node, filename):
def generate_config(cls, node, filename):
return ""
@staticmethod
@ -52,7 +52,7 @@ class MgenSinkService(NrlService):
shutdown = ("killall mgen",)
@classmethod
def generateconfig(cls, node, filename):
def generate_config(cls, node, filename):
cfg = "0.0 LISTEN UDP 5000\n"
for ifc in node.netifs():
name = utils.sysctl_devname(ifc.name)
@ -60,7 +60,7 @@ class MgenSinkService(NrlService):
return cfg
@classmethod
def getstartup(cls, node):
def get_startup(cls, node):
cmd = cls.startup[0]
cmd += " output /tmp/mgen_%s.log" % node.name
return cmd,
@ -77,7 +77,7 @@ class NrlNhdp(NrlService):
validate = ("pidof nrlnhdp",)
@classmethod
def getstartup(cls, node):
def get_startup(cls, node):
"""
Generate the appropriate command-line based on node interfaces.
"""
@ -111,7 +111,7 @@ class NrlSmf(NrlService):
configs = ("startsmf.sh",)
@classmethod
def generateconfig(cls, node, filename, ):
def generate_config(cls, node, filename, ):
"""
Generate a startup script for SMF. Because nrlsmf does not
daemonize, it can cause problems in some situations when launched
@ -162,7 +162,7 @@ class NrlOlsr(NrlService):
validate = ("pidof nrlolsrd",)
@classmethod
def getstartup(cls, node):
def get_startup(cls, node):
"""
Generate the appropriate command-line based on node interfaces.
"""
@ -196,7 +196,7 @@ class NrlOlsrv2(NrlService):
validate = ("pidof nrlolsrv2",)
@classmethod
def getstartup(cls, node):
def get_startup(cls, node):
"""
Generate the appropriate command-line based on node interfaces.
"""
@ -233,7 +233,7 @@ class OlsrOrg(NrlService):
validate = ("pidof olsrd",)
@classmethod
def getstartup(cls, node):
def get_startup(cls, node):
"""
Generate the appropriate command-line based on node interfaces.
"""
@ -247,7 +247,7 @@ class OlsrOrg(NrlService):
return cmd,
@classmethod
def generateconfig(cls, node, filename):
def generate_config(cls, node, filename):
"""
Generate a default olsrd config file to use the broadcast address of 255.255.255.255.
"""
@ -591,7 +591,7 @@ class MgenActor(NrlService):
shutdown = ("killall mgen",)
@classmethod
def generateconfig(cls, node, filename):
def generate_config(cls, node, filename):
"""
Generate a startup script for MgenActor. Because mgenActor does not
daemonize, it can cause problems in some situations when launched
@ -623,7 +623,7 @@ class Arouted(NrlService):
validate = ("pidof arouted",)
@classmethod
def generateconfig(cls, node, filename):
def generate_config(cls, node, filename):
"""
Return the Quagga.conf or quaggaboot.sh file contents.
"""