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>
This commit is contained in:
Klement Sekera
2022-04-26 19:02:15 +02:00
committed by Ole Tr�an
parent f90348bcb4
commit d9b0c6fbf7
268 changed files with 46750 additions and 35224 deletions

View File

@ -9,42 +9,53 @@ from vpp_policer import VppPolicer, PolicerAction
# Default for the tests is 10s of "Green" packets at 8Mbps, ie. 10M bytes.
# The policer helper CLI "sends" 500 byte packets, so default is 20000.
TEST_RATE = 8000 # kbps
TEST_RATE = 8000 # kbps
TEST_BURST = 10000 # ms
CIR_OK = 8500 # CIR in kbps, above test rate
CIR_LOW = 7000 # CIR in kbps, below test rate
EIR_OK = 9000 # EIR in kbps, above test rate
EIR_LOW = 7500 # EIR in kbps, below test rate
CIR_OK = 8500 # CIR in kbps, above test rate
CIR_LOW = 7000 # CIR in kbps, below test rate
EIR_OK = 9000 # EIR in kbps, above test rate
EIR_LOW = 7500 # EIR in kbps, below test rate
NUM_PKTS = 20000
CBURST = 100000 # Committed burst in bytes
EBURST = 200000 # Excess burst in bytes
CBURST = 100000 # Committed burst in bytes
EBURST = 200000 # Excess burst in bytes
class TestPolicer(VppTestCase):
""" Policer Test Case """
"""Policer Test Case"""
def run_policer_test(self, type, cir, cb, eir, eb, rate=8000, burst=10000,
colour=0):
def run_policer_test(
self, type, cir, cb, eir, eb, rate=8000, burst=10000, colour=0
):
"""
Configure a Policer and push traffic through it.
"""
types = {
'1R2C': 0,
'1R3C': 1,
'2R3C': 3,
"1R2C": 0,
"1R3C": 1,
"2R3C": 3,
}
pol_type = types.get(type)
policer = VppPolicer(self, "pol1", cir, eir, cb, eb, rate_type=0,
type=pol_type, color_aware=colour)
policer = VppPolicer(
self,
"pol1",
cir,
eir,
cb,
eb,
rate_type=0,
type=pol_type,
color_aware=colour,
)
policer.add_vpp_config()
error = self.vapi.cli(
f"test policing index {policer.policer_index} rate {rate} "
f"burst {burst} colour {colour}")
f"burst {burst} colour {colour}"
)
stats = policer.get_stats()
policer.remove_vpp_config()
@ -52,66 +63,64 @@ class TestPolicer(VppTestCase):
return stats
def test_policer_1r2c(self):
""" Single rate, 2 colour policer """
"""Single rate, 2 colour policer"""
stats = self.run_policer_test("1R2C", CIR_OK, CBURST, 0, 0)
self.assertEqual(stats['conform_packets'], NUM_PKTS)
self.assertEqual(stats["conform_packets"], NUM_PKTS)
stats = self.run_policer_test("1R2C", CIR_LOW, CBURST, 0, 0)
self.assertLess(stats['conform_packets'], NUM_PKTS)
self.assertEqual(stats['exceed_packets'], 0)
self.assertGreater(stats['violate_packets'], 0)
self.assertLess(stats["conform_packets"], NUM_PKTS)
self.assertEqual(stats["exceed_packets"], 0)
self.assertGreater(stats["violate_packets"], 0)
stats = self.run_policer_test("1R2C", CIR_LOW, CBURST, 0, 0, colour=2)
self.assertEqual(stats['violate_packets'], NUM_PKTS)
self.assertEqual(stats["violate_packets"], NUM_PKTS)
def test_policer_1r3c(self):
""" Single rate, 3 colour policer """
"""Single rate, 3 colour policer"""
stats = self.run_policer_test("1R3C", CIR_OK, CBURST, 0, 0)
self.assertEqual(stats['conform_packets'], NUM_PKTS)
self.assertEqual(stats["conform_packets"], NUM_PKTS)
stats = self.run_policer_test("1R3C", CIR_LOW, CBURST, 0, EBURST)
self.assertLess(stats['conform_packets'], NUM_PKTS)
self.assertGreater(stats['exceed_packets'], 0)
self.assertGreater(stats['violate_packets'], 0)
self.assertLess(stats["conform_packets"], NUM_PKTS)
self.assertGreater(stats["exceed_packets"], 0)
self.assertGreater(stats["violate_packets"], 0)
stats = self.run_policer_test("1R3C", CIR_LOW, CBURST, 0, EBURST,
colour=1)
self.assertEqual(stats['conform_packets'], 0)
self.assertGreater(stats['exceed_packets'], 0)
self.assertGreater(stats['violate_packets'], 0)
stats = self.run_policer_test("1R3C", CIR_LOW, CBURST, 0, EBURST, colour=1)
self.assertEqual(stats["conform_packets"], 0)
self.assertGreater(stats["exceed_packets"], 0)
self.assertGreater(stats["violate_packets"], 0)
stats = self.run_policer_test("1R3C", CIR_LOW, CBURST, 0, EBURST,
colour=2)
self.assertEqual(stats['violate_packets'], NUM_PKTS)
stats = self.run_policer_test("1R3C", CIR_LOW, CBURST, 0, EBURST, colour=2)
self.assertEqual(stats["violate_packets"], NUM_PKTS)
def test_policer_2r3c(self):
""" Dual rate, 3 colour policer """
"""Dual rate, 3 colour policer"""
stats = self.run_policer_test("2R3C", CIR_OK, CBURST, EIR_OK, EBURST)
self.assertEqual(stats['conform_packets'], NUM_PKTS)
self.assertEqual(stats["conform_packets"], NUM_PKTS)
stats = self.run_policer_test("2R3C", CIR_LOW, CBURST, EIR_OK, EBURST)
self.assertLess(stats['conform_packets'], NUM_PKTS)
self.assertGreater(stats['exceed_packets'], 0)
self.assertEqual(stats['violate_packets'], 0)
self.assertLess(stats["conform_packets"], NUM_PKTS)
self.assertGreater(stats["exceed_packets"], 0)
self.assertEqual(stats["violate_packets"], 0)
stats = self.run_policer_test("2R3C", CIR_LOW, CBURST, EIR_LOW, EBURST)
self.assertLess(stats['conform_packets'], NUM_PKTS)
self.assertGreater(stats['exceed_packets'], 0)
self.assertGreater(stats['violate_packets'], 0)
self.assertLess(stats["conform_packets"], NUM_PKTS)
self.assertGreater(stats["exceed_packets"], 0)
self.assertGreater(stats["violate_packets"], 0)
stats = self.run_policer_test("2R3C", CIR_LOW, CBURST, EIR_OK, EBURST,
colour=1)
self.assertEqual(stats['exceed_packets'], NUM_PKTS)
stats = self.run_policer_test("2R3C", CIR_LOW, CBURST, EIR_OK, EBURST, colour=1)
self.assertEqual(stats["exceed_packets"], NUM_PKTS)
stats = self.run_policer_test("2R3C", CIR_LOW, CBURST, EIR_LOW, EBURST,
colour=1)
self.assertEqual(stats['conform_packets'], 0)
self.assertGreater(stats['exceed_packets'], 0)
self.assertGreater(stats['violate_packets'], 0)
stats = self.run_policer_test(
"2R3C", CIR_LOW, CBURST, EIR_LOW, EBURST, colour=1
)
self.assertEqual(stats["conform_packets"], 0)
self.assertGreater(stats["exceed_packets"], 0)
self.assertGreater(stats["violate_packets"], 0)
stats = self.run_policer_test("2R3C", CIR_LOW, CBURST, EIR_OK, EBURST,
colour=2)
self.assertEqual(stats['violate_packets'], NUM_PKTS)
stats = self.run_policer_test("2R3C", CIR_LOW, CBURST, EIR_OK, EBURST, colour=2)
self.assertEqual(stats["violate_packets"], NUM_PKTS)
if __name__ == '__main__':
if __name__ == "__main__":
unittest.main(testRunner=VppTestRunner)