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

daemon: fixed sdt icons due to legacy gui removal, updated node.type to node.model to avoid variables with the same names with different meanings

Browse source
This commit is contained in:
Blake Harnden 2022-04-05 13:39:57 -07:00
parent ea751727b4
commit 5ee561b210
15 changed files with 73 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

25
daemon/core/xml/corexml.py
View file

@ -211,7 +211,7 @@ class ServiceElement:
class DeviceElement(NodeElement):
def __init__(self, session: "Session", node: NodeBase) -> None:
super().__init__(session, node, "device")
add_attribute(self.element, "type", node.type)
add_attribute(self.element, "type", node.model)
self.add_class()
self.add_services()
@ -434,15 +434,14 @@ class CoreXmlWriter:
self.scenario.append(service_configurations)
def write_default_services(self) -> None:
node_types = etree.Element("default_services")
for node_type in self.session.services.default_services:
services = self.session.services.default_services[node_type]
node_type = etree.SubElement(node_types, "node", type=node_type)
models = etree.Element("default_services")
for model in self.session.services.default_services:
services = self.session.services.default_services[model]
model = etree.SubElement(models, "node", type=model)
for service in services:
etree.SubElement(node_type, "service", name=service)
if node_types.getchildren():
self.scenario.append(node_types)
etree.SubElement(model, "service", name=service)
if models.getchildren():
self.scenario.append(models)
def write_nodes(self) -> None:
for node_id in self.session.nodes:
@ -586,14 +585,12 @@ class CoreXmlReader:
return
for node in default_services.iterchildren():
node_type = node.get("type")
model = node.get("type")
services = []
for service in node.iterchildren():
services.append(service.get("name"))
logger.info(
"reading default services for nodes(%s): %s", node_type, services
)
self.session.services.default_services[node_type] = services
logger.info("reading default services for nodes(%s): %s", model, services)
self.session.services.default_services[model] = services
def read_session_metadata(self) -> None:
session_metadata = self.scenario.find("session_metadata")