Skip to content

Commit 199bc08

Browse files
llambielsebgoa
authored andcommitted
CLOUDSTACK-6927: less code
1 parent 07602d8 commit 199bc08

1 file changed

Lines changed: 10 additions & 12 deletions

File tree

scripts/vm/network/security_group.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ def delete_rules_for_vm_in_bridge_firewall_chain(vmName):
547547
delcmds = execute(delcmd).split('\n')
548548
delcmds.pop()
549549
for cmd in delcmds:
550-
if cmd == '':
550+
if cmd == "":
551551
continue
552552
try:
553553
execute("iptables " + cmd)
@@ -689,15 +689,14 @@ def cleanup_rules():
689689
chains = execute(chainscmd).split('\n')
690690
cleanup = []
691691
for chain in chains:
692-
if chain == '':
692+
if chain == "":
693693
continue
694-
elif chain.startswith(':'):
694+
elif chain.startswith(":"):
695695
chain = chain[1:]
696-
if chain.endswith('-eg'):
696+
if chain.endswith("-eg"):
697697
chain = chain[:-3]
698-
elif chain.endswith('-def'):
699-
chain = chain[:-3]
700-
chain = chain + 'VM'
698+
elif chain.endswith("-def"):
699+
chain = chain[:-3] + "VM"
701700

702701
vm_name = chain
703702

@@ -714,13 +713,12 @@ def cleanup_rules():
714713
chainscmd = """ebtables-save | awk '{for(i=1;i<=NF;i++){ if($i ~ /[i|r|s|v]-[0-9]/){print $i} } }'"""
715714
chains = execute(chainscmd).split('\n')
716715
for chain in chains:
717-
if chain == '':
716+
if chain == "":
718717
continue
719-
elif chain.startswith(':'):
718+
elif chain.startswith(":"):
720719
chain = chain[1:]
721-
if not chain.endswith('VM'):
722-
chain = chain.split('VM')
723-
chain = chain[0] + 'VM'
720+
if not chain.endswith("VM"):
721+
chain = chain.split("VM")[0] + "VM"
724722

725723
vm_name = chain
726724

0 commit comments

Comments
 (0)