@@ -168,7 +168,7 @@ def chain_exist(chain, table, filename, lineno):
return True if (ret == 0) else False
-def chain_create(chain, chain_type, chain_list, table, filename, lineno):
+def chain_create(chain, chain_type, table, filename, lineno):
'''
Adds a chain
'''
@@ -239,7 +239,7 @@ def chain_delete(chain, table, filename=None, lineno=None):
return 0
-def set_add(set_info, table_list, filename, lineno):
+def set_add(set_info, filename, lineno):
'''
Adds a set.
'''
@@ -275,8 +275,7 @@ def set_add(set_info, table_list, filename, lineno):
return 0
-def set_add_elements(set_element, set_name, set_all, state, table_list,
- filename, lineno):
+def set_add_elements(set_element, set_name, state, filename, lineno):
'''
Adds elements to the set.
'''
@@ -288,7 +287,7 @@ def set_add_elements(set_element, set_name, set_all, state, table_list,
for table in table_list:
# Check if set exists.
if (not set_exist(set_name, table, filename, lineno) or
- set_name not in set_all) and state == "ok":
+ set_name not in all_set) and state == "ok":
reason = "I cannot add an element to the set " + set_name + \
" since it does not exist."
print_error(reason, filename, lineno)
@@ -316,7 +315,7 @@ def set_add_elements(set_element, set_name, set_all, state, table_list,
# Add element into a all_set.
if ret == 0 and state == "ok":
for e in set_element:
- set_all[set_name].add(e)
+ all_set[set_name].add(e)
return 0
@@ -341,7 +340,7 @@ def set_delete_elements(set_element, set_name, table, filename=None,
return 0
-def set_delete(all_set, table, filename=None, lineno=None):
+def set_delete(table, filename=None, lineno=None):
'''
Deletes set and its content.
'''
@@ -475,8 +474,7 @@ def payload_check(payload_buffer, file, cmd):
return i > 0
-def rule_add(rule, table_list, chain_list, filename, lineno,
- force_all_family_option, filename_path):
+def rule_add(rule, filename, lineno, force_all_family_option, filename_path):
'''
Adds a rule
'''
@@ -609,7 +607,7 @@ def cleanup_on_exit():
for chain in chain_list:
chain_delete(chain, table, "", "")
if all_set:
- set_delete(all_set, table)
+ set_delete(table)
table_delete(table)
@@ -675,8 +673,7 @@ def chain_process(chain_line, filename, lineno):
for table in table_list:
if len(chain_line) > 1:
chain_type = chain_line[1]
- ret = chain_create(chain_name, chain_type, chain_list, table, filename,
- lineno)
+ ret = chain_create(chain_name, chain_type, table, filename, lineno)
if ret != 0:
return -1
return 0
@@ -690,7 +687,7 @@ def set_process(set_line, filename, lineno):
set_state = set_line[1].split(";")[1] # ok or fail
set_info.append(set_type)
set_info.append(set_state)
- ret = set_add(set_info, table_list, filename, lineno)
+ ret = set_add(set_info, filename, lineno)
if ret == 0:
all_set[set_name] = set()
@@ -702,8 +699,7 @@ def set_element_process(element_line, filename, lineno):
set_name = element_line[0].split(" ")[0]
set_element = element_line[0].split(" ")
set_element.remove(set_name)
- return set_add_elements(set_element, set_name, all_set, rule_state,
- table_list, filename, lineno)
+ return set_add_elements(set_element, set_name, rule_state, filename, lineno)
def payload_find_expected(payload_log, rule):
@@ -809,8 +805,8 @@ def run_test_file(filename, force_all_family_option, specific_file):
elif need_fix_option:
continue
- result = rule_add(rule, table_list, chain_list, filename, lineno,
- force_all_family_option, filename_path)
+ result = rule_add(rule, filename, lineno, force_all_family_option,
+ filename_path)
tests += 1
ret = result[0]
warning = result[1]
@@ -832,7 +828,7 @@ def run_test_file(filename, force_all_family_option, specific_file):
# We delete sets.
if all_set:
- ret = set_delete(all_set, table, filename, lineno)
+ ret = set_delete(table, filename, lineno)
if ret != 0:
reason = "There is a problem when we delete a set"
print_error(reason, filename, lineno)
The script made a messy use of globals, these was sometimes accessed directly and passed as parameter in other cases. Since is not expected having to deal with threads in the script, now the globals are always accessed directly for the sake of simplicity. Signed-off-by: Pablo M. Bermudo Garay <pablombg@gmail.com> --- Changes in v2: Resolve change conflicts Changes in v3: None in this patch tests/py/nft-test.py | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-)