class VCLTestCase(VppTestCase):
""" VCL Test Class """
+ extra_vpp_punt_config = ["session", "{", "poll-main", "}"]
@classmethod
def setUpClass(cls):
super(VCLTestCase, self).setUp()
def cut_thru_setup(self):
- self.vapi.session_enable_disable(is_enabled=1)
+ self.vapi.session_enable_disable(is_enable=1)
def cut_thru_tear_down(self):
- self.vapi.session_enable_disable(is_enabled=0)
+ self.vapi.session_enable_disable(is_enable=0)
def cut_thru_test(self, server_app, server_args, client_app, client_args):
- self.env = {'VCL_API_PREFIX': self.shm_prefix,
+ self.env = {'VCL_VPP_API_SOCKET': self.api_sock,
'VCL_APP_SCOPE_LOCAL': "true"}
worker_server = VCLAppWorker(self.build_dir, server_app, server_args,
self.logger, self.env)
self.sleep(self.post_test_sleep)
def thru_host_stack_setup(self):
- self.vapi.session_enable_disable(is_enabled=1)
+ self.vapi.session_enable_disable(is_enable=1)
self.create_loopback_interfaces(2)
table_id = 1
i.admin_down()
def thru_host_stack_ipv6_setup(self):
- self.vapi.session_enable_disable(is_enabled=1)
+ self.vapi.session_enable_disable(is_enable=1)
self.create_loopback_interfaces(2)
table_id = 1
i.set_table_ip6(0)
i.admin_down()
- self.vapi.session_enable_disable(is_enabled=0)
+ self.vapi.session_enable_disable(is_enable=0)
@unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.")
def thru_host_stack_test(self, server_app, server_args,
client_app, client_args):
- self.env = {'VCL_API_PREFIX': self.shm_prefix,
+ self.env = {'VCL_VPP_API_SOCKET': self.api_sock,
'VCL_APP_SCOPE_GLOBAL': "true",
'VCL_APP_NAMESPACE_ID': "1",
'VCL_APP_NAMESPACE_SECRET': "1234"}
self.client_echo_test_args = ["-E", self.echo_phrase, "-X",
self.server_addr, self.server_port]
self.client_iperf3_timeout = 20
- self.client_iperf3_args = ["-V4d", "-t 2", "-c", self.server_addr]
- self.server_iperf3_args = ["-V4d", "-s"]
+ self.client_iperf3_args = ["-4d", "-t 2", "-c", self.server_addr]
+ self.server_iperf3_args = ["-4d", "-s"]
self.client_uni_dir_nsock_timeout = 20
self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
"-I", "2",
self.thru_host_stack_setup()
self.client_iperf3_timeout = 20
- self.client_iperf3_args = ["-V4d", "-t 2", "-c", self.loop0.local_ip4]
- self.server_iperf3_args = ["-V4d", "-s"]
+ self.client_iperf3_args = ["-4d", "-t 2", "-c", self.loop0.local_ip4]
+ self.server_iperf3_args = ["-4d", "-s"]
def tearDown(self):
self.thru_host_stack_tear_down()
self.thru_host_stack_setup()
self.client_iperf3_timeout = 20
- self.client_iperf3_args = ["-V4d", "-t 2", "-u", "-l 1400",
+ self.client_iperf3_args = ["-4d", "-t 2", "-u", "-l 1400",
"-c", self.loop0.local_ip4]
- self.server_iperf3_args = ["-V4d", "-s"]
+ self.server_iperf3_args = ["-4d", "-s"]
def tearDown(self):
self.thru_host_stack_tear_down()
self.client_ipv6_echo_test_args = ["-6", "-E", self.echo_phrase, "-X",
self.server_ipv6_addr,
self.server_port]
- self.client_ipv6_iperf3_args = ["-V6d", "-t 2", "-c",
+ self.client_ipv6_iperf3_args = ["-6d", "-t 2", "-c",
self.server_ipv6_addr]
- self.server_ipv6_iperf3_args = ["-V6d", "-s"]
+ self.server_ipv6_iperf3_args = ["-6d", "-s"]
self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
"-6",
"-I", "2",