openstack
/
nova
Code Issues Proposed changes

Merge "Reduce code complexity - linux_net.py"

This commit is contained in:
Zuul 2017-12-01 08:59:03 +00:00 committed by Gerrit Code Review
parent 96cf7ed401 55da0ec11e
commit b6a245f042
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
nova/network/linux_net.py
View File

@ -386,6 +386,17 @@ class IptablesManager(object):
end = lines[start:].index('COMMIT') + start + 2
return (start, end)
@staticmethod
def create_rules_from_regexp(criterion, new_filter):
if not criterion:
return [], new_filter
regex = re.compile(criterion)
temp_filter = [line for line in new_filter if regex.search(line)]
for rule_str in temp_filter:
new_filter = [s for s in new_filter
if s.strip() != rule_str.strip()]
return temp_filter, new_filter
def _modify_rules(self, current_lines, table, table_name):
unwrapped_chains = table.unwrapped_chains
chains = sorted(table.chains)
@ -403,24 +414,10 @@ class IptablesManager(object):
new_filter = [line for line in current_lines
if binary_name not in line]
top_rules = []
bottom_rules = []
if CONF.iptables_top_regex:
regex = re.compile(CONF.iptables_top_regex)
temp_filter = [line for line in new_filter if regex.search(line)]
for rule_str in temp_filter:
new_filter = [s for s in new_filter
if s.strip() != rule_str.strip()]
top_rules = temp_filter
if CONF.iptables_bottom_regex:
regex = re.compile(CONF.iptables_bottom_regex)
temp_filter = [line for line in new_filter if regex.search(line)]
for rule_str in temp_filter:
new_filter = [s for s in new_filter
if s.strip() != rule_str.strip()]
bottom_rules = temp_filter
top_rules, new_filter = self.create_rules_from_regexp(
CONF.iptables_top_regex, new_filter)
bottom_rules, new_filter = self.create_rules_from_regexp(
CONF.iptables_bottom_regex, new_filter)
seen_chains = False
rules_index = 0