""" 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)
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,
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
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",
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",
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",
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!")
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]
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",
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?
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?
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",
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",
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!")