[Oval-commits] r177 - trunk/oval-agent/ovalHttpClient
Pavel Vinogradov
blaze-guest at alioth.debian.org
Mon Aug 20 18:41:50 UTC 2007
Author: blaze-guest
Date: 2007-08-20 18:41:50 +0000 (Mon, 20 Aug 2007)
New Revision: 177
Modified:
trunk/oval-agent/ovalHttpClient/ovalHttpClient.py
Log:
Implement result submit
Modified: trunk/oval-agent/ovalHttpClient/ovalHttpClient.py
===================================================================
--- trunk/oval-agent/ovalHttpClient/ovalHttpClient.py 2007-08-20 18:25:57 UTC (rev 176)
+++ trunk/oval-agent/ovalHttpClient/ovalHttpClient.py 2007-08-20 18:41:50 UTC (rev 177)
@@ -20,7 +20,6 @@
self.systemCharacteristic = '%s/system-characteristic.xml' % self.workdir
self.evaluationResult = {'1341' : 't', '1353' : 't', '1245' : 'f'}
- self.fields = (('1341', 't'), ('1353', 't'), ('1245', 'f'))
def getDefinitions(self):
#http://www.diveintopython.org/http_web_services/index.html
@@ -32,30 +31,30 @@
file = open(self.definitionsPath, 'w')
file.write(data)
file.close()
- self.evaluate()
+ result = self.evaluate()
self.postResult()
def postResult(self):
self.logger.debug('Send response to server')
- fp = urllib2.urlopen(self.url, urllib.urlencode(self.fields))
- print fp.geturl()
+ fp = urllib2.urlopen(self.url, urllib.urlencode(self.evaluationResult))
+ fp.geturl()
def parse (self, result):
- status = {}
+ status = []
pattern = re.compile(r'oval:org\.debian:def:(\d{1,5}) *([true|false])')
for line in result.split('\n'):
result = pattern.search (line)
if result:
- status[result.groups()[0]] =result.groups()[1]
+ status.append((result.groups()[0], result.groups()[1]))
return status
def evaluate(self):
self.logger.debug ('Start definitions evaluation')
result = os.popen('ovaldi -m -o %s/definitions.xml' % self.workdir)
res = result.read()
- print self.parse (res)
+ self.evaluationResult = self.parse (res)
def run(self):
while 1:
More information about the Oval-commits
mailing list