summaryrefslogtreecommitdiffstats
path: root/func/minion
diff options
context:
space:
mode:
authorJohn Eckersberg <jeckersb@redhat.com>2008-02-01 17:36:35 -0500
committerJohn Eckersberg <jeckersb@redhat.com>2008-02-01 17:36:35 -0500
commit5f5fd521d81e8c6f1f522d21d883fc70a302a8cd (patch)
tree854f9be40a54d3fca1a0b6121fe1f7a8ceb917b8 /func/minion
parent3fc351eed2c8e454795235bb3df4575e7d7db604 (diff)
downloadfunc-5f5fd521d81e8c6f1f522d21d883fc70a302a8cd.tar.gz
func-5f5fd521d81e8c6f1f522d21d883fc70a302a8cd.tar.xz
func-5f5fd521d81e8c6f1f522d21d883fc70a302a8cd.zip
get rid of param_check and the NetappMissingParam exception
Diffstat (limited to 'func/minion')
-rw-r--r--func/minion/modules/netapp/common.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/func/minion/modules/netapp/common.py b/func/minion/modules/netapp/common.py
index ebe75ab..979c95c 100644
--- a/func/minion/modules/netapp/common.py
+++ b/func/minion/modules/netapp/common.py
@@ -20,7 +20,6 @@ SSH_USER = 'root'
SSH_OPTS = '-o forwardagent=no'
class GenericSSHError(Exception): pass
class NetappCommandError(Exception): pass
-class NetappMissingParam(Exception): pass
def ssh(host, cmdargs, input=None, user=SSH_USER):
cmdline = [SSH, SSH_OPTS, "%s@%s" % (user, host)]
@@ -34,17 +33,12 @@ def ssh(host, cmdargs, input=None, user=SSH_USER):
shell=False)
(out, err) = cmd.communicate(input)
-
+
if cmd.wait() != 0:
raise GenericSSHError, err
else:
return out + err
-def param_check(args, required):
- for r in required:
- if not args.has_key(r):
- raise NetappMissingParam, r
-
def check_output(regex, output):
#strip newlines
output = output.replace('\n', ' ')