etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 11420: reduce duration of disruption

This commit is contained in:
Chiradeep Vittal 2011-09-13 23:32:24 -07:00
parent 31ee0d3979
commit 450ace1051
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/vm/hypervisor/xenserver/vmops
View File

@ -1052,8 +1052,8 @@ def network_rules(session, args):
util.SMlog("Programming network rules for vm %s seqno=%s numrules=%s signature=%s guestIp=%s,"\
" update iptables, reason=%s" % (vm_name, seqno, len(lines), signature, vm_ip, reason))
util.pread2(['iptables', '-F', vmchain])
cmds = []
for line in lines:
tokens = line.split(':')
if len(tokens) != 4:
@ -1087,7 +1087,7 @@ def network_rules(session, args):
if start == "-1":
range = "any"
iptables = ['iptables', '-I', vmchain, '-p', 'icmp', '--icmp-type', range, '-m', 'set', '--match-set', ipsetname, 'src', '-j', 'ACCEPT']
util.pread2(iptables)
cmds.append(iptables)
util.SMlog(iptables)
if allow_any and protocol != 'all':
@ -1098,9 +1098,12 @@ def network_rules(session, args):
if start == "-1":
range = "any"
iptables = ['iptables', '-I', vmchain, '-p', 'icmp', '--icmp-type', range, '-j', 'ACCEPT']
util.pread2(iptables)
cmds.append(iptables)
util.SMlog(iptables)
util.pread2(['iptables', '-F', vmchain])
for cmd in cmds:
util.pread2(cmd)
util.pread2(['iptables', '-A', vmchain, '-j', 'DROP'])
if write_rule_log_for_vm(vm_name, vm_id, vm_ip, domid, signature, seqno) == False: