Commit 74b78e6b authored by Guilherme Sanches's avatar Guilherme Sanches

refs #104462 : Changes in the configurator files due to bad merge

 Changes to be committed:
	modified:   ../../tools/configurator/parsers/iop/gaisler_devices.py
	modified:   ../../tools/configurator/parsers/iop/parser.py
parent 70693006
......@@ -2,7 +2,6 @@
# @author pfnf
# modified by lumm and gmvs
# @brief Functions to parse gaisler devices
from sqlalchemy.sql.expression import false
__author__ = 'pfnf'
__modified__ = 'lumm'
......
......@@ -213,7 +213,7 @@ class IOParser(object):
self.logger.information(1, pdevice.setup.details())
self.logger.event('BEFORE parsing physical routing')
self.logger.event(0, 'BEFORE parsing physical routing')
if ( pdevice.type == RTR ):
pdevice.idx = len(self.physical_devices)
......@@ -225,14 +225,14 @@ class IOParser(object):
xml_routes = xml.parse_tag(ROUTE_PHYSICAL, 1, maxint, self.logger)
for xml_route in xml_routes:
rc &= self.parse_device_routes(xml_route, pdevice)
self.logger.event(rc)
self.logger.event(0, rc)
self.logger.event('AFTER parsing physical routing and BEFORE logical')
self.logger.event(0, 'AFTER parsing physical routing and BEFORE logical')
# Parse Logical Routing
xml_routes = xml.parse_tag(ROUTE_LOGICAL, 1, maxint, self.logger)
for xml_route in xml_routes:
rc &= self.parse_device_routes(xml_route, pdevice)
self.logger.event(rc)
self.logger.event(0, rc)
self.logger.event(0, "PHYDEV?", rc)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment