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

daemon/core/services/utility.py

@@ -24,7 +24,7 @@ class UtilService(CoreService):
     shutdown = ()
 
     @classmethod
-    def generateconfig(cls, node, filename):
+    def generate_config(cls, node, filename):
         return ""
 
 
@@ -34,7 +34,7 @@ class IPForwardService(UtilService):
     startup = ("sh ipforward.sh",)
 
     @classmethod
-    def generateconfig(cls, node, filename):
+    def generate_config(cls, node, filename):
         if os.uname()[0] == "Linux":
             return cls.generateconfiglinux(node, filename)
         else:
@@ -69,7 +69,7 @@ class DefaultRouteService(UtilService):
     startup = ("sh defaultroute.sh",)
 
     @classmethod
-    def generateconfig(cls, node, filename):
+    def generate_config(cls, node, filename):
         cfg = "#!/bin/sh\n"
         cfg += "# auto-generated by DefaultRoute service (utility.py)\n"
         for ifc in node.netifs():
@@ -103,7 +103,7 @@ class DefaultMulticastRouteService(UtilService):
     startup = ("sh defaultmroute.sh",)
 
     @classmethod
-    def generateconfig(cls, node, filename):
+    def generate_config(cls, node, filename):
         cfg = "#!/bin/sh\n"
         cfg += "# auto-generated by DefaultMulticastRoute service (utility.py)\n"
         cfg += "# the first interface is chosen below; please change it "
@@ -129,7 +129,7 @@ class StaticRouteService(UtilService):
     custom_needed = True
 
     @classmethod
-    def generateconfig(cls, node, filename):
+    def generate_config(cls, node, filename):
         cfg = "#!/bin/sh\n"
         cfg += "# auto-generated by StaticRoute service (utility.py)\n#\n"
         cfg += "# NOTE: this service must be customized to be of any use\n"
@@ -170,7 +170,7 @@ class SshService(UtilService):
     validate = ()
 
     @classmethod
-    def generateconfig(cls, node, filename):
+    def generate_config(cls, node, filename):
         """
         Use a startup script for launching sshd in order to wait for host
         key generation.
@@ -238,7 +238,7 @@ class DhcpService(UtilService):
     validate = ("pidof dhcpd",)
 
     @classmethod
-    def generateconfig(cls, node, filename):
+    def generate_config(cls, node, filename):
         """
         Generate a dhcpd config file using the network address of
         each interface.
@@ -300,7 +300,7 @@ class DhcpClientService(UtilService):
     validate = ("pidof dhclient",)
 
     @classmethod
-    def generateconfig(cls, node, filename):
+    def generate_config(cls, node, filename):
         """
         Generate a script to invoke dhclient on all interfaces.
         """
@@ -332,7 +332,7 @@ class FtpService(UtilService):
     validate = ("pidof vsftpd",)
 
     @classmethod
-    def generateconfig(cls, node, filename):
+    def generate_config(cls, node, filename):
         """
         Generate a vsftpd.conf configuration file.
         """
@@ -368,7 +368,7 @@ class HttpService(UtilService):
     APACHEVER22, APACHEVER24 = (22, 24)
 
     @classmethod
-    def generateconfig(cls, node, filename):
+    def generate_config(cls, node, filename):
         """
         Generate an apache2.conf configuration file.
         """
@@ -577,7 +577,7 @@ class PcapService(UtilService):
     meta = "logs network traffic to pcap packet capture files"
 
     @classmethod
-    def generateconfig(cls, node, filename):
+    def generate_config(cls, node, filename):
         """
         Generate a startpcap.sh traffic logging script.
         """
@@ -615,7 +615,7 @@ class RadvdService(UtilService):
     validate = ("pidof radvd",)
 
     @classmethod
-    def generateconfig(cls, node, filename):
+    def generate_config(cls, node, filename):
         """
         Generate a RADVD router advertisement daemon config file
         using the network address of each interface.
@@ -674,7 +674,7 @@ class AtdService(UtilService):
     shutdown = ("pkill atd",)
 
     @classmethod
-    def generateconfig(cls, node, filename):
+    def generate_config(cls, node, filename):
         return """
 #!/bin/sh
 echo 00001 > /var/spool/cron/atjobs/.SEQ