aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_container.py
diff options
context:
space:
mode:
authorKlement Sekera <klement.sekera@gmail.com>2022-04-26 19:02:15 +0200
committerOle Tr�an <otroan@employees.org>2022-05-10 18:52:08 +0000
commitd9b0c6fbf7aa5bd9af84264105b39c82028a4a29 (patch)
tree4f786cfd8ebc2443cb11e11b74c8657204068898 /test/test_container.py
parentf90348bcb4afd0af2611cefc43b17ef3042b511c (diff)
tests: replace pycodestyle with black
Drop pycodestyle for code style checking in favor of black. Black is much faster, stable PEP8 compliant code style checker offering also automatic formatting. It aims to be very stable and produce smallest diffs. It's used by many small and big projects. Running checkstyle with black takes a few seconds with a terse output. Thus, test-checkstyle-diff is no longer necessary. Expand scope of checkstyle to all python files in the repo, replacing test-checkstyle with checkstyle-python. Also, fixstyle-python is now available for automatic style formatting. Note: python virtualenv has been consolidated in test/Makefile, test/requirements*.txt which will eventually be moved to a central location. This is required to simply the automated generation of docker executor images in the CI. Type: improvement Change-Id: I022a326603485f58585e879ac0f697fceefbc9c8 Signed-off-by: Klement Sekera <klement.sekera@gmail.com> Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'test/test_container.py')
-rw-r--r--test/test_container.py72
1 files changed, 42 insertions, 30 deletions
diff --git a/test/test_container.py b/test/test_container.py
index 739aaaf915a..d79e5c3c67d 100644
--- a/test/test_container.py
+++ b/test/test_container.py
@@ -24,7 +24,7 @@ class Conn(L4_Conn):
@unittest.skipUnless(config.extended, "part of extended tests")
class ContainerIntegrationTestCase(VppTestCase):
- """ Container integration extended testcases """
+ """Container integration extended testcases"""
@classmethod
def setUpClass(cls):
@@ -43,22 +43,21 @@ class ContainerIntegrationTestCase(VppTestCase):
super(ContainerIntegrationTestCase, cls).tearDownClass()
def tearDown(self):
- """Run standard test teardown and log various show commands
- """
+ """Run standard test teardown and log various show commands"""
super(ContainerIntegrationTestCase, self).tearDown()
def show_commands_at_teardown(self):
self.logger.info(self.vapi.cli("show ip neighbors"))
def run_basic_conn_test(self, af, acl_side):
- """ Basic connectivity test """
+ """Basic connectivity test"""
conn1 = Conn(self, self.pg0, self.pg1, af, UDP, 42001, 4242)
conn1.send_through(0)
# the return packets should pass
conn1.send_through(1)
def run_negative_conn_test(self, af, acl_side):
- """ Packets with local spoofed address """
+ """Packets with local spoofed address"""
conn1 = Conn(self, self.pg0, self.pg1, af, UDP, 42001, 4242)
try:
p2 = conn1.send_through(0).command()
@@ -69,15 +68,15 @@ class ContainerIntegrationTestCase(VppTestCase):
self.assert_equal(p2, None, ": packet should have been dropped")
def test_0010_basic_conn_test(self):
- """ IPv4 basic connectivity test """
+ """IPv4 basic connectivity test"""
self.run_basic_conn_test(AF_INET, 0)
def test_0011_basic_conn_test(self):
- """ IPv6 basic connectivity test """
+ """IPv6 basic connectivity test"""
self.run_basic_conn_test(AF_INET6, 0)
def test_0050_loopback_prepare_test(self):
- """ Create loopbacks overlapping with remote addresses """
+ """Create loopbacks overlapping with remote addresses"""
self.create_loopback_interfaces(2)
for i in range(2):
intf = self.lo_interfaces[i]
@@ -90,47 +89,60 @@ class ContainerIntegrationTestCase(VppTestCase):
intf.config_ip6()
def test_0110_basic_conn_test(self):
- """ IPv4 local-spoof connectivity test """
+ """IPv4 local-spoof connectivity test"""
self.run_negative_conn_test(AF_INET, 0)
def test_0111_basic_conn_test(self):
- """ IPv6 local-spoof connectivity test """
+ """IPv6 local-spoof connectivity test"""
self.run_negative_conn_test(AF_INET, 1)
def test_0200_basic_conn_test(self):
- """ Configure container commands """
+ """Configure container commands"""
for i in range(2):
- for addr in [self.pg_interfaces[i].remote_ip4,
- self.pg_interfaces[i].remote_ip6]:
- self.vapi.ppcli("ip container " + addr + " " +
- self.pg_interfaces[i].name)
- self.vapi.ppcli("stn rule address " + addr +
- " interface " + self.pg_interfaces[i].name)
+ for addr in [
+ self.pg_interfaces[i].remote_ip4,
+ self.pg_interfaces[i].remote_ip6,
+ ]:
+ self.vapi.ppcli(
+ "ip container " + addr + " " + self.pg_interfaces[i].name
+ )
+ self.vapi.ppcli(
+ "stn rule address "
+ + addr
+ + " interface "
+ + self.pg_interfaces[i].name
+ )
def test_0210_basic_conn_test(self):
- """ IPv4 test after configuring container """
+ """IPv4 test after configuring container"""
self.run_basic_conn_test(AF_INET, 0)
def test_0211_basic_conn_test(self):
- """ IPv6 test after configuring container """
+ """IPv6 test after configuring container"""
self.run_basic_conn_test(AF_INET, 1)
def test_0300_unconfigure_commands(self):
- """ Unconfigure container commands """
+ """Unconfigure container commands"""
for i in range(2):
- for addr in [self.pg_interfaces[i].remote_ip4,
- self.pg_interfaces[i].remote_ip6]:
- self.vapi.ppcli("ip container " + addr + " " +
- self.pg_interfaces[i].name +
- " del")
- self.vapi.ppcli("stn rule address " + addr +
- " interface " + self.pg_interfaces[i].name +
- " del")
+ for addr in [
+ self.pg_interfaces[i].remote_ip4,
+ self.pg_interfaces[i].remote_ip6,
+ ]:
+ self.vapi.ppcli(
+ "ip container " + addr + " " + self.pg_interfaces[i].name + " del"
+ )
+ self.vapi.ppcli(
+ "stn rule address "
+ + addr
+ + " interface "
+ + self.pg_interfaces[i].name
+ + " del"
+ )
def test_0410_spoof_test(self):
- """ IPv4 local-spoof after unconfig test """
+ """IPv4 local-spoof after unconfig test"""
self.run_negative_conn_test(AF_INET, 0)
def test_0411_spoof_test(self):
- """ IPv6 local-spoof after unconfig test """
+ """IPv6 local-spoof after unconfig test"""
self.run_negative_conn_test(AF_INET, 1)