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>
diff --git a/test/vpp_l2.py b/test/vpp_l2.py
index 7307d28..872f428 100644
--- a/test/vpp_l2.py
+++ b/test/vpp_l2.py
@@ -7,6 +7,7 @@
from vpp_lo_interface import VppLoInterface
from vpp_papi import MACAddress
from vpp_sub_interface import L2_VTR_OP
+
try:
text_type = unicode
except NameError:
@@ -47,8 +48,7 @@
arps = test.vapi.bd_ip_mac_dump(bd_id)
for arp in arps:
# do IP addr comparison too once .api is fixed...
- if mac == str(arp.entry.mac) and \
- ip == str(arp.entry.ip):
+ if mac == str(arp.entry.mac) and ip == str(arp.entry.ip):
return True
return False
@@ -63,10 +63,17 @@
class VppBridgeDomain(VppObject):
-
- def __init__(self, test, bd_id,
- flood=1, uu_flood=1, forward=1,
- learn=1, arp_term=1, arp_ufwd=0):
+ def __init__(
+ self,
+ test,
+ bd_id,
+ flood=1,
+ uu_flood=1,
+ forward=1,
+ learn=1,
+ arp_term=1,
+ arp_ufwd=0,
+ ):
self._test = test
self.bd_id = bd_id
self.flood = flood
@@ -77,14 +84,16 @@
self.arp_ufwd = arp_ufwd
def add_vpp_config(self):
- self._test.vapi.bridge_domain_add_del(bd_id=self.bd_id,
- flood=self.flood,
- uu_flood=self.uu_flood,
- forward=self.forward,
- learn=self.learn,
- arp_term=self.arp_term,
- arp_ufwd=self.arp_ufwd,
- is_add=1)
+ self._test.vapi.bridge_domain_add_del(
+ bd_id=self.bd_id,
+ flood=self.flood,
+ uu_flood=self.uu_flood,
+ forward=self.forward,
+ learn=self.learn,
+ arp_term=self.arp_term,
+ arp_ufwd=self.arp_ufwd,
+ is_add=1,
+ )
self._test.registry.register(self, self._test.logger)
return self
@@ -99,9 +108,7 @@
class VppBridgeDomainPort(VppObject):
-
- def __init__(self, test, bd, itf,
- port_type=L2_PORT_TYPE.NORMAL):
+ def __init__(self, test, bd, itf, port_type=L2_PORT_TYPE.NORMAL):
self._test = test
self.bd = bd
self.itf = itf
@@ -109,27 +116,30 @@
def add_vpp_config(self):
self._test.vapi.sw_interface_set_l2_bridge(
- rx_sw_if_index=self.itf.sw_if_index, bd_id=self.bd.bd_id,
- port_type=self.port_type, enable=1)
+ rx_sw_if_index=self.itf.sw_if_index,
+ bd_id=self.bd.bd_id,
+ port_type=self.port_type,
+ enable=1,
+ )
self._test.registry.register(self, self._test.logger)
return self
def remove_vpp_config(self):
self._test.vapi.sw_interface_set_l2_bridge(
- rx_sw_if_index=self.itf.sw_if_index, bd_id=self.bd.bd_id,
- port_type=self.port_type, enable=0)
+ rx_sw_if_index=self.itf.sw_if_index,
+ bd_id=self.bd.bd_id,
+ port_type=self.port_type,
+ enable=0,
+ )
def query_vpp_config(self):
- return find_bridge_domain_port(self._test,
- self.bd.bd_id,
- self.itf.sw_if_index)
+ return find_bridge_domain_port(self._test, self.bd.bd_id, self.itf.sw_if_index)
def object_id(self):
return "BD-Port-%s-%s" % (self.bd, self.itf)
class VppBridgeDomainArpEntry(VppObject):
-
def __init__(self, test, bd, mac, ip):
self._test = test
self.bd = bd
@@ -137,35 +147,28 @@
self.ip = ip
def add_vpp_config(self):
- self._test.vapi.bd_ip_mac_add_del(is_add=1,
- entry={
- 'bd_id': self.bd.bd_id,
- 'ip': self.ip,
- 'mac': self.mac})
+ self._test.vapi.bd_ip_mac_add_del(
+ is_add=1, entry={"bd_id": self.bd.bd_id, "ip": self.ip, "mac": self.mac}
+ )
self._test.registry.register(self, self._test.logger)
return self
def remove_vpp_config(self):
- self._test.vapi.bd_ip_mac_add_del(is_add=0,
- entry={
- 'bd_id': self.bd.bd_id,
- 'ip': self.ip,
- 'mac': self.mac})
+ self._test.vapi.bd_ip_mac_add_del(
+ is_add=0, entry={"bd_id": self.bd.bd_id, "ip": self.ip, "mac": self.mac}
+ )
def query_vpp_config(self):
- return find_bridge_domain_arp_entry(self._test,
- self.bd.bd_id,
- self.mac,
- self.ip)
+ return find_bridge_domain_arp_entry(
+ self._test, self.bd.bd_id, self.mac, self.ip
+ )
def object_id(self):
return "BD-Arp-Entry-%s-%s-%s" % (self.bd, self.mac, self.ip)
class VppL2FibEntry(VppObject):
-
- def __init__(self, test, bd, mac, itf,
- static_mac=0, filter_mac=0, bvi_mac=-1):
+ def __init__(self, test, bd, mac, itf, static_mac=0, filter_mac=0, bvi_mac=-1):
self._test = test
self.bd = bd
self.mac = MACAddress(mac)
@@ -185,29 +188,26 @@
is_add=1,
static_mac=self.static_mac,
filter_mac=self.filter_mac,
- bvi_mac=self.bvi_mac)
+ bvi_mac=self.bvi_mac,
+ )
self._test.registry.register(self, self._test.logger)
return self
def remove_vpp_config(self):
self._test.vapi.l2fib_add_del(
- self.mac.packed,
- self.bd.bd_id,
- self.itf.sw_if_index,
- is_add=0)
+ self.mac.packed, self.bd.bd_id, self.itf.sw_if_index, is_add=0
+ )
def query_vpp_config(self):
- return find_l2_fib_entry(self._test,
- self.bd.bd_id,
- self.mac.packed,
- self.itf.sw_if_index)
+ return find_l2_fib_entry(
+ self._test, self.bd.bd_id, self.mac.packed, self.itf.sw_if_index
+ )
def object_id(self):
return "L2-Fib-Entry-%s-%s-%s" % (self.bd, self.mac, self.itf)
class VppL2Vtr(VppObject):
-
def __init__(self, test, itf, op):
self._test = test
self.itf = itf
@@ -226,7 +226,7 @@
d = self.itf.get_interface_config_from_dump(ds)
if d is not None:
- return (d.vtr_op == self.op)
+ return d.vtr_op == self.op
return False
def object_id(self):