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

daemon: updated xml to write and read session configured distributed servers, updated pygui to send servers before session start or saving xml

Browse source
This commit is contained in:
Blake Harnden 2020-07-08 08:24:23 -07:00
parent bb4514b93e
commit 43b586a1a1
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/core/gui/coreclient.py
View file

@ -510,6 +510,10 @@ class CoreClient:
except grpc.RpcError as e: except grpc.RpcError as e:
self.app.show_grpc_exception("Edit Node Error", e) self.app.show_grpc_exception("Edit Node Error", e)
def send_servers(self) -> None:
for server in self.servers.values():
self.client.add_session_server(self.session_id, server.name, server.address)
def start_session(self) -> StartSessionResponse: def start_session(self) -> StartSessionResponse:
self.ifaces_manager.reset_mac() self.ifaces_manager.reset_mac()
nodes = [x.core_node for x in self.canvas_nodes.values()] nodes = [x.core_node for x in self.canvas_nodes.values()]
@ -538,6 +542,7 @@ class CoreClient:
emane_config = None emane_config = None
response = StartSessionResponse(result=False) response = StartSessionResponse(result=False)
try: try:
self.send_servers()
response = self.client.start_session( response = self.client.start_session(
self.session_id, self.session_id,
nodes, nodes,
@ -749,6 +754,7 @@ class CoreClient:
""" """
Send to daemon all session info, but don't start the session Send to daemon all session info, but don't start the session
""" """
self.send_servers()
self.create_nodes_and_links() self.create_nodes_and_links()
for config_proto in self.get_wlan_configs_proto(): for config_proto in self.get_wlan_configs_proto():
self.client.set_wlan_config( self.client.set_wlan_config(

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

@ -284,6 +284,7 @@ class CoreXmlWriter:
self.write_service_configs() self.write_service_configs()
self.write_configservice_configs() self.write_configservice_configs()
self.write_session_origin() self.write_session_origin()
self.write_servers()
self.write_session_hooks() self.write_session_hooks()
self.write_session_options() self.write_session_options()
self.write_session_metadata() self.write_session_metadata()
@ -318,6 +319,15 @@ class CoreXmlWriter:
add_attribute(origin, "y", y) add_attribute(origin, "y", y)
add_attribute(origin, "z", z) add_attribute(origin, "z", z)
def write_servers(self) -> None:
servers = etree.Element("servers")
for server in self.session.distributed.servers.values():
server_element = etree.SubElement(servers, "server")
add_attribute(server_element, "name", server.name)
add_attribute(server_element, "address", server.host)
if servers.getchildren():
self.scenario.append(servers)
def write_session_hooks(self) -> None: def write_session_hooks(self) -> None:
# hook scripts # hook scripts
hooks = etree.Element("session_hooks") hooks = etree.Element("session_hooks")
@ -572,6 +582,7 @@ class CoreXmlReader:
self.read_session_metadata() self.read_session_metadata()
self.read_session_options() self.read_session_options()
self.read_session_hooks() self.read_session_hooks()
self.read_servers()
self.read_session_origin() self.read_session_origin()
self.read_service_configs() self.read_service_configs()
self.read_mobility_configs() self.read_mobility_configs()
@ -635,6 +646,16 @@ class CoreXmlReader:
logging.info("reading hook: state(%s) name(%s)", state, name) logging.info("reading hook: state(%s) name(%s)", state, name)
self.session.add_hook(state, name, data) self.session.add_hook(state, name, data)
def read_servers(self) -> None:
servers = self.scenario.find("servers")
if servers is None:
return
for server in servers.iterchildren():
name = server.get("name")
address = server.get("address")
logging.info("reading server: name(%s) address(%s)", name, address)
self.session.distributed.add_server(name, address)
def read_session_origin(self) -> None: def read_session_origin(self) -> None:
session_origin = self.scenario.find("session_origin") session_origin = self.scenario.find("session_origin")
if session_origin is None: if session_origin is None: