m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #249 from FirmlyReality/network 

Fix a bug that remove gre when recovering usernet
This commit is contained in:
Yujian Zhu 2017-05-22 17:23:22 +08:00 committed by GitHub
parent 98df83c1b2 fd3faee093
commit 202fb7bdde
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nettools.py
View File

@ -292,11 +292,11 @@ class netcontrol(object):
@staticmethod @staticmethod
def recover_usernet(portname, uid, GatewayHost, isGatewayHost): def recover_usernet(portname, uid, GatewayHost, isGatewayHost):
ovscontrol.add_bridge("docklet-br-"+str(uid)) ovscontrol.add_bridge("docklet-br-"+str(uid))
[success, ports] = ovscontrol.list_ports("docklet-br-"+str(uid))
if success:
for port in ports:
if port.startswith("gre"):
ovscontrol.del_port("docklet-br-"+str(uid),port)
if not isGatewayHost: if not isGatewayHost:
[success, ports] = ovscontrol.list_ports("docklet-br-"+str(uid))
if success:
for port in ports:
if port.startswith("gre") and (not port == ("gre-"+str(uid)+"-"+GatewayHost) ) :
ovscontrol.del_port("docklet-br-"+str(uid),port)
ovscontrol.add_port_gre_withkey("docklet-br-"+str(uid), "gre-"+str(uid)+"-"+GatewayHost, GatewayHost, str(uid)) ovscontrol.add_port_gre_withkey("docklet-br-"+str(uid), "gre-"+str(uid)+"-"+GatewayHost, GatewayHost, str(uid))
ovscontrol.add_port("docklet-br-"+str(uid), portname) ovscontrol.add_port("docklet-br-"+str(uid), portname)