Allow HTTP username and password (-l/-a)

[nagixsc.git] / dummy_read_xml.py

diff --git a/dummy_read_xml.py b/dummy_read_xml.py
index d74d64d490bd1c5996a3c728d1c0c1b6894f7b7a..1cd436306e414f6141f6eb01af475be7823a1402 100755 (executable)
--- a/dummy_read_xml.py
+++ b/dummy_read_xml.py
@@ -9,12 +9,16 @@ import sys
 parser = optparse.OptionParser()
 
 parser.add_option('-u', '', dest='url', help='URL of status file (xml)')
+parser.add_option('-l', '', dest='httpuser', help='HTTP user name')
+parser.add_option('-a', '', dest='httppasswd', help='HTTP password')
 parser.add_option('-f', '', dest='file', help='(Path and) file name of status file')
 parser.add_option('-s', '', dest='seconds', type='int', help='Maximum age in seconds of xml timestamp')
 parser.add_option('-m', '', action='store_true', dest='markold', help='Mark (Set state) of too old checks as UNKNOWN')
 parser.add_option('-v', '', action='count', dest='verb', help='Verbose output')
 
 parser.set_defaults(url=None)
+parser.set_defaults(httpuser=None)
+parser.set_defaults(httppasswd=None)
 parser.set_defaults(file='nagixsc.xml')
 parser.set_defaults(seconds=14400)
 parser.set_defaults(markold=False)
@@ -31,14 +35,7 @@ from nagixsc import *
 now = int(datetime.datetime.now().strftime('%s'))
 
 # Get URL or file
-if options.url != None:
-       import urllib2
-
-       response = urllib2.urlopen(options.url)
-       doc = libxml2.parseDoc(response.read())
-       response.close()
-else:
-       doc = libxml2.parseFile(options.file)
+doc = read_xml(options)
 
 
 # Check XML file basics