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

catching up with commits: daemon: Add an instantiation-complete CORE API event type

Browse source
This commit is contained in:
Blake J. Harnden 2017-04-25 11:38:53 -07:00
parent 00f4ebf5a9
commit 2fc6345138
8 changed files with 377 additions and 332 deletions
Download patch file Download diff file Expand all files Collapse all files

11
daemon/core/mobility.py
View file

@ -53,7 +53,7 @@ class MobilityManager(ConfigurableManager):
# dummy node objects for tracking position of nodes on other servers
self.phys = {}
self.physnets = {}
self.session.broker.handlers += (self.physnodehandlelink,)
self.session.broker.handlers.add(self.physnodehandlelink)
def startup(self, node_ids=None):
"""
@ -254,12 +254,13 @@ class MobilityManager(ConfigurableManager):
for nodenum in nodenums:
node = self.phys[nodenum]
servers = self.session.broker.getserversbynode(nodenum)
(host, port, sock) = self.session.broker.getserver(servers[0])
netif = self.session.broker.gettunnel(net.objid, IpAddress.to_int(host))
# TODO: fix this bad logic, relating to depending on a break to get a valid server
for server in self.session.broker.getserversbynode(nodenum):
break
netif = self.session.broker.gettunnel(net.objid, IpAddress.to_int(server.host))
node.addnetif(netif, 0)
netif.node = node
(x, y, z) = netif.node.position.get()
x, y, z = netif.node.position.get()
netif.poshook(netif, x, y, z)