apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 7722: open vswitch -

Browse Source 
1. extend gre tunnel creating timeout to 30 secs
2. don't del drop flow since we don't delete gre tunnel
This commit is contained in:
Frank 2011-01-14 17:10:49 -08:00
parent f45a8238fe
commit e6b0346270
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/vm/hypervisor/xenserver/ovsgre
View File

@ -285,7 +285,7 @@ def ovs_create_gre (session, args):
addBridge = [vsctlPath, "add bridge %s" % bridge, "ports %s" % portUUID]
do_cmd (addBridge)
wait = [vsctlPath, "--timeout=5 wait-until port %s -- get port %s name" % \
wait = [vsctlPath, "--timeout=30 wait-until port %s -- get port %s name" % \
(name, name)]
res = do_cmd(wait)
if name in res:
@ -446,11 +446,6 @@ def del_arp_and_dhcp_flow(bridge, vlan, inPort):
flow = ["ovs-ofctl del-flows %s" % bridge, '"%s"' % param]
do_cmd(flow)
def del_drop_flow(bridge, vlan):
param = "priority=0 dl_vlan=%s" % vlan
flow = ["ovs-ofctl del-flows %s" % bridge, '"%s"' % param]
do_cmd(flow)
def format_normal_flow():
flow = "priority=0 idle_timeout=0 hard_timeout=0 actions=normal"
return flow
@ -573,14 +568,6 @@ def delete_vm_flows(bridge, vmName, reCreate=True):
pr(e.__str__())
pr("invalid map")
for v in vlans:
try:
(vlan, inport) = v.split(":")
del_drop_flow(bridge, vlan)
except Exception, e:
pr(e.__str__())
pr("invalid map")
if reCreate == False:
return