# HG changeset patch # User igor # Date 1190396920 -10800 # Node ID d22ff6f55dc511ee178638146658ff84bf7a4084 # Parent 9821c9a972cd3fcf0f4f925b0342ec4d6640b63b autoredraw + link state fix diff -r 9821c9a972cd -r d22ff6f55dc5 xentaur.py --- a/xentaur.py Fri Sep 21 20:22:10 2007 +0300 +++ b/xentaur.py Fri Sep 21 20:48:40 2007 +0300 @@ -104,8 +104,8 @@ for this_bridge in bridges_raw: if this_bridge in hidden_bridges or not this_bridge: continue - if not [ host, this_bridge ] in temporary_links: - links.append(host+" -- "+this_bridge+" [taillabel=\"fa"+str(i)+"/0\"]") + if not [ host, bridges_raw.index(this_bridge), this_bridge ] in temporary_links: + links.append(host+" -- "+this_bridge+" [taillabel=\"fa"+str(bridges_raw.index(this_bridge))+"/0\"]") i+=1 # if [ host, this_bridge ] in broken_links: # links.append(host+" -- "+this_bridge+" [taillabel=\"fa"+str(i)+"/0\",style=dashed]") @@ -113,10 +113,10 @@ # links.append(host+" -- "+this_bridge+" [taillabel=\"fa"+str(i)+"/0\"]") for link in temporary_links: - links.append(link[0]+" -- "+link[1]+" [color=blue,len=10,w=5,weight=5]") + links.append(link[0]+" -- "+link[2]+" [taillabel=\"fa"+str(link[1])+"/0\",color=blue,len=10,w=5,weight=5]") for link in broken_links: - links.append(link[0]+" -- "+link[1]+" [taillabel=\"fa"+str(i)+"/0\",style=dashed]") + links.append(link[0]+" -- "+link[2]+" [taillabel=\"fa"+str(link[1])+"/0\",style=dashed]") linklist=";\n ".join(links) @@ -231,10 +231,10 @@ return 1 run_command("sudo brctl delif %s vif%s.%s" % (bridge, dom_id, int_number)) vbridges_table[domain][int_number]='' - if [ domain, bridge ] in temporary_links: - temporary_links.remove([ domain, bridge ]) + if [ domain, int_number, bridge ] in temporary_links: + temporary_links.remove([ domain, int_number, bridge ]) else: - broken_links.append([ domain, bridge ]) + broken_links.append([ domain, int_number, bridge ]) autoredraw() def int_connect(domain, int_number, bridge): @@ -249,10 +249,10 @@ return 1 run_command("sudo brctl addif %s vif%s.%s" % (bridge, dom_id, int_number)) vbridges_table[domain][int_number]=bridge - if [ domain, bridge ] in broken_links: - broken_links.remove([ domain, bridge ]) + if [ domain, int_number, bridge ] in broken_links: + broken_links.remove([ domain, int_number, bridge ]) else: - temporary_links.append([ domain, bridge ]) + temporary_links.append([ domain, int_number, bridge ]) autoredraw() def int_reconnect(domain, int_number, bridge): @@ -271,6 +271,13 @@ """ return vbridges_table[domain][int_number] + +def dump_start(bridge, filter=""): + return 0 + +def dump_stop(): + return 0 + #-----------------------------------------------------------------------