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/vpp_policer.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/vpp_policer.py')
-rw-r--r-- | test/vpp_policer.py | 71 |
1 files changed, 45 insertions, 26 deletions
diff --git a/test/vpp_policer.py b/test/vpp_policer.py index 0f3b073d6e3..b0097b370e5 100644 --- a/test/vpp_policer.py +++ b/test/vpp_policer.py @@ -8,25 +8,36 @@ class Dir(Enum): TX = 1 -class PolicerAction(): - """ sse2 qos action """ +class PolicerAction: + """sse2 qos action""" def __init__(self, type, dscp): self.type = type self.dscp = dscp def encode(self): - return {'type': self.type, 'dscp': self.dscp} + return {"type": self.type, "dscp": self.dscp} class VppPolicer(VppObject): - """ Policer """ - - def __init__(self, test, name, cir, eir, commited_burst, excess_burst, - rate_type=0, round_type=0, type=0, color_aware=False, - conform_action=PolicerAction(1, 0), - exceed_action=PolicerAction(0, 0), - violate_action=PolicerAction(0, 0)): + """Policer""" + + def __init__( + self, + test, + name, + cir, + eir, + commited_burst, + excess_burst, + rate_type=0, + round_type=0, + type=0, + color_aware=False, + conform_action=PolicerAction(1, 0), + exceed_action=PolicerAction(0, 0), + violate_action=PolicerAction(0, 0), + ): self._test = test self.name = name self.cir = cir @@ -48,13 +59,19 @@ class VppPolicer(VppObject): def add_vpp_config(self): r = self._test.vapi.policer_add_del( - name=self.name, cir=self.cir, - eir=self.eir, cb=self.commited_burst, eb=self.excess_burst, - rate_type=self.rate_type, round_type=self.round_type, - type=self.type, color_aware=self.color_aware, + name=self.name, + cir=self.cir, + eir=self.eir, + cb=self.commited_burst, + eb=self.excess_burst, + rate_type=self.rate_type, + round_type=self.round_type, + type=self.type, + color_aware=self.color_aware, conform_action=self.conform_action.encode(), exceed_action=self.exceed_action.encode(), - violate_action=self.violate_action.encode()) + violate_action=self.violate_action.encode(), + ) self._test.registry.register(self, self._test.logger) self._policer_index = r.policer_index return self @@ -64,27 +81,29 @@ class VppPolicer(VppObject): self._policer_index = INVALID_INDEX def bind_vpp_config(self, worker, bind): - self._test.vapi.policer_bind(name=self.name, worker_index=worker, - bind_enable=bind) + self._test.vapi.policer_bind( + name=self.name, worker_index=worker, bind_enable=bind + ) def apply_vpp_config(self, if_index, dir: Dir, apply): if dir == Dir.RX: self._test.vapi.policer_input( - name=self.name, sw_if_index=if_index, apply=apply) + name=self.name, sw_if_index=if_index, apply=apply + ) else: self._test.vapi.policer_output( - name=self.name, sw_if_index=if_index, apply=apply) + name=self.name, sw_if_index=if_index, apply=apply + ) def query_vpp_config(self): - dump = self._test.vapi.policer_dump( - match_name_valid=True, match_name=self.name) + dump = self._test.vapi.policer_dump(match_name_valid=True, match_name=self.name) for policer in dump: if policer.name == self.name: return True return False def object_id(self): - return ("policer-%s" % (self.name)) + return "policer-%s" % (self.name) def get_stats(self, worker=None): conform = self._test.statistics.get_counter("/net/policer/conform") @@ -95,14 +114,14 @@ class VppPolicer(VppObject): total = {} for name, c in counters.items(): - total[f'{name}_packets'] = 0 - total[f'{name}_bytes'] = 0 + total[f"{name}_packets"] = 0 + total[f"{name}_bytes"] = 0 for i in range(len(c)): t = c[i] if worker is not None and i != worker + 1: continue stat_index = self._policer_index - total[f'{name}_packets'] += t[stat_index]['packets'] - total[f'{name}_bytes'] += t[stat_index]['bytes'] + total[f"{name}_packets"] += t[stat_index]["packets"] + total[f"{name}_bytes"] += t[stat_index]["bytes"] return total |