-#!/usr/bin/env python
+#!/usr/bin/env python3
import unittest
def setUpClass(cls):
super(TestTCP, cls).setUpClass()
+ @classmethod
+ def tearDownClass(cls):
+ super(TestTCP, cls).tearDownClass()
+
def setUp(self):
super(TestTCP, self).setUp()
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
# Configure namespaces
- self.vapi.app_namespace_add(namespace_id="0",
- sw_if_index=self.loop0.sw_if_index)
- self.vapi.app_namespace_add(namespace_id="1",
- sw_if_index=self.loop1.sw_if_index)
+ self.vapi.app_namespace_add_del(namespace_id="0",
+ sw_if_index=self.loop0.sw_if_index)
+ self.vapi.app_namespace_add_del(namespace_id="1",
+ sw_if_index=self.loop1.sw_if_index)
def tearDown(self):
for i in self.lo_interfaces:
self.vapi.session_enable_disable(is_enabled=0)
super(TestTCP, self).tearDown()
- def test_tcp_unittest(self):
- """ TCP Unit Tests """
- error = self.vapi.cli("test tcp all")
-
- if error:
- self.logger.critical(error)
- self.assertEqual(error.find("failed"), -1)
-
def test_tcp_transfer(self):
""" TCP echo client/server transfer """
uri)
if error:
self.logger.critical(error)
- self.assertEqual(error.find("failed"), -1)
+ self.assertNotIn("failed", error)
error = self.vapi.cli("test echo client mbytes 10 appns 1 " +
"fifo-size 4 no-output test-bytes " +
"syn-timeout 2 uri " + uri)
if error:
self.logger.critical(error)
- self.assertEqual(error.find("failed"), -1)
+ self.assertNotIn("failed", error)
# Delete inter-table routes
ip_t01.remove_vpp_config()
ip_t10.remove_vpp_config()
+
+class TestTCPUnitTests(VppTestCase):
+ "TCP Unit Tests"
+
+ @classmethod
+ def setUpClass(cls):
+ super(TestTCPUnitTests, cls).setUpClass()
+
+ @classmethod
+ def tearDownClass(cls):
+ super(TestTCPUnitTests, cls).tearDownClass()
+
+ def setUp(self):
+ super(TestTCPUnitTests, self).setUp()
+ self.vapi.session_enable_disable(is_enabled=1)
+
+ def tearDown(self):
+ super(TestTCPUnitTests, self).tearDown()
+ self.vapi.session_enable_disable(is_enabled=0)
+
+ def test_tcp_unittest(self):
+ """ TCP Unit Tests """
+ error = self.vapi.cli("test tcp all")
+
+ if error:
+ self.logger.critical(error)
+ self.assertNotIn("failed", error)
+
if __name__ == '__main__':
unittest.main(testRunner=VppTestRunner)