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

separated distributed session logic into its own class to help reduce session.py size as it is already too big

Browse source
This commit is contained in:
Blake Harnden 2019-10-17 11:10:59 -07:00
parent 0ef06a0167
commit e94a6d1afa
14 changed files with 196 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

9
daemon/core/nodes/network.py
View file

@ -289,9 +289,7 @@ class CoreNetwork(CoreNetworkBase):
"""
logging.info("network node(%s) cmd", self.name)
output = utils.check_cmd(args, env, cwd, wait)
for name in self.session.servers:
server = self.session.servers[name]
server.remote_cmd(args, env, cwd, wait)
self.session.distributed.execute(lambda x: x.remote_cmd(args, env, cwd, wait))
return output
def startup(self):
@ -778,8 +776,9 @@ class CtrlNet(CoreNetwork):
current = "%s/%s" % (address, self.prefix.prefixlen)
net_client = get_net_client(use_ovs, utils.check_cmd)
net_client.create_address(self.brname, current)
for name in self.session.servers:
server = self.session.servers[name]
servers = self.session.distributed.servers
for name in servers:
server = servers[name]
address -= 1
current = "%s/%s" % (address, self.prefix.prefixlen)
net_client = get_net_client(use_ovs, server.remote_cmd)

2
daemon/core/nodes/physical.py
View file

@ -166,7 +166,7 @@ class PhysicalNode(CoreNodeBase):
if self.up:
# this is reached when this node is linked to a network node
# tunnel to net not built yet, so build it now and adopt it
_, remote_tap = self.session.create_gre_tunnel(net, self.server)
_, remote_tap = self.session.distributed.create_gre_tunnel(net, self.server)
self.adoptnetif(remote_tap, ifindex, hwaddr, addrlist)
return ifindex
else: