whitespacing.... :)

This commit is contained in:
Johannes Findeisen 2013-06-18 02:58:40 +02:00
commit 883e59a3d1
22 changed files with 66 additions and 109 deletions

View file

@ -40,7 +40,6 @@ class HttpService(Service):
def needs_arguments(self):
return True
def execute(self):
params = urllib.urlencode(self.params)
@ -50,6 +49,7 @@ class HttpService(Service):
f = urllib.urlopen(self.protocol + "://" + self._host + ":" + self.port + self.path, params)
#print f.read()
def create(**kwargs):
return HttpService(**kwargs)

View file

@ -5,10 +5,11 @@ The ping service in pure Python.
# http://code.activestate.com/recipes/409689-icmplib-library-for-creating-and-reading-icmp-pack/
from service import Service
class PingService(Service):
def __init__(self, **kwargs):
super(PingService, self).__init__(**kwargs)
def create(self, **kwargs):
return PingService(**kwargs)
return PingService(**kwargs)

View file

@ -6,6 +6,7 @@ KEY_FAILS = "fails"
KEY_PERIODS = "periods"
KEY_ARGS = "args"
class Service:
def __init__(self, **kwargs):
@ -87,8 +88,7 @@ class Service:
def get_parser(self):
return self._parser
def add_parser(self, parser):
if parser is not None:
if isinstance(parser, list):
@ -115,7 +115,6 @@ class Service:
result = []
for parser in self.get_parser():
result.append(self._parser._parse(executionResult))
def handle_result(self, parseResult):
pass
pass

View file

@ -17,10 +17,10 @@ class ShellService(Service):
def needs_arguments(self):
return True
def execute(self):
self.command.call()
def create(**kwargs):
return ShellService(**kwargs)

View file

@ -50,6 +50,7 @@ class SnmpgetService(Service):
# else:
# for name, val in varBinds:
# print('%s = %s' % (name.prettyPrint(), val.prettyPrint()))
def create(**kargs):
return SnmpgetService(**kwargs)

View file

@ -39,6 +39,7 @@ class SshService(Service):
print '... ' + line.strip('\n')
client.close()
def create(**kwargs):
return SshService(**kwargs)

View file

@ -18,7 +18,6 @@ class TcpconnectService(Service):
self.port = args["port"]
else:
raise Exception("There is no port set")
def needs_arguments(self):
return True
@ -38,6 +37,7 @@ class TcpconnectService(Service):
sock.close()
return
def create(**kwargs):
return TcpconnectService(**kwargs)
return TcpconnectService(**kwargs)