diff options
author | Klement Sekera <klement.sekera@gmail.com> | 2022-04-26 19:02:15 +0200 |
---|---|---|
committer | Ole Tr�an <otroan@employees.org> | 2022-05-10 18:52:08 +0000 |
commit | d9b0c6fbf7aa5bd9af84264105b39c82028a4a29 (patch) | |
tree | 4f786cfd8ebc2443cb11e11b74c8657204068898 /test/test_srv6_un.py | |
parent | f90348bcb4afd0af2611cefc43b17ef3042b511c (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_srv6_un.py')
-rw-r--r-- | test/test_srv6_un.py | 116 |
1 files changed, 56 insertions, 60 deletions
diff --git a/test/test_srv6_un.py b/test/test_srv6_un.py index 73285bbac87..22a3c486584 100644 --- a/test/test_srv6_un.py +++ b/test/test_srv6_un.py @@ -8,7 +8,7 @@ from scapy.all import * class TestSRv6uSIDSRH(VppTestCase): - """ SRv6 End.uSID w/ SRH """ + """SRv6 End.uSID w/ SRH""" @classmethod def setUpClass(cls): @@ -45,30 +45,30 @@ class TestSRv6uSIDSRH(VppTestCase): pkts = list() for d, s in inner: - pkt = (Ether() / - IPv6(dst=str(ip6_dst), src=str(ip6_src)) / - IPv6ExtHdrSegmentRouting(segleft=1, - lastentry=0, - tag=0, - addresses=[ - "a1::1", - "1111:2222:aaaa:bbbb::"]) / - IPv6(dst=d, src=s) / - UDP(sport=1000, dport=23)) + pkt = ( + Ether() + / IPv6(dst=str(ip6_dst), src=str(ip6_src)) + / IPv6ExtHdrSegmentRouting( + segleft=1, + lastentry=0, + tag=0, + addresses=["a1::1", "1111:2222:aaaa:bbbb::"], + ) + / IPv6(dst=d, src=s) + / UDP(sport=1000, dport=23) + ) self.logger.info(pkt.show2(dump=True)) pkts.append(pkt) return pkts def test_srv6_usid_srh(self): - """ test_srv6_usid_srh """ + """test_srv6_usid_srh""" pkts = self.create_packets([("A::1", "B::1"), ("C::1", "D::1")]) self.vapi.cli("set sr encaps source addr A1::1") - self.vapi.cli( - "sr localsid prefix 1111:2222:aaaa::/48 behavior un 16") - self.vapi.cli( - "ip route add 1111:2222:bbbb::/48 via {}".format(self.ip6_nhop)) + self.vapi.cli("sr localsid prefix 1111:2222:aaaa::/48 behavior un 16") + self.vapi.cli("ip route add 1111:2222:bbbb::/48 via {}".format(self.ip6_nhop)) self.logger.info(self.vapi.cli("show sr localsids")) @@ -85,12 +85,11 @@ class TestSRv6uSIDSRH(VppTestCase): for pkt in capture: self.logger.info(pkt.show2(dump=True)) - self.assertEqual( - pkt[IPv6].dst, "1111:2222:bbbb:cccc:dddd:eeee:ffff:0") + self.assertEqual(pkt[IPv6].dst, "1111:2222:bbbb:cccc:dddd:eeee:ffff:0") class TestSRv6uSID(VppTestCase): - """ SRv6 End.uSID w/o SRH """ + """SRv6 End.uSID w/o SRH""" @classmethod def setUpClass(cls): @@ -127,24 +126,24 @@ class TestSRv6uSID(VppTestCase): pkts = list() for d, s in inner: - pkt = (Ether() / - IPv6(dst=str(ip6_dst), src=str(ip6_src)) / - IPv6(dst=d, src=s) / - UDP(sport=1000, dport=23)) + pkt = ( + Ether() + / IPv6(dst=str(ip6_dst), src=str(ip6_src)) + / IPv6(dst=d, src=s) + / UDP(sport=1000, dport=23) + ) self.logger.info(pkt.show2(dump=True)) pkts.append(pkt) return pkts def test_srv6_usid(self): - """ test_srv6_usid """ + """test_srv6_usid""" pkts = self.create_packets([("A::1", "B::1"), ("C::1", "D::1")]) self.vapi.cli("set sr encaps source addr A1::1") - self.vapi.cli( - "sr localsid prefix 1111:2222:aaaa::/48 behavior un 16") - self.vapi.cli( - "ip route add 1111:2222:bbbb::/48 via {}".format(self.ip6_nhop)) + self.vapi.cli("sr localsid prefix 1111:2222:aaaa::/48 behavior un 16") + self.vapi.cli("ip route add 1111:2222:bbbb::/48 via {}".format(self.ip6_nhop)) self.logger.info(self.vapi.cli("show sr localsids")) @@ -161,12 +160,11 @@ class TestSRv6uSID(VppTestCase): for pkt in capture: self.logger.info(pkt.show2(dump=True)) - self.assertEqual( - pkt[IPv6].dst, "1111:2222:bbbb:cccc:dddd:eeee:ffff:0") + self.assertEqual(pkt[IPv6].dst, "1111:2222:bbbb:cccc:dddd:eeee:ffff:0") class TestSRv6uSIDFlexSRH(VppTestCase): - """ SRv6 End.uSID.Flex w/ SRH """ + """SRv6 End.uSID.Flex w/ SRH""" @classmethod def setUpClass(cls): @@ -203,30 +201,30 @@ class TestSRv6uSIDFlexSRH(VppTestCase): pkts = list() for d, s in inner: - pkt = (Ether() / - IPv6(dst=str(ip6_dst), src=str(ip6_src)) / - IPv6ExtHdrSegmentRouting(segleft=1, - lastentry=0, - tag=0, - addresses=[ - "a1::1", - "1111:2222:aaaa:bbbb::"]) / - IPv6(dst=d, src=s) / - UDP(sport=1000, dport=23)) + pkt = ( + Ether() + / IPv6(dst=str(ip6_dst), src=str(ip6_src)) + / IPv6ExtHdrSegmentRouting( + segleft=1, + lastentry=0, + tag=0, + addresses=["a1::1", "1111:2222:aaaa:bbbb::"], + ) + / IPv6(dst=d, src=s) + / UDP(sport=1000, dport=23) + ) self.logger.info(pkt.show2(dump=True)) pkts.append(pkt) return pkts def test_srv6_usid_flex_srh(self): - """ test_srv6_usid_flex_srh """ + """test_srv6_usid_flex_srh""" pkts = self.create_packets([("A::1", "B::1"), ("C::1", "D::1")]) self.vapi.cli("set sr encaps source addr A1::1") - self.vapi.cli( - "sr localsid prefix 1111:2222:aaaa::/48 behavior un.flex 16") - self.vapi.cli( - "ip route add 1111:2222:bbbb::/48 via {}".format(self.ip6_nhop)) + self.vapi.cli("sr localsid prefix 1111:2222:aaaa::/48 behavior un.flex 16") + self.vapi.cli("ip route add 1111:2222:bbbb::/48 via {}".format(self.ip6_nhop)) self.logger.info(self.vapi.cli("show sr localsids")) @@ -243,12 +241,11 @@ class TestSRv6uSIDFlexSRH(VppTestCase): for pkt in capture: self.logger.info(pkt.show2(dump=True)) - self.assertEqual( - pkt[IPv6].dst, "1111:2222:bbbb:cccc:dddd:eeee:ffff:0") + self.assertEqual(pkt[IPv6].dst, "1111:2222:bbbb:cccc:dddd:eeee:ffff:0") class TestSRv6uSIDFlex(VppTestCase): - """ SRv6 End.uSID.Flex w/o SRH """ + """SRv6 End.uSID.Flex w/o SRH""" @classmethod def setUpClass(cls): @@ -285,24 +282,24 @@ class TestSRv6uSIDFlex(VppTestCase): pkts = list() for d, s in inner: - pkt = (Ether() / - IPv6(dst=str(ip6_dst), src=str(ip6_src)) / - IPv6(dst=d, src=s) / - UDP(sport=1000, dport=23)) + pkt = ( + Ether() + / IPv6(dst=str(ip6_dst), src=str(ip6_src)) + / IPv6(dst=d, src=s) + / UDP(sport=1000, dport=23) + ) self.logger.info(pkt.show2(dump=True)) pkts.append(pkt) return pkts def test_srv6_usid_flex(self): - """ test_srv6_usid_flex """ + """test_srv6_usid_flex""" pkts = self.create_packets([("A::1", "B::1"), ("C::1", "D::1")]) self.vapi.cli("set sr encaps source addr A1::1") - self.vapi.cli( - "sr localsid prefix 1111:2222:aaaa::/48 behavior un.flex 16") - self.vapi.cli( - "ip route add 1111:2222:bbbb::/48 via {}".format(self.ip6_nhop)) + self.vapi.cli("sr localsid prefix 1111:2222:aaaa::/48 behavior un.flex 16") + self.vapi.cli("ip route add 1111:2222:bbbb::/48 via {}".format(self.ip6_nhop)) self.logger.info(self.vapi.cli("show sr localsids")) @@ -319,5 +316,4 @@ class TestSRv6uSIDFlex(VppTestCase): for pkt in capture: self.logger.info(pkt.show2(dump=True)) - self.assertEqual( - pkt[IPv6].dst, "1111:2222:bbbb:cccc:dddd:eeee:ffff:0") + self.assertEqual(pkt[IPv6].dst, "1111:2222:bbbb:cccc:dddd:eeee:ffff:0") |