fib: fib api updates
[vpp.git] / test / test_vcl.py
index 73537f6..18279e9 100644 (file)
@@ -7,24 +7,24 @@ import subprocess
 import signal
 from framework import VppTestCase, VppTestRunner, running_extended_tests, \
     Worker
-from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
+from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath, FibPathProto
 
 
 class VCLAppWorker(Worker):
     """ VCL Test Application Worker """
 
     def __init__(self, build_dir, appname, args, logger, env={}):
-        vcl_lib_dir = "%s/vpp/.libs" % build_dir
+        vcl_lib_dir = "%s/vpp/lib" % build_dir
         if "iperf" in appname:
             app = appname
             env.update({'LD_PRELOAD':
-                        "%s/libvcl_ldpreload.so.0.0.0" % vcl_lib_dir})
+                        "%s/libvcl_ldpreload.so" % vcl_lib_dir})
+        elif "sock" in appname:
+            app = "%s/vpp/bin/%s" % (build_dir, appname)
+            env.update({'LD_PRELOAD':
+                        "%s/libvcl_ldpreload.so" % vcl_lib_dir})
         else:
-            app = "%s/%s" % (vcl_lib_dir, appname)
-            if not os.path.isfile(app):
-                app = "%s/vpp/%s" % (build_dir, appname)
-                env.update({'LD_PRELOAD':
-                            "%s/libvcl_ldpreload.so.0.0.0" % vcl_lib_dir})
+            app = "%s/vpp/bin/%s" % (build_dir, appname)
         self.args = [app] + args
         super(VCLAppWorker, self).__init__(self.args, logger, env)
 
@@ -32,8 +32,16 @@ class VCLAppWorker(Worker):
 class VCLTestCase(VppTestCase):
     """ VCL Test Class """
 
-    def __init__(self, methodName):
-        var = "VPP_TEST_BUILD_DIR"
+    @classmethod
+    def setUpClass(cls):
+        super(VCLTestCase, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(VCLTestCase, cls).tearDownClass()
+
+    def setUp(self):
+        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)
@@ -41,10 +49,17 @@ class VCLTestCase(VppTestCase):
         self.server_addr = "127.0.0.1"
         self.server_port = "22000"
         self.server_args = [self.server_port]
-        self.timeout = 3
+        self.server_ipv6_addr = "::1"
+        self.server_ipv6_args = ["-6", self.server_port]
+        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)
+        super(VCLTestCase, self).setUp()
 
     def cut_thru_setup(self):
         self.vapi.session_enable_disable(is_enabled=1)
@@ -59,21 +74,22 @@ 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(self.pre_test_sleep)
         worker_client = VCLAppWorker(self.build_dir, client_app, client_args,
                                      self.logger, self.env)
         worker_client.start()
         worker_client.join(self.timeout)
         try:
             self.validateResults(worker_client, worker_server, self.timeout)
-        except Exception, error:
+        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)
-        self.create_loopback_interfaces(range(2))
+        self.create_loopback_interfaces(2)
 
-        table_id = 0
+        table_id = 1
 
         for i in self.lo_interfaces:
             i.admin_up()
@@ -87,22 +103,23 @@ class VCLTestCase(VppTestCase):
             table_id += 1
 
         # Configure namespaces
-        self.vapi.app_namespace_add(namespace_id="0", secret=1234,
-                                    sw_if_index=self.loop0.sw_if_index)
-        self.vapi.app_namespace_add(namespace_id="1", secret=5678,
-                                    sw_if_index=self.loop1.sw_if_index)
+        self.vapi.app_namespace_add_del(namespace_id=b"1", secret=1234,
+                                        sw_if_index=self.loop0.sw_if_index)
+        self.vapi.app_namespace_add_del(namespace_id=b"2", secret=5678,
+                                        sw_if_index=self.loop1.sw_if_index)
 
         # Add inter-table routes
         ip_t01 = VppIpRoute(self, self.loop1.local_ip4, 32,
                             [VppRoutePath("0.0.0.0",
                                           0xffffffff,
-                                          nh_table_id=1)])
+                                          nh_table_id=2)], table_id=1)
         ip_t10 = VppIpRoute(self, self.loop0.local_ip4, 32,
                             [VppRoutePath("0.0.0.0",
                                           0xffffffff,
-                                          nh_table_id=0)], table_id=1)
+                                          nh_table_id=1)], table_id=2)
         ip_t01.add_vpp_config()
         ip_t10.add_vpp_config()
+        self.logger.debug(self.vapi.cli("show ip fib"))
 
     def thru_host_stack_tear_down(self):
         for i in self.lo_interfaces:
@@ -110,21 +127,63 @@ class VCLTestCase(VppTestCase):
             i.set_table_ip4(0)
             i.admin_down()
 
+    def thru_host_stack_ipv6_setup(self):
+        self.vapi.session_enable_disable(is_enabled=1)
+        self.create_loopback_interfaces(2)
+
+        table_id = 1
+
+        for i in self.lo_interfaces:
+            i.admin_up()
+
+            tbl = VppIpTable(self, table_id, is_ip6=1)
+            tbl.add_vpp_config()
+
+            i.set_table_ip6(table_id)
+            i.config_ip6()
+            table_id += 1
+
+        # Configure namespaces
+        self.vapi.app_namespace_add_del(namespace_id=b"1", secret=1234,
+                                        sw_if_index=self.loop0.sw_if_index)
+        self.vapi.app_namespace_add_del(namespace_id=b"2", secret=5678,
+                                        sw_if_index=self.loop1.sw_if_index)
+
+        # Add inter-table routes
+        ip_t01 = VppIpRoute(self, self.loop1.local_ip6, 128,
+                            [VppRoutePath("::0", 0xffffffff,
+                                          nh_table_id=2)],
+                            table_id=1)
+        ip_t10 = VppIpRoute(self, self.loop0.local_ip6, 128,
+                            [VppRoutePath("::0", 0xffffffff,
+                                          nh_table_id=1)],
+                            table_id=2)
+        ip_t01.add_vpp_config()
+        ip_t10.add_vpp_config()
+        self.logger.debug(self.vapi.cli("show interface addr"))
+        self.logger.debug(self.vapi.cli("show ip6 fib"))
+
+    def thru_host_stack_ipv6_tear_down(self):
+        for i in self.lo_interfaces:
+            i.unconfig_ip6()
+            i.set_table_ip6(0)
+            i.admin_down()
+
         self.vapi.session_enable_disable(is_enabled=0)
 
     def thru_host_stack_test(self, server_app, server_args,
                              client_app, client_args):
         self.env = {'VCL_API_PREFIX': self.shm_prefix,
                     'VCL_APP_SCOPE_GLOBAL': "true",
-                    'VCL_APP_NAMESPACE_ID': "0",
+                    'VCL_APP_NAMESPACE_ID': "1",
                     'VCL_APP_NAMESPACE_SECRET': "1234"}
 
         worker_server = VCLAppWorker(self.build_dir, server_app, server_args,
                                      self.logger, self.env)
         worker_server.start()
-        self.sleep(0.2)
+        self.sleep(self.pre_test_sleep)
 
-        self.env.update({'VCL_APP_NAMESPACE_ID': "1",
+        self.env.update({'VCL_APP_NAMESPACE_ID': "2",
                          'VCL_APP_NAMESPACE_SECRET': "5678"})
         worker_client = VCLAppWorker(self.build_dir, client_app, client_args,
                                      self.logger, self.env)
@@ -133,8 +192,9 @@ class VCLTestCase(VppTestCase):
 
         try:
             self.validateResults(worker_client, worker_server, self.timeout)
-        except Exception, error:
+        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)):
@@ -151,9 +211,9 @@ 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:
+            except OSError:
                 self.logger.debug(
                     "Couldn't kill client worker process")
                 raise
@@ -163,32 +223,45 @@ 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 """
+
+    @classmethod
+    def setUpClass(cls):
+        super(LDPCutThruTestCase, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(LDPCutThruTestCase, cls).tearDownClass()
 
     def setUp(self):
-        super(VCLCutThruTestCase, self).setUp()
+        super(LDPCutThruTestCase, self).setUp()
 
         self.cut_thru_setup()
-        self.client_echo_test_args = [self.server_addr, self.server_port,
-                                      "-E", self.echo_phrase, "-X"]
+        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", "-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 = 60
-        self.client_uni_dir_nsock_test_args = [self.server_addr,
-                                               self.server_port,
-                                               "-I", "5", "-U", "-X"]
-        self.client_bi_dir_nsock_timeout = 120
-        self.client_bi_dir_nsock_test_args = [self.server_addr,
-                                              self.server_port,
-                                              "-I", "2", "-B", "-X"]
+        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):
+        super(LDPCutThruTestCase, self).tearDown()
         self.cut_thru_tear_down()
 
-        super(VCLCutThruTestCase, self).tearDown()
+    def show_commands_at_teardown(self):
+        self.logger.debug(self.vapi.cli("show session verbose 2"))
 
+    @unittest.skipUnless(running_extended_tests, "part of extended tests")
     def test_ldp_cut_thru_echo(self):
         """ run LDP cut thru echo test """
 
@@ -200,16 +273,27 @@ class VCLCutThruTestCase(VCLTestCase):
 
         try:
             subprocess.check_output(['iperf3', '-v'])
-        except:
-            self.logger.error("WARNING: 'iperf3' is not installed,")
+        except subprocess.CalledProcessError:
+            self.logger.error(
+                "WARNING: Subprocess returned non-0 running 'iperf3 -v")
             self.logger.error("         'test_ldp_cut_thru_iperf3' not run!")
             return
+        except OSError as e:
+            self.logger.error(
+                "WARNING: Subprocess returned with OS error (%s) %s\n"
+                "         'iperf3' is likely not installed,",
+                e.errno, e.strerror)
+            self.logger.error("         'test_ldp_cut_thru_iperf3' not run!")
+            return
+        except Exception:
+            self.logger.exception(
+                "Subprocess returned non-0 running 'iperf3 -v")
 
         self.timeout = self.client_iperf3_timeout
         self.cut_thru_test("iperf3", self.server_iperf3_args,
                            "iperf3", self.client_iperf3_args)
 
-    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
+    @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 """
 
@@ -218,7 +302,7 @@ class VCLCutThruTestCase(VCLTestCase):
                            "sock_test_client",
                            self.client_uni_dir_nsock_test_args)
 
-    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
+    @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 """
 
@@ -227,13 +311,48 @@ class VCLCutThruTestCase(VCLTestCase):
                            "sock_test_client",
                            self.client_bi_dir_nsock_test_args)
 
+
+class VCLCutThruTestCase(VCLTestCase):
+    """ VCL Cut Thru Tests """
+
+    @classmethod
+    def setUpClass(cls):
+        super(VCLCutThruTestCase, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(VCLCutThruTestCase, cls).tearDownClass()
+
+    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):
+        super(VCLCutThruTestCase, self).tearDown()
+
+    def show_commands_at_teardown(self):
+        self.logger.debug(self.vapi.cli("show session verbose 2"))
+
     def test_vcl_cut_thru_echo(self):
         """ run VCL cut thru echo test """
 
         self.cut_thru_test("vcl_test_server", self.server_args,
                            "vcl_test_client", self.client_echo_test_args)
 
-    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_vcl_cut_thru_uni_dir_nsock(self):
         """ run VCL cut thru uni-directional (multiple sockets) test """
 
@@ -242,7 +361,6 @@ class VCLCutThruTestCase(VCLTestCase):
                            "vcl_test_client",
                            self.client_uni_dir_nsock_test_args)
 
-    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_vcl_cut_thru_bi_dir_nsock(self):
         """ run VCL cut thru bi-directional (multiple sockets) test """
 
@@ -252,67 +370,108 @@ class VCLCutThruTestCase(VCLTestCase):
                            self.client_bi_dir_nsock_test_args)
 
 
-class VCLThruHostStackTestCase(VCLTestCase):
-    """ VCL Thru Host Stack Tests """
+class VCLThruHostStackEcho(VCLTestCase):
+    """ VCL Thru Host Stack Echo """
+
+    @classmethod
+    def setUpClass(cls):
+        super(VCLThruHostStackEcho, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(VCLThruHostStackEcho, cls).tearDownClass()
 
     def setUp(self):
-        super(VCLThruHostStackTestCase, self).setUp()
+        super(VCLThruHostStackEcho, self).setUp()
 
         self.thru_host_stack_setup()
-        self.client_echo_test_args = [self.loop0.local_ip4,
-                                      self.server_port,
-                                      "-E", self.echo_phrase, "-X"]
+        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(VCLThruHostStackEcho, self).tearDown()
 
-        super(VCLThruHostStackTestCase, self).tearDown()
+    def show_commands_at_teardown(self):
+        self.logger.debug(self.vapi.cli("show app server"))
+        self.logger.debug(self.vapi.cli("show session verbose"))
 
-    def test_ldp_thru_host_stack_echo(self):
-        """ run LDP thru host stack echo test """
 
-        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,
+class VCLThruHostStackTLS(VCLTestCase):
+    """ VCL Thru Host Stack TLS """
+
+    @classmethod
+    def setUpClass(cls):
+        super(VCLThruHostStackTLS, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(VCLThruHostStackTLS, cls).tearDownClass()
+
+    def setUp(self):
+        super(VCLThruHostStackTLS, self).setUp()
+
+        self.thru_host_stack_setup()
+        self.client_uni_dir_tls_timeout = 20
+        self.server_tls_args = ["-L", self.server_port]
+        self.client_uni_dir_tls_test_args = ["-N", "1000", "-U", "-X", "-L",
+                                             self.loop0.local_ip4,
+                                             self.server_port]
+
+    def test_vcl_thru_host_stack_tls_uni_dir(self):
+        """ run VCL thru host stack uni-directional TLS test """
+
+        self.timeout = self.client_uni_dir_tls_timeout
+        self.thru_host_stack_test("vcl_test_server", self.server_tls_args,
                                   "vcl_test_client",
-                                  self.client_echo_test_args)
+                                  self.client_uni_dir_tls_test_args)
+
+    def tearDown(self):
+        self.thru_host_stack_tear_down()
+        super(VCLThruHostStackTLS, self).tearDown()
 
-    def test_vcl_thru_host_stack_echo(self):
-        """ run VCL thru host stack echo test """
+    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"))
 
-        # 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)
 
-    # TBD: Remove VCLThruHostStackExtended*TestCase classes and move
-    #      tests here when VPP  thru host teardown/setup config bug
-    #      is fixed.
+class VCLThruHostStackBidirNsock(VCLTestCase):
+    """ VCL Thru Host Stack Bidir Nsock """
 
+    @classmethod
+    def setUpClass(cls):
+        super(VCLThruHostStackBidirNsock, cls).setUpClass()
 
-class VCLThruHostStackExtendedATestCase(VCLTestCase):
-    """ VCL Thru Host Stack Extended Tests """
+    @classmethod
+    def tearDownClass(cls):
+        super(VCLThruHostStackBidirNsock, cls).tearDownClass()
 
     def setUp(self):
-        super(VCLThruHostStackExtendedATestCase, self).setUp()
+        super(VCLThruHostStackBidirNsock, self).setUp()
 
         self.thru_host_stack_setup()
-        if self.vppDebug:
-            self.client_bi_dir_nsock_timeout = 120
-        else:
-            self.client_bi_dir_nsock_timeout = 60
-        self.client_bi_dir_nsock_test_args = [self.loop0.local_ip4,
-                                              self.server_port,
-                                              "-I", "2", "-B", "-X"]
+        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(VCLThruHostStackBidirNsock, self).tearDown()
 
-        super(VCLThruHostStackExtendedATestCase, self).tearDown()
+    def show_commands_at_teardown(self):
+        self.logger.debug(self.vapi.cli("show session verbose 2"))
 
-    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_vcl_thru_host_stack_bi_dir_nsock(self):
         """ run VCL thru host stack bi-directional (multiple sockets) test """
 
@@ -322,27 +481,43 @@ class VCLThruHostStackExtendedATestCase(VCLTestCase):
                                   self.client_bi_dir_nsock_test_args)
 
 
-class VCLThruHostStackExtendedBTestCase(VCLTestCase):
-    """ VCL Thru Host Stack Extended Tests """
+class LDPThruHostStackBidirNsock(VCLTestCase):
+    """ LDP Thru Host Stack Bidir Nsock """
+
+    @classmethod
+    def setUpClass(cls):
+        super(LDPThruHostStackBidirNsock, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(LDPThruHostStackBidirNsock, cls).tearDownClass()
 
     def setUp(self):
-        super(VCLThruHostStackExtendedBTestCase, self).setUp()
+        super(LDPThruHostStackBidirNsock, self).setUp()
 
         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_test_args = [self.loop0.local_ip4,
-                                              self.server_port,
-                                              "-I", "2", "-B", "-X"]
+            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]
 
     def tearDown(self):
         self.thru_host_stack_tear_down()
+        super(LDPThruHostStackBidirNsock, self).tearDown()
 
-        super(VCLThruHostStackExtendedBTestCase, self).tearDown()
+    def show_commands_at_teardown(self):
+        self.logger.debug(self.vapi.cli("show session verbose 2"))
 
-    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_ldp_thru_host_stack_bi_dir_nsock(self):
         """ run LDP thru host stack bi-directional (multiple sockets) test """
 
@@ -352,31 +527,37 @@ class VCLThruHostStackExtendedBTestCase(VCLTestCase):
                                   self.client_bi_dir_nsock_test_args)
 
 
-class VCLThruHostStackExtendedCTestCase(VCLTestCase):
-    """ VCL Thru Host Stack Extended Tests """
+class LDPThruHostStackNsock(VCLTestCase):
+    """ LDP Thru Host Stack Nsock """
+
+    @classmethod
+    def setUpClass(cls):
+        super(LDPThruHostStackNsock, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(LDPThruHostStackNsock, cls).tearDownClass()
 
     def setUp(self):
-        super(VCLThruHostStackExtendedCTestCase, self).setUp()
+        super(LDPThruHostStackNsock, self).setUp()
 
         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 = [self.loop0.local_ip4,
-                                               self.server_port,
+        self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
                                                "-I", self.numSockets,
-                                               "-U", "-X"]
+                                               self.loop0.local_ip4,
+                                               self.server_port]
 
     def tearDown(self):
         self.thru_host_stack_tear_down()
+        super(LDPThruHostStackNsock, self).tearDown()
 
-        super(VCLThruHostStackExtendedCTestCase, self).tearDown()
-
-    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_ldp_thru_host_stack_uni_dir_nsock(self):
         """ run LDP thru host stack uni-directional (multiple sockets) test """
 
@@ -386,31 +567,37 @@ class VCLThruHostStackExtendedCTestCase(VCLTestCase):
                                   self.client_uni_dir_nsock_test_args)
 
 
-class VCLThruHostStackExtendedDTestCase(VCLTestCase):
-    """ VCL Thru Host Stack Extended Tests """
+class VCLThruHostStackNsock(VCLTestCase):
+    """ VCL Thru Host Stack Nsock """
+
+    @classmethod
+    def setUpClass(cls):
+        super(VCLThruHostStackNsock, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(VCLThruHostStackNsock, cls).tearDownClass()
 
     def setUp(self):
-        super(VCLThruHostStackExtendedDTestCase, self).setUp()
+        super(VCLThruHostStackNsock, self).setUp()
 
         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 = [self.loop0.local_ip4,
-                                               self.server_port,
+        self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
                                                "-I", self.numSockets,
-                                               "-U", "-X"]
+                                               self.loop0.local_ip4,
+                                               self.server_port]
 
     def tearDown(self):
         self.thru_host_stack_tear_down()
+        super(VCLThruHostStackNsock, self).tearDown()
 
-        super(VCLThruHostStackExtendedDTestCase, self).tearDown()
-
-    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
     def test_vcl_thru_host_stack_uni_dir_nsock(self):
         """ run VCL thru host stack uni-directional (multiple sockets) test """
 
@@ -420,37 +607,231 @@ class VCLThruHostStackExtendedDTestCase(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  """
+
+    @classmethod
+    def setUpClass(cls):
+        super(LDPThruHostStackIperf, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(LDPThruHostStackIperf, cls).tearDownClass()
 
     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", "-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(LDPThruHostStackIperf, self).tearDown()
 
-        super(VCLThruHostStackIperfTestCase, self).tearDown()
+    def show_commands_at_teardown(self):
+        self.logger.debug(self.vapi.cli("show session verbose 2"))
 
     def test_ldp_thru_host_stack_iperf3(self):
         """ run LDP thru host stack iperf3 test """
 
         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!")
             return
+        except OSError as e:
+            self.logger.error("WARNING: 'iperf3' is not installed,")
+            self.logger.error("         'test' not run!")
+            return
+        except Exception as e:
+            self.logger.error("WARNING: 'iperf3' unexpected error,")
+            self.logger.error("         'test' not run!")
+            return
 
         self.timeout = self.client_iperf3_timeout
         self.thru_host_stack_test("iperf3", self.server_iperf3_args,
                                   "iperf3", self.client_iperf3_args)
 
 
+class LDPIpv6CutThruTestCase(VCLTestCase):
+    """ LDP IPv6 Cut Thru Tests """
+
+    @classmethod
+    def setUpClass(cls):
+        super(LDPIpv6CutThruTestCase, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(LDPIpv6CutThruTestCase, cls).tearDownClass()
+
+    def setUp(self):
+        super(LDPIpv6CutThruTestCase, self).setUp()
+
+        self.cut_thru_setup()
+        self.client_iperf3_timeout = 20
+        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_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",
+                                                    "-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):
+        super(LDPIpv6CutThruTestCase, self).tearDown()
+        self.cut_thru_tear_down()
+
+    def test_ldp_ipv6_cut_thru_echo(self):
+        """ run LDP IPv6 cut thru echo test """
+
+        self.cut_thru_test("sock_test_server",
+                           self.server_ipv6_args,
+                           "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 """
+
+        try:
+            subprocess.check_output(['iperf3', '-v'])
+        except:
+            self.logger.error("WARNING: 'iperf3' is not installed,")
+            self.logger.error(
+                "         'test_ldp_ipv6_cut_thru_iperf3' not run!")
+            return
+
+        self.timeout = self.client_iperf3_timeout
+        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 """
+
+        self.timeout = self.client_uni_dir_nsock_timeout
+        self.cut_thru_test("sock_test_server", self.server_ipv6_args,
+                           "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 """
+
+        self.timeout = self.client_bi_dir_nsock_timeout
+        self.cut_thru_test("sock_test_server", self.server_ipv6_args,
+                           "sock_test_client",
+                           self.client_ipv6_bi_dir_nsock_test_args)
+
+
+class VCLIpv6CutThruTestCase(VCLTestCase):
+    """ VCL IPv6 Cut Thru Tests """
+
+    @classmethod
+    def setUpClass(cls):
+        super(VCLIpv6CutThruTestCase, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(VCLIpv6CutThruTestCase, cls).tearDownClass()
+
+    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):
+        super(VCLIpv6CutThruTestCase, self).tearDown()
+        self.cut_thru_tear_down()
+
+    def test_vcl_ipv6_cut_thru_echo(self):
+        """ run VCL IPv6 cut thru echo test """
+
+        self.cut_thru_test("vcl_test_server",
+                           self.server_ipv6_args,
+                           "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 """
+
+        self.timeout = self.client_uni_dir_nsock_timeout
+        self.cut_thru_test("vcl_test_server", self.server_ipv6_args,
+                           "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 """
+
+        self.timeout = self.client_bi_dir_nsock_timeout
+        self.cut_thru_test("vcl_test_server", self.server_ipv6_args,
+                           "vcl_test_client",
+                           self.client_ipv6_bi_dir_nsock_test_args)
+
+
+class VCLIpv6ThruHostStackEcho(VCLTestCase):
+    """ VCL IPv6 Thru Host Stack Echo """
+
+    @classmethod
+    def setUpClass(cls):
+        super(VCLIpv6ThruHostStackEcho, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(VCLIpv6ThruHostStackEcho, cls).tearDownClass()
+
+    def setUp(self):
+        super(VCLIpv6ThruHostStackEcho, self).setUp()
+
+        self.thru_host_stack_ipv6_setup()
+        self.client_ipv6_echo_test_args = ["-6", "-E", self.echo_phrase, "-X",
+                                           self.loop0.local_ip6,
+                                           self.server_port]
+
+    def tearDown(self):
+        self.thru_host_stack_ipv6_tear_down()
+        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)
+
+
 if __name__ == '__main__':
     unittest.main(testRunner=VppTestRunner)