diff options
Diffstat (limited to 'src/vcl')
| -rw-r--r-- | src/vcl/test/test_vcl.py | 20 | ||||
| -rw-r--r-- | src/vcl/vcl_sapi.c | 3 |
2 files changed, 21 insertions, 2 deletions
diff --git a/src/vcl/test/test_vcl.py b/src/vcl/test/test_vcl.py index f5a5bebdad8..80b9f2f0211 100644 --- a/src/vcl/test/test_vcl.py +++ b/src/vcl/test/test_vcl.py @@ -281,6 +281,7 @@ class LDPCutThruTestCase(VCLTestCase): def show_commands_at_teardown(self): self.logger.debug(self.vapi.cli("show session verbose 2")) + self.logger.debug(self.vapi.cli("show app mq")) @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_ldp_cut_thru_echo(self): @@ -351,6 +352,7 @@ class VCLCutThruTestCase(VCLTestCase): def show_commands_at_teardown(self): self.logger.debug(self.vapi.cli("show session verbose 2")) + self.logger.debug(self.vapi.cli("show app mq")) def test_vcl_cut_thru_echo(self): """ run VCL cut thru echo test """ @@ -406,6 +408,7 @@ class VCLThruHostStackEcho(VCLTestCase): def show_commands_at_teardown(self): self.logger.debug(self.vapi.cli("show app server")) self.logger.debug(self.vapi.cli("show session verbose")) + self.logger.debug(self.vapi.cli("show app mq")) class VCLThruHostStackTLS(VCLTestCase): @@ -444,6 +447,7 @@ class VCLThruHostStackTLS(VCLTestCase): def show_commands_at_teardown(self): self.logger.debug(self.vapi.cli("show app server")) self.logger.debug(self.vapi.cli("show session verbose 2")) + self.logger.debug(self.vapi.cli("show app mq")) class VCLThruHostStackBidirNsock(VCLTestCase): @@ -476,6 +480,7 @@ class VCLThruHostStackBidirNsock(VCLTestCase): def show_commands_at_teardown(self): self.logger.debug(self.vapi.cli("show session verbose 2")) + self.logger.debug(self.vapi.cli("show app mq")) def test_vcl_thru_host_stack_bi_dir_nsock(self): """ run VCL thru host stack bi-directional (multiple sockets) test """ @@ -517,6 +522,7 @@ class LDPThruHostStackBidirNsock(VCLTestCase): def show_commands_at_teardown(self): self.logger.debug(self.vapi.cli("show session verbose 2")) + self.logger.debug(self.vapi.cli("show app mq")) def test_ldp_thru_host_stack_bi_dir_nsock(self): """ run LDP thru host stack bi-directional (multiple sockets) test """ @@ -632,6 +638,7 @@ class LDPThruHostStackIperf(VCLTestCase): def show_commands_at_teardown(self): self.logger.debug(self.vapi.cli("show session verbose 2")) + self.logger.debug(self.vapi.cli("show app mq")) @unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.") def test_ldp_thru_host_stack_iperf3(self): @@ -668,6 +675,7 @@ class LDPThruHostStackIperfUdp(VCLTestCase): def show_commands_at_teardown(self): self.logger.debug(self.vapi.cli("show session verbose 2")) + self.logger.debug(self.vapi.cli("show app mq")) @unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.") def test_ldp_thru_host_stack_iperf3_udp(self): @@ -689,6 +697,10 @@ class LDPIpv6CutThruTestCase(VCLTestCase): def tearDownClass(cls): super(LDPIpv6CutThruTestCase, cls).tearDownClass() + def show_commands_at_teardown(self): + self.logger.debug(self.vapi.cli("show session verbose 2")) + self.logger.debug(self.vapi.cli("show app mq")) + def setUp(self): super(LDPIpv6CutThruTestCase, self).setUp() @@ -765,6 +777,10 @@ class VCLIpv6CutThruTestCase(VCLTestCase): def tearDownClass(cls): super(VCLIpv6CutThruTestCase, cls).tearDownClass() + def show_commands_at_teardown(self): + self.logger.debug(self.vapi.cli("show session verbose 2")) + self.logger.debug(self.vapi.cli("show app mq")) + def setUp(self): super(VCLIpv6CutThruTestCase, self).setUp() @@ -789,6 +805,10 @@ class VCLIpv6CutThruTestCase(VCLTestCase): super(VCLIpv6CutThruTestCase, self).tearDown() self.cut_thru_tear_down() + def show_commands_at_teardown(self): + self.logger.debug(self.vapi.cli("show session verbose 2")) + self.logger.debug(self.vapi.cli("show app mq")) + def test_vcl_ipv6_cut_thru_echo(self): """ run VCL IPv6 cut thru echo test """ diff --git a/src/vcl/vcl_sapi.c b/src/vcl/vcl_sapi.c index 5258722a484..14401da9d57 100644 --- a/src/vcl/vcl_sapi.c +++ b/src/vcl/vcl_sapi.c @@ -94,7 +94,6 @@ vcl_api_attach_reply_handler (app_sapi_attach_reply_msg_t * mp, int *fds) vcl_segment_attach_mq (vcl_vpp_worker_segment_handle (0), mp->vpp_ctrl_mq, mp->vpp_ctrl_mq_thread, &wrk->ctrl_mq); vcm->ctrl_mq = wrk->ctrl_mq; - vcm->app_index = mp->app_index; return 0; @@ -156,7 +155,7 @@ vcl_sapi_attach (void) app_sapi_msg_t _rmp, *rmp = &_rmp; clib_error_t *err; clib_socket_t *cs; - int fds[SESSION_N_FD_TYPE]; + int fds[32]; /* * Init client socket and send attach |