afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

daemon: Renumber XML versioning.

Browse source 
Consider the current XML representation version 0.0.
This commit is contained in:
tgoff0 2015-02-05 00:15:59 +00:00
parent bc3ba68b28
commit 899b5ae5be
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
daemon/core/misc/xmlparser.py
View file

@ -4,13 +4,13 @@
from xml.dom.minidom import parse from xml.dom.minidom import parse
from xmlutils import getoneelement from xmlutils import getoneelement
from xmlparser1 import CoreDocumentParser1 from xmlparser0 import CoreDocumentParser0
class CoreVersionParser(object): class CoreVersionParser(object):
'''\ '''\
Helper class to check the version of Network Plan document. This Helper class to check the version of Network Plan document. This
simply looks for a "Scenario" element; when present, this simply looks for a "Scenario" element; when present, this
indicates a 1.0 version document. The dom member is set in order indicates a 0.0 version document. The dom member is set in order
to prevent parsing a file twice (it can be passed to the to prevent parsing a file twice (it can be passed to the
appropriate CoreDocumentParser class.) appropriate CoreDocumentParser class.)
''' '''
@ -21,7 +21,7 @@ class CoreVersionParser(object):
self.dom = parse(filename) self.dom = parse(filename)
self.scenario = getoneelement(self.dom, 'Scenario') self.scenario = getoneelement(self.dom, 'Scenario')
if self.scenario is not None: if self.scenario is not None:
self.version = 1.0 self.version = 0.0
else: else:
self.version = 'unknown' self.version = 'unknown'
@ -29,8 +29,8 @@ def core_document_parser(session, filename, options):
vp = CoreVersionParser(filename, options) vp = CoreVersionParser(filename, options)
if 'dom' not in options: if 'dom' not in options:
options['dom'] = vp.dom options['dom'] = vp.dom
if vp.version == 1.0: if vp.version == 0.0:
doc = CoreDocumentParser1(session, filename, options) doc = CoreDocumentParser0(session, filename, options)
else: else:
raise ValueError, 'unsupported document version: %s' % vp.version raise ValueError, 'unsupported document version: %s' % vp.version
return doc return doc

2
daemon/core/misc/xmlparser1.py → daemon/core/misc/xmlparser0.py
View file

@ -10,7 +10,7 @@ from core.netns import nodes
from xml.dom.minidom import parse from xml.dom.minidom import parse
from xmlutils import * from xmlutils import *
class CoreDocumentParser1(object): class CoreDocumentParser0(object):
def __init__(self, session, filename, options): def __init__(self, session, filename, options):
self.session = session self.session = session
self.verbose = self.session.getcfgitembool('verbose', False) self.verbose = self.session.getcfgitembool('verbose', False)