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_dhcp.py b/test/vpp_dhcp.py
index f8265a2..eb07df2 100644
--- a/test/vpp_dhcp.py
+++ b/test/vpp_dhcp.py
@@ -2,7 +2,6 @@
class VppDHCPProxy(VppObject):
-
def __init__(
self,
test,
@@ -17,14 +16,9 @@
self._dhcp_server = dhcp_server
self._dhcp_src_address = dhcp_src_address
- def set_proxy(
- self,
- dhcp_server,
- dhcp_src_address,
- rx_vrf_id=0,
- server_vrf_id=0):
+ def set_proxy(self, dhcp_server, dhcp_src_address, rx_vrf_id=0, server_vrf_id=0):
if self.query_vpp_config():
- raise Exception('Vpp config present')
+ raise Exception("Vpp config present")
self._rx_vrf_id = rx_vrf_id
self._server_vrf_id = server_vrf_id
self._dhcp_server = dhcp_server
@@ -36,7 +30,8 @@
rx_vrf_id=self._rx_vrf_id,
server_vrf_id=self._server_vrf_id,
dhcp_server=self._dhcp_server,
- dhcp_src_address=self._dhcp_src_address)
+ dhcp_src_address=self._dhcp_src_address,
+ )
self._test.registry.register(self, self._test.logger)
def remove_vpp_config(self):
@@ -45,7 +40,8 @@
server_vrf_id=self._server_vrf_id,
dhcp_server=self._dhcp_server,
dhcp_src_address=self._dhcp_src_address,
- is_add=0)
+ is_add=0,
+ )
def get_vpp_dump(self):
dump = self._test.vapi.dhcp_proxy_dump()
@@ -62,17 +58,17 @@
class VppDHCPClient(VppObject):
-
def __init__(
- self,
- test,
- sw_if_index,
- hostname,
- id=None,
- want_dhcp_event=False,
- set_broadcast_flag=True,
- dscp=None,
- pid=None):
+ self,
+ test,
+ sw_if_index,
+ hostname,
+ id=None,
+ want_dhcp_event=False,
+ set_broadcast_flag=True,
+ dscp=None,
+ pid=None,
+ ):
self._test = test
self._sw_if_index = sw_if_index
self._hostname = hostname
@@ -83,16 +79,17 @@
self._pid = pid
def set_client(
- self,
- sw_if_index,
- hostname,
- id=None,
- want_dhcp_event=False,
- set_broadcast_flag=True,
- dscp=None,
- pid=None):
+ self,
+ sw_if_index,
+ hostname,
+ id=None,
+ want_dhcp_event=False,
+ set_broadcast_flag=True,
+ dscp=None,
+ pid=None,
+ ):
if self.query_vpp_config():
- raise Exception('Vpp config present')
+ raise Exception("Vpp config present")
self._sw_if_index = sw_if_index
self._hostname = hostname
self._id = id
@@ -102,19 +99,21 @@
self._pid = pid
def add_vpp_config(self):
- id = self._id.encode('ascii') if self._id else None
- client = {'sw_if_index': self._sw_if_index, 'hostname': self._hostname,
- 'id': id,
- 'want_dhcp_event': self._want_dhcp_event,
- 'set_broadcast_flag': self._set_broadcast_flag,
- 'dscp': self._dscp, 'pid': self._pid}
+ id = self._id.encode("ascii") if self._id else None
+ client = {
+ "sw_if_index": self._sw_if_index,
+ "hostname": self._hostname,
+ "id": id,
+ "want_dhcp_event": self._want_dhcp_event,
+ "set_broadcast_flag": self._set_broadcast_flag,
+ "dscp": self._dscp,
+ "pid": self._pid,
+ }
self._test.vapi.dhcp_client_config(is_add=1, client=client)
self._test.registry.register(self, self._test.logger)
def remove_vpp_config(self):
- client = client = {
- 'sw_if_index': self._sw_if_index,
- 'hostname': self._hostname}
+ client = client = {"sw_if_index": self._sw_if_index, "hostname": self._hostname}
self._test.vapi.dhcp_client_config(client=client, is_add=0)
def get_vpp_dump(self):