diff options
author | Yaroslav Brustinov <ybrustin@cisco.com> | 2017-02-07 13:36:58 +0200 |
---|---|---|
committer | Yaroslav Brustinov <ybrustin@cisco.com> | 2017-02-07 13:36:58 +0200 |
commit | d3c7c3980c60598ddd3e1da4144a6df32893f3c9 (patch) | |
tree | e3d2d807ccac04c19fccd92217252cd080526791 /scripts/automation/regression/stateful_tests/trex_nat_test.py | |
parent | a47b869616194551a300ff376dc2cc1f03f09d95 (diff) |
Regression: another fix for ipv6 STL test, add flag --no-dut-config to disable DUT config
Change-Id: I56c38324086cfc81d2ad0a451d528707f5357b51
Signed-off-by: Yaroslav Brustinov <ybrustin@cisco.com>
Diffstat (limited to 'scripts/automation/regression/stateful_tests/trex_nat_test.py')
-rwxr-xr-x | scripts/automation/regression/stateful_tests/trex_nat_test.py | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/scripts/automation/regression/stateful_tests/trex_nat_test.py b/scripts/automation/regression/stateful_tests/trex_nat_test.py index 3da1dc79..75ab3b7b 100755 --- a/scripts/automation/regression/stateful_tests/trex_nat_test.py +++ b/scripts/automation/regression/stateful_tests/trex_nat_test.py @@ -1,5 +1,5 @@ #!/router/bin/python -from .trex_general_test import CTRexGeneral_Test +from .trex_general_test import CTRexGeneral_Test, CTRexScenario from .tests_exceptions import * import time from CPlatform import CStaticRouteConfig, CNatConfig @@ -21,13 +21,12 @@ class CTRexNoNat_Test(CTRexGeneral_Test):#(unittest.TestCase): def test_nat_learning(self): # test initializtion - self.router.configure_basic_interfaces() - - 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") - - self.router.config_nat_verify() # shutdown duplicate interfaces + if not CTRexScenario.router_cfg['no_dut_config']: + self.router.configure_basic_interfaces() + 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") + self.router.config_nat_verify() # shutdown duplicate interfaces # self.trex.set_yaml_file('cap2/http_simple.yaml') mult = self.get_benchmark_param('multiplier') @@ -104,16 +103,14 @@ class CTRexNat_Test(CTRexGeneral_Test):#(unittest.TestCase): def nat_simple_helper(self, learn_mode=1, traffic_file='cap2/http_simple.yaml'): # test initializtion - self.router.configure_basic_interfaces() - - - 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') - nat_obj = CNatConfig(nat_dict) - self.router.config_nat(nat_obj) + if not CTRexScenario.router_cfg['no_dut_config']: + self.router.configure_basic_interfaces() + 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') + 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') |