This adds the netns feature to nft-test.py.
Signed-off-by: Shekhar Sharma <shekhar250198@xxxxxxxxx>
---
The version history of the patch is :
v1: add the netns feature
v2: use format() method to simplify print statements.
v3: updated the shebang
v4: resent the same with small changes
v5&v6: resent with small changes
v7: netns commands changed for passing the netns name via netns argument.
v8: correct typo error
v9: use tempfile, replace cmp() and add a global variable 'netns'
and store the args.netns value in it.
v10: the cmp() function has again been added so that it can be
replaced the way eric has proposed.
v11: the cmp() function has been replaced in the same way as
eric had done in his patch.(this patch has all the changes
for python3 conversion, netns feature and the changes proposed
by eric).
---
tests/py/nft-test.py | 168 +++++++++++++++++++++++++++++--------------
1 file changed, 116 insertions(+), 52 deletions(-)
diff --git a/tests/py/nft-test.py b/tests/py/nft-test.py
index 09d00dba..cb1d942e 100755
--- a/tests/py/nft-test.py
+++ b/tests/py/nft-test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python
#
# (C) 2014 by Ana Rey Botello <anarey@xxxxxxxxx>
#
@@ -13,12 +13,14 @@
# Thanks to the Outreach Program for Women (OPW) for sponsoring this test
# infrastructure.
+from __future__ import print_function
import sys
import os
import argparse
import signal
import json
import traceback
+import tempfile
TESTS_PATH = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, os.path.join(TESTS_PATH, '../../py/'))
@@ -172,27 +174,31 @@ def print_differences_error(filename, lineno, cmd):
print_error(reason, filename, lineno)
-def table_exist(table, filename, lineno):
+def table_exist(table, filename, lineno, netns=""):
'''
Exists a table.
'''
cmd = "list table %s" % table
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
ret = execute_cmd(cmd, filename, lineno)
return True if (ret == 0) else False
-def table_flush(table, filename, lineno):
+def table_flush(table, filename, lineno, netns=""):
'''
Flush a table.
'''
cmd = "flush table %s" % table
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns, cmd)
execute_cmd(cmd, filename, lineno)
return cmd
-def table_create(table, filename, lineno):
+def table_create(table, filename, lineno, netns=""):
'''
Adds a table.
'''
@@ -206,6 +212,8 @@ def table_create(table, filename, lineno):
# We add a new table
cmd = "add table %s" % table
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
ret = execute_cmd(cmd, filename, lineno)
if ret != 0:
@@ -234,7 +242,7 @@ def table_create(table, filename, lineno):
return 0
-def table_delete(table, filename=None, lineno=None):
+def table_delete(table, filename=None, lineno=None, netns=""):
'''
Deletes a table.
'''
@@ -244,6 +252,8 @@ def table_delete(table, filename=None, lineno=None):
return -1
cmd = "delete table %s" % table
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
ret = execute_cmd(cmd, filename, lineno)
if ret != 0:
reason = "%s: I cannot delete table %s. Giving up!" % (cmd, table)
@@ -259,17 +269,19 @@ def table_delete(table, filename=None, lineno=None):
return 0
-def chain_exist(chain, table, filename):
+def chain_exist(chain, table, filename, netns=""):
'''
Checks a chain
'''
cmd = "list chain %s %s" % (table, chain)
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
ret = execute_cmd(cmd, filename, chain.lineno)
return True if (ret == 0) else False
-def chain_create(chain, table, filename):
+def chain_create(chain, table, filename, netns=""):
'''
Adds a chain
'''
@@ -280,6 +292,9 @@ def chain_create(chain, table, filename):
return -1
cmd = "add chain %s %s" % (table, chain)
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
+
if chain.config:
cmd += " { %s; }" % chain.config
@@ -298,7 +313,7 @@ def chain_create(chain, table, filename):
return 0
-def chain_delete(chain, table, filename=None, lineno=None):
+def chain_delete(chain, table, filename=None, lineno=None, netns=""):
'''
Flushes and deletes a chain.
'''
@@ -309,6 +324,9 @@ def chain_delete(chain, table, filename=None, lineno=None):
return -1
cmd = "flush chain %s %s" % (table, chain)
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
+
ret = execute_cmd(cmd, filename, lineno)
if ret != 0:
reason = "I cannot " + cmd
@@ -316,6 +334,8 @@ def chain_delete(chain, table, filename=None, lineno=None):
return -1
cmd = "delete chain %s %s" % (table, chain)
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
ret = execute_cmd(cmd, filename, lineno)
if ret != 0:
reason = "I cannot " + cmd
@@ -341,7 +361,7 @@ def chain_get_by_name(name):
return chain
-def set_add(s, test_result, filename, lineno):
+def set_add(s, test_result, filename, lineno, netns=""):
'''
Adds a set.
'''
@@ -363,6 +383,9 @@ def set_add(s, test_result, filename, lineno):
flags = "flags %s; " % flags
cmd = "add set %s %s { type %s;%s %s}" % (table, s.name, s.type, s.timeout, flags)
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
+
ret = execute_cmd(cmd, filename, lineno)
if (ret == 0 and test_result == "fail") or \
@@ -380,7 +403,7 @@ def set_add(s, test_result, filename, lineno):
return 0
-def set_add_elements(set_element, set_name, state, filename, lineno):
+def set_add_elements(set_element, set_name, state, filename, lineno, netns=""):
'''
Adds elements to the set.
'''
@@ -400,6 +423,9 @@ def set_add_elements(set_element, set_name, state, filename, lineno):
element = ", ".join(set_element)
cmd = "add element %s %s { %s }" % (table, set_name, element)
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
+
ret = execute_cmd(cmd, filename, lineno)
if (state == "fail" and ret == 0) or (state == "ok" and ret != 0):
@@ -417,12 +443,15 @@ def set_add_elements(set_element, set_name, state, filename, lineno):
def set_delete_elements(set_element, set_name, table, filename=None,
- lineno=None):
+ lineno=None, netns=""):
'''
Deletes elements in a set.
'''
for element in set_element:
cmd = "delete element %s %s { %s }" % (table, set_name, element)
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
+
ret = execute_cmd(cmd, filename, lineno)
if ret != 0:
reason = "I cannot delete element %s " \
@@ -433,7 +462,7 @@ def set_delete_elements(set_element, set_name, table, filename=None,
return 0
-def set_delete(table, filename=None, lineno=None):
+def set_delete(table, filename=None, lineno=None, netns=""):
'''
Deletes set and its content.
'''
@@ -451,6 +480,9 @@ def set_delete(table, filename=None, lineno=None):
# We delete the set.
cmd = "delete set %s %s" % (table, set_name)
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
+
ret = execute_cmd(cmd, filename, lineno)
# Check if the set still exists after I deleted it.
@@ -462,21 +494,27 @@ def set_delete(table, filename=None, lineno=None):
return 0
-def set_exist(set_name, table, filename, lineno):
+def set_exist(set_name, table, filename, lineno, netns=""):
'''
Check if the set exists.
'''
cmd = "list set %s %s" % (table, set_name)
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
+
ret = execute_cmd(cmd, filename, lineno)
return True if (ret == 0) else False
-def _set_exist(s, filename, lineno):
+def _set_exist(s, filename, lineno, netns=""):
'''
Check if the set exists.
'''
cmd = "list set %s %s %s" % (s.family, s.table, s.name)
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
+
ret = execute_cmd(cmd, filename, lineno)
return True if (ret == 0) else False
@@ -486,12 +524,11 @@ def set_check_element(rule1, rule2):
'''
Check if element exists in anonymous sets.
'''
- ret = -1
pos1 = rule1.find("{")
pos2 = rule2.find("{")
- if (cmp(rule1[:pos1], rule2[:pos2]) != 0):
- return ret;
+ if (rule1[:pos1] != rule2[:pos2]):
+ return False;
end1 = rule1.find("}")
end2 = rule2.find("}")
@@ -501,16 +538,15 @@ def set_check_element(rule1, rule2):
list2 = (rule2[pos2 + 1:end2].replace(" ", "")).split(",")
list1.sort()
list2.sort()
- if cmp(list1, list2) == 0:
- ret = 0
+ if list1 != list2:
+ return False
- if ret != 0:
- return ret
+ return rule1[end1:] == rule2[end2:]
- return cmp(rule1[end1:], rule2[end2:])
+ return False
-def obj_add(o, test_result, filename, lineno):
+def obj_add(o, test_result, filename, lineno, netns=""):
'''
Adds an object.
'''
@@ -529,6 +565,9 @@ def obj_add(o, test_result, filename, lineno):
return -1
cmd = "add %s %s %s %s" % (o.type, table, o.name, o.spcf)
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
+
ret = execute_cmd(cmd, filename, lineno)
if (ret == 0 and test_result == "fail") or \
@@ -555,7 +594,7 @@ def obj_add(o, test_result, filename, lineno):
print_error(reason, filename, lineno)
return -1
-def obj_delete(table, filename=None, lineno=None):
+def obj_delete(table, filename=None, lineno=None, netns=""):
'''
Deletes object.
'''
@@ -569,6 +608,9 @@ def obj_delete(table, filename=None, lineno=None):
# We delete the object.
cmd = "delete %s %s %s" % (o.type, table, o.name)
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
+
ret = execute_cmd(cmd, filename, lineno)
# Check if the object still exists after I deleted it.
@@ -580,21 +622,27 @@ def obj_delete(table, filename=None, lineno=None):
return 0
-def obj_exist(o, table, filename, lineno):
+def obj_exist(o, table, filename, lineno, netns=""):
'''
Check if the object exists.
'''
cmd = "list %s %s %s" % (o.type, table, o.name)
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
+
ret = execute_cmd(cmd, filename, lineno)
return True if (ret == 0) else False
-def _obj_exist(o, filename, lineno):
+def _obj_exist(o, filename, lineno, netns=""):
'''
Check if the object exists.
'''
cmd = "list %s %s %s %s" % (o.type, o.family, o.table, o.name)
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
+
ret = execute_cmd(cmd, filename, lineno)
return True if (ret == 0) else False
@@ -696,7 +744,7 @@ def json_validate(json_string):
print_error("schema validation failed for input '%s'" % json_string)
print_error(traceback.format_exc())
-def rule_add(rule, filename, lineno, force_all_family_option, filename_path):
+def rule_add(rule, filename, lineno, force_all_family_option, filename_path, netns=""):
'''
Adds a rule
'''
@@ -770,10 +818,13 @@ def rule_add(rule, filename, lineno, force_all_family_option, filename_path):
unit_tests += 1
table_flush(table, filename, lineno)
- payload_log = os.tmpfile()
+ payload_log = tempfile.TemporaryFile(mode="w+")
# Add rule and check return code
cmd = "add rule %s %s %s" % (table, chain, rule[0])
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
+
ret = execute_cmd(cmd, filename, lineno, payload_log, debug="netlink")
state = rule[1].rstrip()
@@ -840,8 +891,8 @@ def rule_add(rule, filename, lineno, force_all_family_option, filename_path):
if rule_output.rstrip() != teoric_exit.rstrip():
if rule[0].find("{") != -1: # anonymous sets
- if set_check_element(teoric_exit.rstrip(),
- rule_output.rstrip()) != 0:
+ if not set_check_element(teoric_exit.rstrip(),
+ rule_output.rstrip()):
warning += 1
retest_output = True
print_differences_warning(filename, lineno,
@@ -870,6 +921,9 @@ def rule_add(rule, filename, lineno, force_all_family_option, filename_path):
# Add rule and check return code
cmd = "add rule %s %s %s" % (table, chain, rule_output.rstrip())
+ if netns:
+ cmd = "ip netns exec " + "{} {}".format(netns,cmd)
+
ret = execute_cmd(cmd, filename, lineno, payload_log, debug="netlink")
if ret != 0:
@@ -910,7 +964,7 @@ def rule_add(rule, filename, lineno, force_all_family_option, filename_path):
gotf.name, 1)
table_flush(table, filename, lineno)
- payload_log = os.tmpfile()
+ payload_log = tempfile.TemporaryFile(mode="w+")
# Add rule in JSON format
cmd = json.dumps({ "nftables": [{ "add": { "rule": {
@@ -1016,9 +1070,9 @@ def execute_cmd(cmd, filename, lineno, stdout_log=False, debug=False):
:param debug: temporarily set these debug flags
'''
global log_file
- print >> log_file, "command: %s" % cmd
+ print("command: {}".format(cmd),file=log_file)
if debug_option:
- print cmd
+ print(cmd)
if debug:
debug_old = nftables.get_debug()
@@ -1198,7 +1252,7 @@ def json_find_expected(json_log, rule):
return json_buffer
-def run_test_file(filename, force_all_family_option, specific_file):
+def run_test_file(filename, force_all_family_option, specific_file,netns=""):
'''
Runs a test file
@@ -1207,12 +1261,14 @@ def run_test_file(filename, force_all_family_option, specific_file):
filename_path = os.path.join(TESTS_PATH, filename)
f = open(filename_path)
tests = passed = total_unit_run = total_warning = total_error = 0
+ if netns:
+ execute_cmd("ip netns add " + netns, filename, 0)
for lineno, line in enumerate(f):
sys.stdout.flush()
if signal_received == 1:
- print "\nSignal received. Cleaning up and Exitting..."
+ print("\nSignal received. Cleaning up and Exitting...")
cleanup_on_exit()
sys.exit(0)
@@ -1319,13 +1375,15 @@ def run_test_file(filename, force_all_family_option, specific_file):
if specific_file:
if force_all_family_option:
- print print_result_all(filename, tests, total_warning, total_error,
- total_unit_run)
+ print(print_result_all(filename, tests, total_warning, total_error,
+ total_unit_run))
else:
- print print_result(filename, tests, total_warning, total_error)
+ print(print_result(filename, tests, total_warning, total_error))
else:
if tests == passed and tests > 0:
- print filename + ": " + Colors.GREEN + "OK" + Colors.ENDC
+ print(filename + ": " + Colors.GREEN + "OK" + Colors.ENDC)
+ if netns:
+ execute_cmd("ip netns del " + netns, filename, 0)
f.close()
del table_list[:]
@@ -1336,7 +1394,7 @@ def run_test_file(filename, force_all_family_option, specific_file):
def main():
- parser = argparse.ArgumentParser(description='Run nft tests', version='1.0')
+ parser = argparse.ArgumentParser(description='Run nft tests')
parser.add_argument('filenames', nargs='*', metavar='path/to/file.t',
help='Run only these tests')
@@ -1359,28 +1417,37 @@ def main():
dest='enable_schema',
help='verify json input/output against schema')
+ parser.add_argument('-N', '--netns', action='store_true',
+ dest='netns',
+ help='Test namespace path')
+
+ parser.add_argument('-v', '--version', action='version',
+ version='1.0',
+ help='Print the version information')
+
args = parser.parse_args()
- global debug_option, need_fix_option, enable_json_option, enable_json_schema
+ global debug_option, need_fix_option, enable_json_option, enable_json_schema, netns
debug_option = args.debug
need_fix_option = args.need_fix_line
force_all_family_option = args.force_all_family
enable_json_option = args.enable_json
enable_json_schema = args.enable_schema
+ netns = args.netns
specific_file = False
signal.signal(signal.SIGINT, signal_handler)
signal.signal(signal.SIGTERM, signal_handler)
if os.getuid() != 0:
- print "You need to be root to run this, sorry"
+ print("You need to be root to run this, sorry")
return
# Change working directory to repository root
os.chdir(TESTS_PATH + "/../..")
if not os.path.exists('src/.libs/libnftables.so'):
- print "The nftables library does not exist. " \
- "You need to build the project."
+ print("The nftables library does not exist. "
+ "You need to build the project.")
return
if args.enable_schema and not args.enable_json:
@@ -1434,18 +1501,15 @@ def main():
run_total += file_unit_run
if test_files == 0:
- print "No test files to run"
+ print("No test files to run")
else:
if not specific_file:
if force_all_family_option:
- print "%d test files, %d files passed, %d unit tests, " \
- "%d total executed, %d error, %d warning" \
- % (test_files, files_ok, tests, run_total, errors,
- warnings)
+ print("{} test files, {} files passed, {} unit tests, ".format(test_files,files_ok,tests))
+ print("{} total executed, {} error, {} warning".format(run_total, errors, warnings))
else:
- print "%d test files, %d files passed, %d unit tests, " \
- "%d error, %d warning" \
- % (test_files, files_ok, tests, errors, warnings)
+ print("{} test files, {} files passed, {} unit tests, ".format(test_files,files_ok,tests))
+ print("{} error, {} warning".format(errors, warnings))
if __name__ == '__main__':
--
2.17.1
