vcl: test refactor and improvements

Change-Id: I92f415bf253d6e051ec9d94ebeb98f081b2a0293
Signed-off-by: Florin Coras <fcoras@cisco.com>

7 files changed, 106 insertions, 277 deletions

diff --git a/src/vcl/sock_test_client.c b/src/vcl/sock_test_client.c
index 75913d9deda..bf467981815 100644
--- a/src/vcl/sock_test_client.c
+++ b/src/vcl/sock_test_client.c
@@ -23,6 +23,7 @@
 #include <time.h>
 #include <arpa/inet.h>
 #include <vcl/sock_test.h>
+#include <fcntl.h>
 #ifndef VCL_TEST
 #include <sys/un.h>
 #endif
@@ -647,6 +648,7 @@ sock_test_connect_test_sockets (uint32_t num_test_sockets)
 		       errno_val);
 	      return tsock->fd;
 	    }
+	  fcntl (tsock->fd, F_SETFL, O_NONBLOCK);
 
 #ifdef VCL_TEST
 	  rv = vppcom_session_connect (tsock->fd, &scm->server_endpt);
diff --git a/src/vcl/sock_test_server.c b/src/vcl/sock_test_server.c
index 11c667c2172..fbfe66684cb 100644
--- a/src/vcl/sock_test_server.c
+++ b/src/vcl/sock_test_server.c
@@ -653,6 +653,7 @@ main (int argc, char **argv)
 	       errno_val);
       return rv;
     }
+  fcntl (ssm->listen_fd, F_SETFL, O_NONBLOCK);
 
 #ifdef VCL_TEST
   rv = vppcom_session_listen (ssm->listen_fd, 10);
diff --git a/src/vcl/vcl_bapi.c b/src/vcl/vcl_bapi.c
index cd3aaaa3d4e..f66c7f96bac 100644
--- a/src/vcl/vcl_bapi.c
+++ b/src/vcl/vcl_bapi.c
@@ -182,13 +182,13 @@ vl_api_app_worker_add_del_reply_t_handler (vl_api_app_worker_add_del_reply_t *
 		    format_api_error, ntohl (mp->retval));
       goto failed;
     }
-  wrk_index = mp->context;
-  wrk = vcl_worker_get (wrk_index);
-  wrk->vpp_wrk_index = clib_net_to_host_u32 (mp->wrk_index);
 
   if (!mp->is_add)
     return;
 
+  wrk_index = mp->context;
+  wrk = vcl_worker_get (wrk_index);
+  wrk->vpp_wrk_index = clib_net_to_host_u32 (mp->wrk_index);
   wrk->app_event_queue = uword_to_pointer (mp->app_event_queue_address,
 					   svm_msg_q_t *);
 
@@ -328,7 +328,7 @@ static void
 vl_api_bind_sock_reply_t_handler (vl_api_bind_sock_reply_t * mp)
 {
   /* Expecting a similar message on mq. So ignore this */
-  VDBG (1, "VCL<%d>: bapi msg vpp handle 0x%llx, sid %u: bind retval: %u!",
+  VDBG (0, "bapi msg vpp handle 0x%llx, sid %u: bind retval: %u!",
 	getpid (), mp->handle, mp->context, mp->retval);
 }
 
diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c
index 1b619cf3f21..bf21f5204b4 100644
--- a/src/vcl/vppcom.c
+++ b/src/vcl/vppcom.c
@@ -464,7 +464,7 @@ vcl_session_bound_handler (vcl_worker_t * wrk, session_bound_msg_t * mp)
       session->tx_fifo = tx_fifo;
     }
 
-  VDBG (1, "VCL<%d>: vpp handle 0x%llx, sid %u: bind succeeded!",
+  VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: bind succeeded!",
 	getpid (), mp->handle, sid);
   return sid;
 }
@@ -559,7 +559,10 @@ vppcom_wait_for_session_state_change (u32 session_index,
 	}
 
       if (svm_msg_q_sub (wrk->app_event_queue, &msg, SVM_Q_NOWAIT, 0))
-	continue;
+	{
+	  usleep (100);
+	  continue;
+	}
       e = svm_msg_q_msg_data (wrk->app_event_queue, &msg);
       vcl_handle_mq_event (wrk, e);
       svm_msg_q_free_msg (wrk->app_event_queue, &msg);
@@ -776,7 +779,7 @@ vppcom_app_create (char *app_name)
 
   if (vcm->is_init)
     {
-      clib_warning ("already initialized");
+      clib_warning ("vcl<%u> already initialized", getpid ());
       return -1;
     }
 
@@ -1181,9 +1184,9 @@ handle:
     VCL_SESS_ATTR_SET (client_session->attr, VCL_SESS_ATTR_NONBLOCK);
 
   listen_vpp_handle = listen_session->vpp_handle;
-  VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: Got a client request! "
+  VDBG (0, "vpp handle 0x%llx, sid %u: Got a client request! "
 	"vpp handle 0x%llx, sid %u, flags %d, is_nonblocking %u",
-	getpid (), listen_vpp_handle, listen_session_handle,
+	listen_vpp_handle, listen_session_handle,
 	client_session->vpp_handle, client_session_index,
 	flags, VCL_SESS_ATTR_TEST (client_session->attr,
 				   VCL_SESS_ATTR_NONBLOCK));
@@ -1209,9 +1212,9 @@ handle:
   vcl_send_session_accepted_reply (vpp_evt_q, client_session->client_context,
 				   client_session->vpp_handle, 0);
 
-  VDBG (0, "VCL<%d>: vpp handle 0x%llx, sid %u: accepted vpp handle 0x%llx, "
+  VDBG (0, "vpp handle 0x%llx, sid %u: accepted vpp handle 0x%llx, "
 	"sid %u connection from peer %s address %U port %u to local %s "
-	"address %U port %u", getpid (), listen_vpp_handle,
+	"address %U port %u", listen_vpp_handle,
 	listen_session_handle, client_session->vpp_handle,
 	client_session_index,
 	client_session->transport.is_ip4 ? "IPv4" : "IPv6",
diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c
index 6ce9e1feac3..31139c32ed5 100755
--- a/src/vnet/session/session_api.c
+++ b/src/vnet/session/session_api.c
@@ -409,6 +409,7 @@ mq_try_lock_and_alloc_msg (svm_msg_q_t * app_mq, svm_msg_q_msg_t * msg)
 	return 0;
       try++;
     }
+  clib_warning ("failed to alloc msg");
   return -1;
 }
 
@@ -588,16 +589,18 @@ mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context,
 
   if (mq_try_lock_and_alloc_msg (app_mq, msg))
     return -1;
+
   evt = svm_msg_q_msg_data (app_mq, msg);
   clib_memset (evt, 0, sizeof (*evt));
   evt->event_type = SESSION_CTRL_EVT_CONNECTED;
   mp = (session_connected_msg_t *) evt->data;
   mp->context = api_context;
-  mp->segment_handle = session_segment_handle (s);
 
   if (is_fail)
     goto done;
 
+  mp->segment_handle = session_segment_handle (s);
+
   if (session_has_transport (s))
     {
       tc = session_get_transport (s);
diff --git a/src/vnet/session/transport.c b/src/vnet/session/transport.c
index 91b80d7c11e..c2d21bf28f9 100644
--- a/src/vnet/session/transport.c
+++ b/src/vnet/session/transport.c
@@ -444,7 +444,10 @@ transport_alloc_local_endpoint (u8 proto, transport_endpoint_cfg_t * rmt_cfg,
       error = transport_find_local_ip_for_remote (rmt_cfg->peer.sw_if_index,
 						  rmt, lcl_addr);
       if (error)
-	return -1;
+	{
+	  clib_error_report (error);
+	  return -1;
+	}
     }
   else
     {
diff --git a/test/test_vcl.py b/test/test_vcl.py
index d65dc9f0c8e..5bdc8e9b342 100644
--- a/test/test_vcl.py
+++ b/test/test_vcl.py
@@ -43,8 +43,13 @@ class VCLTestCase(VppTestCase):
         self.server_args = [self.server_port]
         self.server_ipv6_addr = "::1"
         self.server_ipv6_args = ["-6", self.server_port]
-        self.timeout = 10
+        self.timeout = 20
         self.echo_phrase = "Hello, world! Jenny is a friend of mine."
+        self.pre_test_sleep = 0.3
+        self.post_test_sleep = 0.2
+
+        if os.path.isfile("/tmp/ldp_server_af_unix_socket"):
+            os.remove("/tmp/ldp_server_af_unix_socket")
 
         super(VCLTestCase, self).__init__(methodName)
 
@@ -61,7 +66,7 @@ class VCLTestCase(VppTestCase):
         worker_server = VCLAppWorker(self.build_dir, server_app, server_args,
                                      self.logger, self.env)
         worker_server.start()
-        self.sleep(0.3)
+        self.sleep(self.pre_test_sleep)
         worker_client = VCLAppWorker(self.build_dir, client_app, client_args,
                                      self.logger, self.env)
         worker_client.start()
@@ -70,6 +75,7 @@ class VCLTestCase(VppTestCase):
             self.validateResults(worker_client, worker_server, self.timeout)
         except Exception as error:
             self.fail("Failed with %s" % error)
+        self.sleep(self.post_test_sleep)
 
     def thru_host_stack_setup(self):
         self.vapi.session_enable_disable(is_enabled=1)
@@ -171,7 +177,7 @@ class VCLTestCase(VppTestCase):
         worker_server = VCLAppWorker(self.build_dir, server_app, server_args,
                                      self.logger, self.env)
         worker_server.start()
-        self.sleep(0.3)
+        self.sleep(self.pre_test_sleep)
 
         self.env.update({'VCL_APP_NAMESPACE_ID': "2",
                          'VCL_APP_NAMESPACE_SECRET': "5678"})
@@ -184,12 +190,13 @@ class VCLTestCase(VppTestCase):
             self.validateResults(worker_client, worker_server, self.timeout)
         except Exception as error:
             self.fail("Failed with %s" % error)
+        self.sleep(self.post_test_sleep)
 
     def validateResults(self, worker_client, worker_server, timeout):
         if os.path.isdir('/proc/{}'.format(worker_server.process.pid)):
             self.logger.info("Killing server worker process (pid %d)" %
                              worker_server.process.pid)
-            os.killpg(os.getpgid(worker_server.process.pid), signal.SIGTERM)
+            os.killpg(os.getpgid(worker_server.process.pid), signal.SIGKILL)
             worker_server.join()
         self.logger.info("Client worker result is `%s'" % worker_client.result)
         error = False
@@ -200,7 +207,7 @@ class VCLTestCase(VppTestCase):
                     "Timeout: %ss! Killing client worker process (pid %d)" %
                     (timeout, worker_client.process.pid))
                 os.killpg(os.getpgid(worker_client.process.pid),
-                          signal.SIGTERM)
+                          signal.SIGKILL)
                 worker_client.join()
             except:
                 self.logger.debug(
@@ -222,7 +229,7 @@ class LDPCutThruTestCase(VCLTestCase):
         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 5", "-c", self.server_addr]
+        self.client_iperf3_args = ["-V4d", "-t 2", "-c", self.server_addr]
         self.server_iperf3_args = ["-V4d", "-s"]
         self.client_uni_dir_nsock_timeout = 20
         self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
@@ -240,6 +247,7 @@ class LDPCutThruTestCase(VCLTestCase):
 
         super(LDPCutThruTestCase, self).tearDown()
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_ldp_cut_thru_echo(self):
         """ run LDP cut thru echo test """
 
@@ -260,6 +268,7 @@ class LDPCutThruTestCase(VCLTestCase):
         self.cut_thru_test("iperf3", self.server_iperf3_args,
                            "iperf3", self.client_iperf3_args)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_ldp_cut_thru_uni_dir_nsock(self):
         """ run LDP cut thru uni-directional (multiple sockets) test """
 
@@ -268,6 +277,7 @@ class LDPCutThruTestCase(VCLTestCase):
                            "sock_test_client",
                            self.client_uni_dir_nsock_test_args)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_ldp_cut_thru_bi_dir_nsock(self):
         """ run LDP cut thru bi-directional (multiple sockets) test """
 
@@ -326,11 +336,11 @@ class VCLCutThruTestCase(VCLTestCase):
                            self.client_bi_dir_nsock_test_args)
 
 
-class VCLThruHostStackTestCase(VCLTestCase):
-    """ VCL Thru Host Stack Tests """
+class LDPThruHostStackEcho(VCLTestCase):
+    """ LDP Thru Host Stack Echo """
 
     def setUp(self):
-        super(VCLThruHostStackTestCase, self).setUp()
+        super(LDPThruHostStackEcho, self).setUp()
 
         self.thru_host_stack_setup()
         self.client_echo_test_args = ["-E", self.echo_phrase, "-X",
@@ -339,8 +349,7 @@ class VCLThruHostStackTestCase(VCLTestCase):
 
     def tearDown(self):
         self.thru_host_stack_tear_down()
-
-        super(VCLThruHostStackTestCase, self).tearDown()
+        super(LDPThruHostStackEcho, self).tearDown()
 
     def test_ldp_thru_host_stack_echo(self):
         """ run LDP thru host stack echo test """
@@ -348,48 +357,50 @@ class VCLThruHostStackTestCase(VCLTestCase):
         self.thru_host_stack_test("sock_test_server", self.server_args,
                                   "sock_test_client",
                                   self.client_echo_test_args)
-        # TBD: Remove these when VPP thru host teardown config bug is fixed.
-        self.thru_host_stack_test("vcl_test_server", self.server_args,
-                                  "vcl_test_client",
-                                  self.client_echo_test_args)
 
-    def test_vcl_thru_host_stack_echo(self):
-        """ run VCL thru host stack echo test """
 
-        # TBD: Enable this when VPP  thru host teardown config bug is fixed.
-        # self.thru_host_stack_test("vcl_test_server", self.server_args,
-        #                           "vcl_test_client",
-        #                           self.client_echo_test_args)
+class VCLThruHostStackEcho(VCLTestCase):
+    """ VCL Thru Host Stack Echo """
+
+    def setUp(self):
+        super(VCLThruHostStackEcho, self).setUp()
+
+        self.thru_host_stack_setup()
+        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]
+        self.client_echo_test_args = ["-E", self.echo_phrase, "-X",
+                                      self.loop0.local_ip4,
+                                      self.server_port]
 
-    # TBD: Remove VCLThruHostStackGroup*TestCase classes and move
-    #      tests here when VPP  thru host teardown/setup config bug
-    #      is fixed.
+    def tearDown(self):
+        self.logger.debug(self.vapi.cli("show app server"))
+        self.logger.debug(self.vapi.cli("show session verbose"))
+        self.thru_host_stack_tear_down()
+        super(VCLThruHostStackEcho, self).tearDown()
 
 
-class VCLThruHostStackNSessionBidirTestCase(VCLTestCase):
-    """ VCL Thru Host Stack NSession Bidir Tests """
+class VCLThruHostStackBidirNsock(VCLTestCase):
+    """ VCL Thru Host Stack Bidir Nsock """
 
     def setUp(self):
-        super(VCLThruHostStackNSessionBidirTestCase, self).setUp()
+        super(VCLThruHostStackBidirNsock, self).setUp()
 
         self.thru_host_stack_setup()
-        if self.vppDebug:
-            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 = 20
-            self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X",
-                                                  "-I", "2",
-                                                  self.loop0.local_ip4,
-                                                  self.server_port]
+        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]
+        self.client_echo_test_args = ["-E", self.echo_phrase, "-X",
+                                      self.loop0.local_ip4,
+                                      self.server_port]
 
     def tearDown(self):
         self.thru_host_stack_tear_down()
-
-        super(VCLThruHostStackNSessionBidirTestCase, self).tearDown()
+        super(VCLThruHostStackBidirNsock, self).tearDown()
 
     def test_vcl_thru_host_stack_bi_dir_nsock(self):
         """ run VCL thru host stack bi-directional (multiple sockets) test """
@@ -400,11 +411,11 @@ class VCLThruHostStackNSessionBidirTestCase(VCLTestCase):
                                   self.client_bi_dir_nsock_test_args)
 
 
-class VCLThruHostStackGroupBTestCase(VCLTestCase):
-    """ VCL Thru Host Stack Group B Tests """
+class LDPThruHostStackBidirNsock(VCLTestCase):
+    """ LDP Thru Host Stack Bidir Nsock """
 
     def setUp(self):
-        super(VCLThruHostStackGroupBTestCase, self).setUp()
+        super(LDPThruHostStackBidirNsock, self).setUp()
 
         self.thru_host_stack_setup()
         if self.vppDebug:
@@ -424,8 +435,7 @@ class VCLThruHostStackGroupBTestCase(VCLTestCase):
 
     def tearDown(self):
         self.thru_host_stack_tear_down()
-
-        super(VCLThruHostStackGroupBTestCase, self).tearDown()
+        super(LDPThruHostStackBidirNsock, self).tearDown()
 
     def test_ldp_thru_host_stack_bi_dir_nsock(self):
         """ run LDP thru host stack bi-directional (multiple sockets) test """
@@ -436,11 +446,11 @@ class VCLThruHostStackGroupBTestCase(VCLTestCase):
                                   self.client_bi_dir_nsock_test_args)
 
 
-class VCLThruHostStackGroupCTestCase(VCLTestCase):
-    """ VCL Thru Host Stack Group C Tests """
+class LDPThruHostStackNsock(VCLTestCase):
+    """ LDP Thru Host Stack Nsock """
 
     def setUp(self):
-        super(VCLThruHostStackGroupCTestCase, self).setUp()
+        super(LDPThruHostStackNsock, self).setUp()
 
         self.thru_host_stack_setup()
         if self.vppDebug:
@@ -457,8 +467,7 @@ class VCLThruHostStackGroupCTestCase(VCLTestCase):
 
     def tearDown(self):
         self.thru_host_stack_tear_down()
-
-        super(VCLThruHostStackGroupCTestCase, self).tearDown()
+        super(LDPThruHostStackNsock, self).tearDown()
 
     def test_ldp_thru_host_stack_uni_dir_nsock(self):
         """ run LDP thru host stack uni-directional (multiple sockets) test """
@@ -469,11 +478,11 @@ class VCLThruHostStackGroupCTestCase(VCLTestCase):
                                   self.client_uni_dir_nsock_test_args)
 
 
-class VCLThruHostStackGroupDTestCase(VCLTestCase):
-    """ VCL Thru Host Stack Group D Tests """
+class VCLThruHostStackNsock(VCLTestCase):
+    """ VCL Thru Host Stack Nsock """
 
     def setUp(self):
-        super(VCLThruHostStackGroupDTestCase, self).setUp()
+        super(VCLThruHostStackNsock, self).setUp()
 
         self.thru_host_stack_setup()
         if self.vppDebug:
@@ -490,8 +499,7 @@ class VCLThruHostStackGroupDTestCase(VCLTestCase):
 
     def tearDown(self):
         self.thru_host_stack_tear_down()
-
-        super(VCLThruHostStackGroupDTestCase, self).tearDown()
+        super(VCLThruHostStackNsock, self).tearDown()
 
     def test_vcl_thru_host_stack_uni_dir_nsock(self):
         """ run VCL thru host stack uni-directional (multiple sockets) test """
@@ -502,21 +510,20 @@ class VCLThruHostStackGroupDTestCase(VCLTestCase):
                                   self.client_uni_dir_nsock_test_args)
 
 
-class VCLThruHostStackIperfTestCase(VCLTestCase):
-    """ VCL Thru Host Stack Iperf Tests """
+class LDPThruHostStackIperf(VCLTestCase):
+    """ LDP Thru Host Stack Iperf  """
 
     def setUp(self):
-        super(VCLThruHostStackIperfTestCase, self).setUp()
+        super(LDPThruHostStackIperf, self).setUp()
 
         self.thru_host_stack_setup()
         self.client_iperf3_timeout = 20
-        self.client_iperf3_args = ["-V4d", "-t 5", "-c", self.loop0.local_ip4]
+        self.client_iperf3_args = ["-V4d", "-t 2", "-c", self.loop0.local_ip4]
         self.server_iperf3_args = ["-V4d", "-s"]
 
     def tearDown(self):
         self.thru_host_stack_tear_down()
-
-        super(VCLThruHostStackIperfTestCase, self).tearDown()
+        super(LDPThruHostStackIperf, self).tearDown()
 
     def test_ldp_thru_host_stack_iperf3(self):
         """ run LDP thru host stack iperf3 test """
@@ -547,7 +554,7 @@ class LDPIpv6CutThruTestCase(VCLTestCase):
         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 5", "-c",
+        self.client_ipv6_iperf3_args = ["-V6d", "-t 2", "-c",
                                         self.server_ipv6_addr]
         self.server_ipv6_iperf3_args = ["-V6d", "-s"]
         self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
@@ -574,6 +581,7 @@ class LDPIpv6CutThruTestCase(VCLTestCase):
                            "sock_test_client",
                            self.client_ipv6_echo_test_args)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_ldp_ipv6_cut_thru_iperf3(self):
         """ run LDP IPv6 cut thru iperf3 test """
 
@@ -589,6 +597,7 @@ class LDPIpv6CutThruTestCase(VCLTestCase):
         self.cut_thru_test("iperf3", self.server_ipv6_iperf3_args,
                            "iperf3", self.client_ipv6_iperf3_args)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_ldp_ipv6_cut_thru_uni_dir_nsock(self):
         """ run LDP IPv6 cut thru uni-directional (multiple sockets) test """
 
@@ -597,6 +606,7 @@ class LDPIpv6CutThruTestCase(VCLTestCase):
                            "sock_test_client",
                            self.client_ipv6_uni_dir_nsock_test_args)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_ldp_ipv6_cut_thru_bi_dir_nsock(self):
         """ run LDP IPv6 cut thru bi-directional (multiple sockets) test """
 
@@ -642,6 +652,7 @@ class VCLIpv6CutThruTestCase(VCLTestCase):
                            "vcl_test_client",
                            self.client_ipv6_echo_test_args)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_vcl_ipv6_cut_thru_uni_dir_nsock(self):
         """ run VCL IPv6 cut thru uni-directional (multiple sockets) test """
 
@@ -650,6 +661,7 @@ class VCLIpv6CutThruTestCase(VCLTestCase):
                            "vcl_test_client",
                            self.client_ipv6_uni_dir_nsock_test_args)
 
+    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_vcl_ipv6_cut_thru_bi_dir_nsock(self):
         """ run VCL IPv6 cut thru bi-directional (multiple sockets) test """
 
@@ -659,11 +671,11 @@ class VCLIpv6CutThruTestCase(VCLTestCase):
                            self.client_ipv6_bi_dir_nsock_test_args)
 
 
-class VCLIpv6ThruHostStackTestCase(VCLTestCase):
-    """ VCL IPv6 Thru Host Stack Tests """
+class VCLIpv6ThruHostStackEcho(VCLTestCase):
+    """ VCL IPv6 Thru Host Stack Echo """
 
     def setUp(self):
-        super(VCLIpv6ThruHostStackTestCase, self).setUp()
+        super(VCLIpv6ThruHostStackEcho, self).setUp()
 
         self.thru_host_stack_ipv6_setup()
         self.client_ipv6_echo_test_args = ["-6", "-E", self.echo_phrase, "-X",
@@ -672,210 +684,15 @@ class VCLIpv6ThruHostStackTestCase(VCLTestCase):
 
     def tearDown(self):
         self.thru_host_stack_ipv6_tear_down()
-
-        super(VCLIpv6ThruHostStackTestCase, self).tearDown()
-
-    def test_ldp_ipv6_thru_host_stack_echo(self):
-        """ run LDP IPv6 thru host stack echo test """
-
-        self.thru_host_stack_test("sock_test_server",
-                                  self.server_ipv6_args,
-                                  "sock_test_client",
-                                  self.client_ipv6_echo_test_args)
-        # TBD: Remove these when VPP thru host teardown config bug is fixed.
-        self.thru_host_stack_test("vcl_test_server",
-                                  self.server_ipv6_args,
-                                  "vcl_test_client",
-                                  self.client_ipv6_echo_test_args)
+        super(VCLIpv6ThruHostStackEcho, self).tearDown()
 
     def test_vcl_ipv6_thru_host_stack_echo(self):
         """ run VCL IPv6 thru host stack echo test """
 
-#        self.thru_host_stack_test("vcl_test_server",
-#                                  self.server_ipv6_args,
-#                                  "vcl_test_client",
-#                                  self.client_ipv6_echo_test_args)
-
-    # TBD: Remove VCLIpv6ThruHostStackGroup*TestCase classes and move
-    #      tests here when VPP  thru host teardown/setup config bug
-    #      is fixed.
-
-
-class VCLIpv6ThruHostStackGroupATestCase(VCLTestCase):
-    """ VCL IPv6 Thru Host Stack Group A Tests """
-
-    def setUp(self):
-        super(VCLIpv6ThruHostStackGroupATestCase, self).setUp()
-
-        self.thru_host_stack_ipv6_setup()
-        if self.vppDebug:
-            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 = 20
-            self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000",
-                                                       "-B", "-X", "-6",
-                                                       "-I", "2",
-                                                       self.loop0.local_ip6,
-                                                       self.server_port]
-
-    def tearDown(self):
-        self.thru_host_stack_ipv6_tear_down()
-
-        super(VCLIpv6ThruHostStackGroupATestCase, self).tearDown()
-
-    def test_vcl_thru_host_stack_bi_dir_nsock(self):
-        """ run VCL thru host stack bi-directional (multiple sockets) test """
-
-        self.timeout = self.client_bi_dir_nsock_timeout
-        self.thru_host_stack_test("vcl_test_server", self.server_ipv6_args,
-                                  "vcl_test_client",
-                                  self.client_ipv6_bi_dir_nsock_test_args)
-
-
-class VCLIpv6ThruHostStackGroupBTestCase(VCLTestCase):
-    """ VCL IPv6 Thru Host Stack Group B Tests """
-
-    def setUp(self):
-        super(VCLIpv6ThruHostStackGroupBTestCase, self).setUp()
-
-        self.thru_host_stack_ipv6_setup()
-        if self.vppDebug:
-            self.client_bi_dir_nsock_timeout = 20
-            self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000",
-                                                       "-B", "-X", "-6",
-                                                       # OUCH! Host Stack Bug?
-                                                       # "-I", "2",
-                                                       self.loop0.local_ip6,
-                                                       self.server_port]
-        else:
-            self.client_bi_dir_nsock_timeout = 20
-            self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000",
-                                                       "-B", "-X", "-6",
-                                                       # OUCH! Host Stack Bug?
-                                                       # "-I", "2",
-                                                       self.loop0.local_ip6,
-                                                       self.server_port]
-
-    def tearDown(self):
-        self.thru_host_stack_ipv6_tear_down()
-
-        super(VCLIpv6ThruHostStackGroupBTestCase, self).tearDown()
-
-    def test_ldp_thru_host_stack_bi_dir_nsock(self):
-        """ run LDP thru host stack bi-directional (multiple sockets) test """
-
-        self.timeout = self.client_bi_dir_nsock_timeout
-        self.thru_host_stack_test("sock_test_server",
-                                  self.server_ipv6_args,
-                                  "sock_test_client",
-                                  self.client_ipv6_bi_dir_nsock_test_args)
-
-
-class VCLIpv6ThruHostStackGroupCTestCase(VCLTestCase):
-    """ VCL IPv6 Thru Host Stack Group C Tests """
-
-    def setUp(self):
-        super(VCLIpv6ThruHostStackGroupCTestCase, self).setUp()
-
-        self.thru_host_stack_ipv6_setup()
-        if self.vppDebug:
-            self.client_uni_dir_nsock_timeout = 20
-            self.numSockets = "2"
-        else:
-            self.client_uni_dir_nsock_timeout = 20
-            self.numSockets = "5"
-
-        self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
-                                                    "-6",
-                                                    "-I", self.numSockets,
-                                                    self.loop0.local_ip6,
-                                                    self.server_port]
-
-    def tearDown(self):
-        self.thru_host_stack_ipv6_tear_down()
-
-        super(VCLIpv6ThruHostStackGroupCTestCase, self).tearDown()
-
-    def test_ldp_thru_host_stack_uni_dir_nsock(self):
-        """ run LDP thru host stack uni-directional (multiple sockets) test """
-
-        self.timeout = self.client_uni_dir_nsock_timeout
-        self.thru_host_stack_test("sock_test_server",
+        self.thru_host_stack_test("vcl_test_server",
                                   self.server_ipv6_args,
-                                  "sock_test_client",
-                                  self.client_ipv6_uni_dir_nsock_test_args)
-
-
-class VCLIpv6ThruHostStackGroupDTestCase(VCLTestCase):
-    """ VCL IPv6 Thru Host Stack Group D Tests """
-
-    def setUp(self):
-        super(VCLIpv6ThruHostStackGroupDTestCase, self).setUp()
-
-        self.thru_host_stack_ipv6_setup()
-        if self.vppDebug:
-            self.client_uni_dir_nsock_timeout = 20
-            self.numSockets = "2"
-        else:
-            self.client_uni_dir_nsock_timeout = 20
-            self.numSockets = "5"
-
-        self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
-                                                    "-6",
-                                                    "-I", self.numSockets,
-                                                    self.loop0.local_ip6,
-                                                    self.server_port]
-
-    def tearDown(self):
-        self.thru_host_stack_ipv6_tear_down()
-
-        super(VCLIpv6ThruHostStackGroupDTestCase, self).tearDown()
-
-    def test_vcl_thru_host_stack_uni_dir_nsock(self):
-        """ run VCL thru host stack uni-directional (multiple sockets) test """
-
-        self.timeout = self.client_uni_dir_nsock_timeout
-        self.thru_host_stack_test("vcl_test_server", self.server_ipv6_args,
                                   "vcl_test_client",
-                                  self.client_ipv6_uni_dir_nsock_test_args)
-
-
-class VCLIpv6ThruHostStackIperfTestCase(VCLTestCase):
-    """ VCL IPv6 Thru Host Stack Iperf Tests """
-
-    def setUp(self):
-        super(VCLIpv6ThruHostStackIperfTestCase, self).setUp()
-
-        self.thru_host_stack_ipv6_setup()
-        self.client_iperf3_timeout = 20
-        self.client_ipv6_iperf3_args = ["-V6d", "-t 5", "-c",
-                                        self.loop0.local_ip6]
-        self.server_ipv6_iperf3_args = ["-V6d", "-s"]
-
-    def tearDown(self):
-        self.thru_host_stack_ipv6_tear_down()
-
-        super(VCLIpv6ThruHostStackIperfTestCase, self).tearDown()
-
-    def test_ldp_thru_host_stack_iperf3(self):
-        """ run LDP thru host stack iperf3 test """
-
-        try:
-            subprocess.check_output(['iperf3', '-v'])
-        except subprocess.CalledProcessError:
-            self.logger.error("WARNING: 'iperf3' is not installed,")
-            self.logger.error(
-                "         'test_ldp_thru_host_stack_iperf3' not run!")
-            return
-
-        self.timeout = self.client_iperf3_timeout
-        self.thru_host_stack_test("iperf3", self.server_ipv6_iperf3_args,
-                                  "iperf3", self.client_ipv6_iperf3_args)
+                                  self.client_ipv6_echo_test_args)
 
 
 if __name__ == '__main__':