aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_adl.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_adl.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_adl.py')
-rw-r--r--test/test_adl.py126
1 files changed, 66 insertions, 60 deletions
diff --git a/test/test_adl.py b/test/test_adl.py
index 0463e258013..f58147d2d58 100644
--- a/test/test_adl.py
+++ b/test/test_adl.py
@@ -7,7 +7,7 @@ from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
class TestAdl(VppTestCase):
- """ Allow/Deny Plugin Unit Test Cases """
+ """Allow/Deny Plugin Unit Test Cases"""
@classmethod
def setUpClass(cls):
@@ -24,80 +24,86 @@ class TestAdl(VppTestCase):
super(TestAdl, self).tearDown()
def test_adl1_unittest(self):
- """ Plugin API Test """
- cmds = ["loop create\n",
- "set int ip address loop0 192.168.1.1/24\n",
- "set int ip6 table loop0 0\n",
- "set int ip address loop0 2001:db01::1/64\n",
- "set int state loop0 up\n",
- "packet-generator new {\n"
- " name ip4\n"
- " limit 100\n"
- " rate 0\n"
- " size 128-128\n"
- " interface loop0\n"
- " node adl-input\n"
- " data { IP4: 1.2.40 -> 3cfd.fed0.b6c8\n"
- " UDP: 192.168.1.2-192.168.1.10 -> 192.168.2.1\n"
- " UDP: 1234 -> 2345\n"
- " incrementing 114\n"
- " }\n"
- " }\n",
- "packet-generator new {\n"
- " name ip6-allow\n"
- " limit 50\n"
- " rate 0\n"
- " size 128-128\n"
- " interface loop0\n"
- " node adl-input\n"
- " data { IP6: 1.2.40 -> 3cfd.fed0.b6c8\n"
- " UDP: 2001:db01::2 -> 2001:db01::1\n"
- " UDP: 1234 -> 2345\n"
- " incrementing 80\n"
- " }\n"
- " }\n",
- "packet-generator new {\n"
- " name ip6-drop\n"
- " limit 50\n"
- " rate 0\n"
- " size 128-128\n"
- " interface loop0\n"
- " node adl-input\n"
- " data { IP6: 1.2.40 -> 3cfd.fed0.b6c8\n"
- " UDP: 2001:db01::3 -> 2001:db01::1\n"
- " UDP: 1234 -> 2345\n"
- " incrementing 80\n"
- " }\n"
- " }\n",
- "ip table 1\n",
- "ip route add 192.168.2.1/32 via drop\n",
- "ip route add table 1 192.168.1.2/32 via local\n",
- "ip6 table 1\n",
- "ip route add 2001:db01::1/128 via drop\n",
- "ip route add table 1 2001:db01::2/128 via local\n",
- "bin adl_interface_enable_disable loop0\n",
- "bin adl_allowlist_enable_disable loop0 fib-id 1 ip4 ip6\n",
- "pa en\n"]
+ """Plugin API Test"""
+ cmds = [
+ "loop create\n",
+ "set int ip address loop0 192.168.1.1/24\n",
+ "set int ip6 table loop0 0\n",
+ "set int ip address loop0 2001:db01::1/64\n",
+ "set int state loop0 up\n",
+ "packet-generator new {\n"
+ " name ip4\n"
+ " limit 100\n"
+ " rate 0\n"
+ " size 128-128\n"
+ " interface loop0\n"
+ " node adl-input\n"
+ " data { IP4: 1.2.40 -> 3cfd.fed0.b6c8\n"
+ " UDP: 192.168.1.2-192.168.1.10 -> 192.168.2.1\n"
+ " UDP: 1234 -> 2345\n"
+ " incrementing 114\n"
+ " }\n"
+ " }\n",
+ "packet-generator new {\n"
+ " name ip6-allow\n"
+ " limit 50\n"
+ " rate 0\n"
+ " size 128-128\n"
+ " interface loop0\n"
+ " node adl-input\n"
+ " data { IP6: 1.2.40 -> 3cfd.fed0.b6c8\n"
+ " UDP: 2001:db01::2 -> 2001:db01::1\n"
+ " UDP: 1234 -> 2345\n"
+ " incrementing 80\n"
+ " }\n"
+ " }\n",
+ "packet-generator new {\n"
+ " name ip6-drop\n"
+ " limit 50\n"
+ " rate 0\n"
+ " size 128-128\n"
+ " interface loop0\n"
+ " node adl-input\n"
+ " data { IP6: 1.2.40 -> 3cfd.fed0.b6c8\n"
+ " UDP: 2001:db01::3 -> 2001:db01::1\n"
+ " UDP: 1234 -> 2345\n"
+ " incrementing 80\n"
+ " }\n"
+ " }\n",
+ "ip table 1\n",
+ "ip route add 192.168.2.1/32 via drop\n",
+ "ip route add table 1 192.168.1.2/32 via local\n",
+ "ip6 table 1\n",
+ "ip route add 2001:db01::1/128 via drop\n",
+ "ip route add table 1 2001:db01::2/128 via local\n",
+ "bin adl_interface_enable_disable loop0\n",
+ "bin adl_allowlist_enable_disable loop0 fib-id 1 ip4 ip6\n",
+ "pa en\n",
+ ]
for cmd in cmds:
r = self.vapi.cli_return_response(cmd)
if r.retval != 0:
- if hasattr(r, 'reply'):
+ if hasattr(r, "reply"):
self.logger.info(cmd + " FAIL reply " + r.reply)
else:
self.logger.info(cmd + " FAIL retval " + str(r.retval))
total_pkts = self.statistics.get_err_counter(
- "/err/adl-input/Allow/Deny packets processed")
+ "/err/adl-input/Allow/Deny packets processed"
+ )
self.assertEqual(total_pkts, 200)
ip4_allow = self.statistics.get_err_counter(
- "/err/ip4-adl-allowlist/ip4 allowlist allowed")
+ "/err/ip4-adl-allowlist/ip4 allowlist allowed"
+ )
self.assertEqual(ip4_allow, 12)
ip6_allow = self.statistics.get_err_counter(
- "/err/ip6-adl-allowlist/ip6 allowlist allowed")
+ "/err/ip6-adl-allowlist/ip6 allowlist allowed"
+ )
self.assertEqual(ip6_allow, 50)
-if __name__ == '__main__':
+
+if __name__ == "__main__":
unittest.main(testRunner=VppTestRunner)