fixed parsing, replaced non_workin instance_check with todo

lib/services/ping.py

@@ -8,8 +8,8 @@ from service import Service
 
 class PingService(Service):
     def __init__(self, **kwargs):
-        super(PingService, self).__init__(**kwargs)
+        Service.__init__(self, **kwargs)
 
 
-def create(self, **kwargs):
+def create(kwargs):
     return PingService(**kwargs)

lib/services/service.py

@@ -7,7 +7,7 @@ KEY_PERIODS   = "periods"
 KEY_ARGS      = "args"
 
 
-class Service:
+class Service(object):
     def __init__(self, **kwargs):
 
         self._args = {}
@@ -36,10 +36,10 @@ class Service:
         
         self._periods = []
         if KEY_PERIODS in kwargs:
-            self.addPeriods(kwargs[KEY_PERIODS])
+            self.add_periods(kwargs[KEY_PERIODS])
         
         self.errorcode = 0
-        self.errormessage = "No Error!"
+        self.errormessage = None
         
     def add_arguments(self, args):
         for key, val in args.items():
@@ -51,7 +51,7 @@ class Service:
     def get_arguments(self):
         return self._args
 
-    def add_period(self, period):
+    def add_periods(self, period):
         if period is not None:
             if isinstance(period, list):
                 self._periods.extend(period)

lib/services/shell.py

@@ -22,5 +22,5 @@ class ShellService(Service):
         self.command.call()
 
 
-def create(**kwargs):
+def create(kwargs):
     return ShellService(**kwargs)

lib/services/snmpget.py

@@ -52,5 +52,5 @@ class SnmpgetService(Service):
         #            print('%s = %s' % (name.prettyPrint(), val.prettyPrint()))
 
 
-def create(**kargs):
+def create(kargs):
     return SnmpgetService(**kwargs)

lib/services/ssh.py

@@ -40,7 +40,7 @@ class SshService(Service):
         client.close()
 
 
-def create(**kwargs):
+def create(kwargs):
     return SshService(**kwargs)
     
 # def main():

lib/services/tcpconnect.py

@@ -6,11 +6,13 @@ not use a parser.
 """
 
 import socket
+from lib.config.services import Service
 from service import Service
 
 
 class TcpconnectService(Service):
     def __init__(self, **kwargs):
+        #Service.__init__(self, **kwargs)
         super(TcpconnectService, self).__init__(**kwargs)
         
         args = self.get_arguments()
@@ -39,5 +41,5 @@ class TcpconnectService(Service):
         return
 
 
-def create(**kwargs):
+def create(kwargs):
     return TcpconnectService(**kwargs)