whitespacing.... :)
This commit is contained in:
parent
2671dc3273
commit
927fff0c5e
22 changed files with 66 additions and 109 deletions
|
|
@ -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)
|
||||
|
|
@ -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)
|
||||
|
|
@ -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
|
||||
|
|
@ -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)
|
||||
|
|
@ -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)
|
||||
|
|
@ -39,6 +39,7 @@ class SshService(Service):
|
|||
print '... ' + line.strip('\n')
|
||||
client.close()
|
||||
|
||||
|
||||
def create(**kwargs):
|
||||
return SshService(**kwargs)
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
Loading…
Add table
Add a link
Reference in a new issue