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

refactored NodeData and NodeOptions to use server instead of emulation_server

Browse source
This commit is contained in:
bharnden 2019-10-22 20:50:01 -07:00
parent ab0abd65aa
commit cb81095b64
12 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
daemon/core/emulator/data.py
View file

@ -64,7 +64,7 @@ NodeData = collections.namedtuple(
"ip6_address",
"model",
"emulation_id",
"emulation_server",
"server",
"session",
"x_position",
"y_position",

2
daemon/core/emulator/emudata.py
View file

@ -87,7 +87,7 @@ class NodeOptions(object):
self.lon = None
self.alt = None
self.emulation_id = None
self.emulation_server = None
self.server = None
self.image = image
def set_position(self, x, y):

8
daemon/core/emulator/session.py
View file

@ -673,9 +673,9 @@ class Session(object):
name = f"{node_class.__name__}{_id}"
# verify distributed server
server = self.distributed.servers.get(options.emulation_server)
if options.emulation_server is not None and server is None:
raise CoreError(f"invalid distributed server: {options.emulation_server}")
server = self.distributed.servers.get(options.server)
if options.server is not None and server is None:
raise CoreError(f"invalid distributed server: {options.server}")
# create node
logging.info(
@ -713,7 +713,7 @@ class Session(object):
logging.debug("set node type: %s", node.type)
self.services.add_services(node, node.type, options.services)
# boot nodes if created after runtime, CoreNodes, Physical, and RJ45 are all nodes
# boot nodes after runtime, CoreNodes, Physical, and RJ45 are all nodes
is_boot_node = isinstance(node, CoreNodeBase) and not isinstance(node, Rj45Node)
if self.state == EventTypes.RUNTIME_STATE.value and is_boot_node:
self.write_nodes()