X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vcl.py;h=d65dc9f0c8eb4ee2f560408a9999e471e388ea03;hb=0ae445ea1152e04dc73d2daf63fe0ffe0c5fd4ad;hp=fb358b7a1e9ee24b74ae1e13b376a9030d4da43d;hpb=45cd3a3e2ead7eb93e4419b43d2cbc797cda2a20;p=vpp.git diff --git a/test/test_vcl.py b/test/test_vcl.py index fb358b7a1e9..d65dc9f0c8e 100644 --- a/test/test_vcl.py +++ b/test/test_vcl.py @@ -33,7 +33,7 @@ class VCLTestCase(VppTestCase): """ VCL Test Class """ def __init__(self, methodName): - var = "VPP_TEST_BUILD_DIR" + var = "VPP_BUILD_DIR" self.build_dir = os.getenv(var, None) if self.build_dir is None: raise Exception("Environment variable `%s' not set" % var) @@ -61,7 +61,7 @@ class VCLTestCase(VppTestCase): worker_server = VCLAppWorker(self.build_dir, server_app, server_args, self.logger, self.env) worker_server.start() - self.sleep(0.2) + self.sleep(0.3) worker_client = VCLAppWorker(self.build_dir, client_app, client_args, self.logger, self.env) worker_client.start() @@ -171,7 +171,7 @@ class VCLTestCase(VppTestCase): worker_server = VCLAppWorker(self.build_dir, server_app, server_args, self.logger, self.env) worker_server.start() - self.sleep(0.2) + self.sleep(0.3) self.env.update({'VCL_APP_NAMESPACE_ID': "2", 'VCL_APP_NAMESPACE_SECRET': "5678"}) @@ -212,11 +212,11 @@ class VCLTestCase(VppTestCase): self.assert_equal(worker_client.result, 0, "Binary test return code") -class VCLCutThruTestCase(VCLTestCase): - """ VCL Cut Thru Tests """ +class LDPCutThruTestCase(VCLTestCase): + """ LDP Cut Thru Tests """ def setUp(self): - super(VCLCutThruTestCase, self).setUp() + super(LDPCutThruTestCase, self).setUp() self.cut_thru_setup() self.client_echo_test_args = ["-E", self.echo_phrase, "-X", @@ -224,12 +224,12 @@ class VCLCutThruTestCase(VCLTestCase): self.client_iperf3_timeout = 20 self.client_iperf3_args = ["-V4d", "-t 5", "-c", self.server_addr] self.server_iperf3_args = ["-V4d", "-s"] - self.client_uni_dir_nsock_timeout = 60 + self.client_uni_dir_nsock_timeout = 20 self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", "-I", "2", self.server_addr, self.server_port] - self.client_bi_dir_nsock_timeout = 120 + self.client_bi_dir_nsock_timeout = 20 self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", "-I", "2", self.server_addr, @@ -238,7 +238,7 @@ class VCLCutThruTestCase(VCLTestCase): def tearDown(self): self.cut_thru_tear_down() - super(VCLCutThruTestCase, self).tearDown() + super(LDPCutThruTestCase, self).tearDown() def test_ldp_cut_thru_echo(self): """ run LDP cut thru echo test """ @@ -251,7 +251,7 @@ class VCLCutThruTestCase(VCLTestCase): try: subprocess.check_output(['iperf3', '-v']) - except: + except subprocess.CalledProcessError: self.logger.error("WARNING: 'iperf3' is not installed,") self.logger.error(" 'test_ldp_cut_thru_iperf3' not run!") return @@ -276,6 +276,33 @@ class VCLCutThruTestCase(VCLTestCase): "sock_test_client", self.client_bi_dir_nsock_test_args) + +class VCLCutThruTestCase(VCLTestCase): + """ VCL Cut Thru Tests """ + + def setUp(self): + super(VCLCutThruTestCase, self).setUp() + + self.cut_thru_setup() + self.client_echo_test_args = ["-E", self.echo_phrase, "-X", + self.server_addr, self.server_port] + + self.client_uni_dir_nsock_timeout = 20 + self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", + "-I", "2", + self.server_addr, + self.server_port] + self.client_bi_dir_nsock_timeout = 20 + self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", + "-I", "2", + self.server_addr, + self.server_port] + + def tearDown(self): + self.cut_thru_tear_down() + + super(VCLCutThruTestCase, self).tearDown() + def test_vcl_cut_thru_echo(self): """ run VCL cut thru echo test """ @@ -347,13 +374,13 @@ class VCLThruHostStackNSessionBidirTestCase(VCLTestCase): self.thru_host_stack_setup() if self.vppDebug: - self.client_bi_dir_nsock_timeout = 120 + self.client_bi_dir_nsock_timeout = 20 self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", "-I", "2", self.loop0.local_ip4, self.server_port] else: - self.client_bi_dir_nsock_timeout = 90 + self.client_bi_dir_nsock_timeout = 20 self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", "-I", "2", self.loop0.local_ip4, @@ -381,14 +408,14 @@ class VCLThruHostStackGroupBTestCase(VCLTestCase): self.thru_host_stack_setup() if self.vppDebug: - self.client_bi_dir_nsock_timeout = 120 + self.client_bi_dir_nsock_timeout = 20 self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", # OUCH! Host Stack Bug? # "-I", "2", self.loop0.local_ip4, self.server_port] else: - self.client_bi_dir_nsock_timeout = 60 + self.client_bi_dir_nsock_timeout = 20 self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", # OUCH! Host Stack Bug? # "-I", "2", @@ -417,10 +444,10 @@ class VCLThruHostStackGroupCTestCase(VCLTestCase): self.thru_host_stack_setup() if self.vppDebug: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "2" else: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "5" self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", @@ -450,10 +477,10 @@ class VCLThruHostStackGroupDTestCase(VCLTestCase): self.thru_host_stack_setup() if self.vppDebug: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "2" else: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "5" self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", @@ -496,7 +523,7 @@ class VCLThruHostStackIperfTestCase(VCLTestCase): try: subprocess.check_output(['iperf3', '-v']) - except: + except subprocess.CalledProcessError: self.logger.error("WARNING: 'iperf3' is not installed,") self.logger.error( " 'test_ldp_thru_host_stack_iperf3' not run!") @@ -507,16 +534,16 @@ class VCLThruHostStackIperfTestCase(VCLTestCase): "iperf3", self.client_iperf3_args) -class VCLIpv6CutThruTestCase(VCLTestCase): - """ VCL IPv6 Cut Thru Tests """ +class LDPIpv6CutThruTestCase(VCLTestCase): + """ LDP IPv6 Cut Thru Tests """ def setUp(self): - super(VCLIpv6CutThruTestCase, self).setUp() + super(LDPIpv6CutThruTestCase, self).setUp() self.cut_thru_setup() self.client_iperf3_timeout = 20 - self.client_uni_dir_nsock_timeout = 60 - self.client_bi_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 + self.client_bi_dir_nsock_timeout = 20 self.client_ipv6_echo_test_args = ["-6", "-E", self.echo_phrase, "-X", self.server_ipv6_addr, self.server_port] @@ -537,7 +564,7 @@ class VCLIpv6CutThruTestCase(VCLTestCase): def tearDown(self): self.cut_thru_tear_down() - super(VCLIpv6CutThruTestCase, self).tearDown() + super(LDPIpv6CutThruTestCase, self).tearDown() def test_ldp_ipv6_cut_thru_echo(self): """ run LDP IPv6 cut thru echo test """ @@ -578,6 +605,35 @@ class VCLIpv6CutThruTestCase(VCLTestCase): "sock_test_client", self.client_ipv6_bi_dir_nsock_test_args) + +class VCLIpv6CutThruTestCase(VCLTestCase): + """ VCL IPv6 Cut Thru Tests """ + + def setUp(self): + super(VCLIpv6CutThruTestCase, self).setUp() + + self.cut_thru_setup() + self.client_uni_dir_nsock_timeout = 20 + self.client_bi_dir_nsock_timeout = 20 + self.client_ipv6_echo_test_args = ["-6", "-E", self.echo_phrase, "-X", + self.server_ipv6_addr, + self.server_port] + self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", + "-6", + "-I", "2", + self.server_ipv6_addr, + self.server_port] + self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", + "-6", + "-I", "2", + self.server_ipv6_addr, + self.server_port] + + def tearDown(self): + self.cut_thru_tear_down() + + super(VCLIpv6CutThruTestCase, self).tearDown() + def test_vcl_ipv6_cut_thru_echo(self): """ run VCL IPv6 cut thru echo test """ @@ -653,14 +709,14 @@ class VCLIpv6ThruHostStackGroupATestCase(VCLTestCase): self.thru_host_stack_ipv6_setup() if self.vppDebug: - self.client_bi_dir_nsock_timeout = 120 + self.client_bi_dir_nsock_timeout = 20 self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", "-6", "-I", "2", self.loop0.local_ip6, self.server_port] else: - self.client_bi_dir_nsock_timeout = 90 + self.client_bi_dir_nsock_timeout = 20 self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", "-6", "-I", "2", @@ -689,7 +745,7 @@ class VCLIpv6ThruHostStackGroupBTestCase(VCLTestCase): self.thru_host_stack_ipv6_setup() if self.vppDebug: - self.client_bi_dir_nsock_timeout = 120 + self.client_bi_dir_nsock_timeout = 20 self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", "-6", # OUCH! Host Stack Bug? @@ -697,7 +753,7 @@ class VCLIpv6ThruHostStackGroupBTestCase(VCLTestCase): self.loop0.local_ip6, self.server_port] else: - self.client_bi_dir_nsock_timeout = 60 + self.client_bi_dir_nsock_timeout = 20 self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", "-6", # OUCH! Host Stack Bug? @@ -728,10 +784,10 @@ class VCLIpv6ThruHostStackGroupCTestCase(VCLTestCase): self.thru_host_stack_ipv6_setup() if self.vppDebug: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "2" else: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "5" self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", @@ -763,10 +819,10 @@ class VCLIpv6ThruHostStackGroupDTestCase(VCLTestCase): self.thru_host_stack_ipv6_setup() if self.vppDebug: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "2" else: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "5" self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", @@ -811,7 +867,7 @@ class VCLIpv6ThruHostStackIperfTestCase(VCLTestCase): try: subprocess.check_output(['iperf3', '-v']) - except: + except subprocess.CalledProcessError: self.logger.error("WARNING: 'iperf3' is not installed,") self.logger.error( " 'test_ldp_thru_host_stack_iperf3' not run!")