From d7ea8e1eaa6964854b6845dba334b056a8187de0 Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Tue, 19 Jan 2016 18:20:07 +0200 Subject: regression: add rx_check negative test add test_nat_simple_mode1 and test_nat_simple_mode2 benchmarks remove pcaps to ensure they are created --- scripts/automation/regression/unit_tests/trex_nat_test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts/automation/regression/unit_tests/trex_nat_test.py') diff --git a/scripts/automation/regression/unit_tests/trex_nat_test.py b/scripts/automation/regression/unit_tests/trex_nat_test.py index c70c03a1..e50831e4 100755 --- a/scripts/automation/regression/unit_tests/trex_nat_test.py +++ b/scripts/automation/regression/unit_tests/trex_nat_test.py @@ -101,17 +101,17 @@ class CTRexNat_Test(CTRexGeneral_Test):#(unittest.TestCase): self.router.configure_basic_interfaces() - stat_route_dict = self.get_benchmark_param('stat_route_dict', test_name="test_nat_simple") + stat_route_dict = self.get_benchmark_param('stat_route_dict') stat_route_obj = CStaticRouteConfig(stat_route_dict) self.router.config_static_routing(stat_route_obj, mode = "config") - nat_dict = self.get_benchmark_param('nat_dict', test_name="test_nat_simple") + nat_dict = self.get_benchmark_param('nat_dict') nat_obj = CNatConfig(nat_dict) self.router.config_nat(nat_obj) # self.trex.set_yaml_file('cap2/http_simple.yaml') - mult = self.get_benchmark_param('multiplier', test_name="test_nat_simple") - core = self.get_benchmark_param('cores', test_name="test_nat_simple") + mult = self.get_benchmark_param('multiplier') + core = self.get_benchmark_param('cores') # trex_res = self.trex.run(nc=False,multiplier = mult, cores = core, duration = 100, l = 1000, learn = True) ret = self.trex.start_trex( @@ -130,7 +130,7 @@ class CTRexNat_Test(CTRexGeneral_Test):#(unittest.TestCase): print trex_res.get_latest_dump() trex_nat_stats = trex_res.get_last_value("trex-global.data", ".*nat.*") # extract all nat data - if self.get_benchmark_param('allow_timeout_dev', test_name="test_nat_simple"): + if self.get_benchmark_param('allow_timeout_dev'): nat_timeout_ratio = trex_nat_stats['m_total_nat_time_out']/trex_nat_stats['m_total_nat_open'] if nat_timeout_ratio > 0.005: self.fail('TRex nat_timeout ratio %f > 0.5%%' % nat_timeout_ratio) -- cgit 1.2.3-korg