refactored service methods to be shorter, updated some logging to debug, added some more service tests
This commit is contained in:
parent
8186f3716c
commit
bb533406a6
23 changed files with 226 additions and 112 deletions
|
@ -370,7 +370,7 @@ class CoreDocumentParser0(object):
|
|||
filename = file.getAttribute("name")
|
||||
files.append(filename)
|
||||
data = xmlutils.get_text_child(file)
|
||||
self.session.services.set_service_file(node_id=n.objid, service_name=name, filename=filename, data=data)
|
||||
self.session.services.set_service_file(node_id=n.objid, service_name=name, file_name=filename, data=data)
|
||||
|
||||
if len(files):
|
||||
values.append("files=%s" % files)
|
||||
|
|
|
@ -651,7 +651,7 @@ class CoreDocumentParser1(object):
|
|||
self.session.services.set_service_file(
|
||||
node_id=node.objid,
|
||||
service_name=svcname,
|
||||
filename=filename,
|
||||
file_name=filename,
|
||||
data=data
|
||||
)
|
||||
return str(name)
|
||||
|
|
|
@ -694,7 +694,7 @@ class DeviceElement(NamedXmlElement):
|
|||
f.setAttribute("name", fn)
|
||||
# all file names are added to determine when a file has been deleted
|
||||
s.appendChild(f)
|
||||
data = svc.configtxt.get(fn)
|
||||
data = svc.config_data.get(fn)
|
||||
if data is None:
|
||||
# this includes only customized file contents and skips
|
||||
# the auto-generated files
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue