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

refactored service function names

Browse source
This commit is contained in:
Blake J. Harnden 2018-06-22 14:41:06 -07:00
parent 0efcd910db
commit 8186f3716c
14 changed files with 127 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

10
daemon/core/xml/xmlparser0.py
View file

@ -279,7 +279,7 @@ class CoreDocumentParser0(object):
services = []
for service in node.getElementsByTagName("Service"):
services.append(str(service.getAttribute("name")))
self.session.services.defaultservices[type] = services
self.session.services.default_services[type] = services
logger.info("default services for type %s set to %s" % (type, services))
def parseservices(self):
@ -319,7 +319,7 @@ class CoreDocumentParser0(object):
services = svclists[objid]
if services:
services = services.split("|")
self.session.services.addservicestonode(node=n, node_type=n.type, services=services)
self.session.services.add_services(node=n, node_type=n.type, services=services)
def parseservice(self, service, n):
"""
@ -370,15 +370,15 @@ class CoreDocumentParser0(object):
filename = file.getAttribute("name")
files.append(filename)
data = xmlutils.get_text_child(file)
self.session.services.setservicefile(node_id=n.objid, service_name=name, filename=filename, data=data)
self.session.services.set_service_file(node_id=n.objid, service_name=name, filename=filename, data=data)
if len(files):
values.append("files=%s" % files)
if not bool(service.getAttribute("custom")):
return True
self.session.services.setcustomservice(n.objid, svc)
self.session.services.set_service(n.objid, svc)
# set custom values for custom service
svc = self.session.services.getcustomservice(n.objid, None)
svc = self.session.services.get_service(n.objid, None)
if not svc:
raise ValueError("custom service(%s) for node(%s) does not exist", svc.name, n.objid)
values = ConfigShim.str_to_dict("|".join(values))

8
daemon/core/xml/xmlparser1.py
View file

@ -639,7 +639,7 @@ class CoreDocumentParser1(object):
custom = service.getAttribute('custom')
if custom and custom.lower() == 'true':
self.session.services.setcustomservice(node.objid, session_service.name)
self.session.services.set_service(node.objid, session_service.name)
values = ConfigShim.str_to_dict("|".join(values))
for key, value in values.iteritems():
ServiceShim.setvalue(session_service, key, value)
@ -648,7 +648,7 @@ class CoreDocumentParser1(object):
# called after the custom service exists
for typestr, filename, data in files:
svcname = typestr.split(":")[1]
self.session.services.setservicefile(
self.session.services.set_service_file(
node_id=node.objid,
service_name=svcname,
filename=filename,
@ -683,7 +683,7 @@ class CoreDocumentParser1(object):
if services_str:
services_str = services_str.split("|")
self.session.services.addservicestonode(
self.session.services.add_services(
node=node,
node_type=node_type,
services=services_str
@ -885,5 +885,5 @@ class CoreDocumentParser1(object):
self.default_services[device_type] = services
# store default services for the session
for t, s in self.default_services.iteritems():
self.session.services.defaultservices[t] = s
self.session.services.default_services[t] = s
logger.info('default services for node type \'%s\' set to: %s' % (t, s))

8
daemon/core/xml/xmlwriter0.py
View file

@ -276,8 +276,8 @@ class CoreDocumentWriter0(Document):
"""
Add default services and node types to the ServicePlan.
"""
for type in self.session.services.defaultservices:
defaults = self.session.services.getdefaultservices(type)
for type in self.session.services.default_services:
defaults = self.session.services.get_default_services(type)
spn = self.createElement("Node")
spn.setAttribute("type", type)
self.sp.appendChild(spn)
@ -292,7 +292,7 @@ class CoreDocumentWriter0(Document):
"""
if len(node.services) == 0:
return
defaults = self.session.services.getdefaultservices(node.type)
defaults = self.session.services.get_default_services(node.type)
if node.services == defaults:
return
spn = self.createElement("Node")
@ -316,7 +316,7 @@ class CoreDocumentWriter0(Document):
f.setAttribute("name", fn)
# all file names are added to determine when a file has been deleted
s.appendChild(f)
data = self.session.services.getservicefiledata(svc, fn)
data = svc.config_data.get(fn)
if data is None:
# this includes only customized file contents and skips
# the auto-generated files

6
daemon/core/xml/xmlwriter1.py
View file

@ -269,8 +269,8 @@ class ScenarioPlan(XmlElement):
Add default services and node types to the ServicePlan.
"""
defaultservices = self.createElement("CORE:defaultservices")
for type in self.coreSession.services.defaultservices:
defaults = self.coreSession.services.getdefaultservices(type)
for type in self.coreSession.services.default_services:
defaults = self.coreSession.services.get_default_services(type)
spn = self.createElement("device")
spn.setAttribute("type", type)
defaultservices.appendChild(spn)
@ -670,7 +670,7 @@ class DeviceElement(NamedXmlElement):
if len(device_object.services) == 0:
return
defaults = self.coreSession.services.getdefaultservices(device_object.type)
defaults = self.coreSession.services.get_default_services(device_object.type)
if device_object.services == defaults:
return
spn = self.createElement("CORE:services")