From d9b0c6fbf7aa5bd9af84264105b39c82028a4a29 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Tue, 26 Apr 2022 19:02:15 +0200 Subject: 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 Signed-off-by: Dave Wallace --- test/vpp_ikev2.py | 172 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 89 insertions(+), 83 deletions(-) (limited to 'test/vpp_ikev2.py') diff --git a/test/vpp_ikev2.py b/test/vpp_ikev2.py index de2081268ee..b9a6d8c2f7d 100644 --- a/test/vpp_ikev2.py +++ b/test/vpp_ikev2.py @@ -4,24 +4,24 @@ from vpp_papi import VppEnum class AuthMethod: - v = {'rsa-sig': 1, - 'shared-key': 2} + v = {"rsa-sig": 1, "shared-key": 2} @staticmethod - def value(key): return AuthMethod.v[key] + def value(key): + return AuthMethod.v[key] class IDType: - v = {'ip4-addr': 1, - 'fqdn': 2, - 'ip6-addr': 5} + v = {"ip4-addr": 1, "fqdn": 2, "ip6-addr": 5} @staticmethod - def value(key): return IDType.v[key] + def value(key): + return IDType.v[key] class Profile(VppObject): - """ IKEv2 profile """ + """IKEv2 profile""" + def __init__(self, test, profile_name): self.test = test self.vapi = test.vapi @@ -38,49 +38,49 @@ class Profile(VppObject): elif isinstance(method, str): m = AuthMethod.value(method) else: - raise Exception('unsupported type {}'.format(method)) - self.auth = {'auth_method': m, - 'data': data, - 'is_hex': is_hex} + raise Exception("unsupported type {}".format(method)) + self.auth = {"auth_method": m, "data": data, "is_hex": is_hex} def add_local_id(self, id_type, data): if isinstance(id_type, str): t = IDType.value(id_type) - self.local_id = {'id_type': t, - 'data': data, - 'is_local': True} + self.local_id = {"id_type": t, "data": data, "is_local": True} def add_remote_id(self, id_type, data): if isinstance(id_type, str): t = IDType.value(id_type) - self.remote_id = {'id_type': t, - 'data': data, - 'is_local': False} + self.remote_id = {"id_type": t, "data": data, "is_local": False} - def add_local_ts(self, start_addr, end_addr, start_port=0, end_port=0xffff, - proto=0, is_ip4=True): + def add_local_ts( + self, start_addr, end_addr, start_port=0, end_port=0xFFFF, proto=0, is_ip4=True + ): self.ts_is_ip4 = is_ip4 - self.local_ts = {'is_local': True, - 'protocol_id': proto, - 'start_port': start_port, - 'end_port': end_port, - 'start_addr': start_addr, - 'end_addr': end_addr} - - def add_remote_ts(self, start_addr, end_addr, start_port=0, - end_port=0xffff, proto=0): + self.local_ts = { + "is_local": True, + "protocol_id": proto, + "start_port": start_port, + "end_port": end_port, + "start_addr": start_addr, + "end_addr": end_addr, + } + + def add_remote_ts( + self, start_addr, end_addr, start_port=0, end_port=0xFFFF, proto=0 + ): try: IPv4Address(start_addr) is_ip4 = True except AddressValueError: is_ip4 = False self.ts_is_ip4 = is_ip4 - self.remote_ts = {'is_local': False, - 'protocol_id': proto, - 'start_port': start_port, - 'end_port': end_port, - 'start_addr': start_addr, - 'end_addr': end_addr} + self.remote_ts = { + "is_local": False, + "protocol_id": proto, + "start_port": start_port, + "end_port": end_port, + "start_addr": start_addr, + "end_addr": end_addr, + } def add_responder_hostname(self, hn): self.responder_hostname = hn @@ -101,72 +101,78 @@ class Profile(VppObject): self.lifetime_data = data def set_ipsec_over_udp_port(self, port): - self.ipsec_udp_port = {'is_set': 1, - 'port': port} + self.ipsec_udp_port = {"is_set": 1, "port": port} def set_tunnel_interface(self, sw_if_index): self.tun_itf = sw_if_index def object_id(self): - return 'ikev2-profile-%s' % self.profile_name + return "ikev2-profile-%s" % self.profile_name def remove_vpp_config(self): self.vapi.ikev2_profile_add_del(name=self.profile_name, is_add=False) def add_vpp_config(self): self.vapi.ikev2_profile_add_del(name=self.profile_name, is_add=True) - if hasattr(self, 'auth'): - self.vapi.ikev2_profile_set_auth(name=self.profile_name, - data_len=len(self.auth['data']), - **self.auth) - if hasattr(self, 'local_id'): - self.vapi.ikev2_profile_set_id(name=self.profile_name, - data_len=len(self.local_id - ['data']), - **self.local_id) - if hasattr(self, 'remote_id'): - self.vapi.ikev2_profile_set_id(name=self.profile_name, - data_len=len(self.remote_id - ['data']), - **self.remote_id) - if hasattr(self, 'local_ts'): - self.vapi.ikev2_profile_set_ts(name=self.profile_name, - ts=self.local_ts) - - if hasattr(self, 'remote_ts'): - self.vapi.ikev2_profile_set_ts(name=self.profile_name, - ts=self.remote_ts) - - if hasattr(self, 'responder'): - self.vapi.ikev2_set_responder(name=self.profile_name, - responder=self.responder) - - if hasattr(self, 'responder_hostname'): + if hasattr(self, "auth"): + self.vapi.ikev2_profile_set_auth( + name=self.profile_name, data_len=len(self.auth["data"]), **self.auth + ) + if hasattr(self, "local_id"): + self.vapi.ikev2_profile_set_id( + name=self.profile_name, + data_len=len(self.local_id["data"]), + **self.local_id, + ) + if hasattr(self, "remote_id"): + self.vapi.ikev2_profile_set_id( + name=self.profile_name, + data_len=len(self.remote_id["data"]), + **self.remote_id, + ) + if hasattr(self, "local_ts"): + self.vapi.ikev2_profile_set_ts(name=self.profile_name, ts=self.local_ts) + + if hasattr(self, "remote_ts"): + self.vapi.ikev2_profile_set_ts(name=self.profile_name, ts=self.remote_ts) + + if hasattr(self, "responder"): + self.vapi.ikev2_set_responder( + name=self.profile_name, responder=self.responder + ) + + if hasattr(self, "responder_hostname"): print(self.responder_hostname) - self.vapi.ikev2_set_responder_hostname(name=self.profile_name, - **self.responder_hostname) + self.vapi.ikev2_set_responder_hostname( + name=self.profile_name, **self.responder_hostname + ) - if hasattr(self, 'ike_transforms'): - self.vapi.ikev2_set_ike_transforms(name=self.profile_name, - tr=self.ike_transforms) + if hasattr(self, "ike_transforms"): + self.vapi.ikev2_set_ike_transforms( + name=self.profile_name, tr=self.ike_transforms + ) - if hasattr(self, 'esp_transforms'): - self.vapi.ikev2_set_esp_transforms(name=self.profile_name, - tr=self.esp_transforms) + if hasattr(self, "esp_transforms"): + self.vapi.ikev2_set_esp_transforms( + name=self.profile_name, tr=self.esp_transforms + ) if self.udp_encap: self.vapi.ikev2_profile_set_udp_encap(name=self.profile_name) - if hasattr(self, 'lifetime_data'): - self.vapi.ikev2_set_sa_lifetime(name=self.profile_name, - **self.lifetime_data) - - if hasattr(self, 'ipsec_udp_port'): - self.vapi.ikev2_profile_set_ipsec_udp_port(name=self.profile_name, - **self.ipsec_udp_port) - if hasattr(self, 'tun_itf'): - self.vapi.ikev2_set_tunnel_interface(name=self.profile_name, - sw_if_index=self.tun_itf) + if hasattr(self, "lifetime_data"): + self.vapi.ikev2_set_sa_lifetime( + name=self.profile_name, **self.lifetime_data + ) + + if hasattr(self, "ipsec_udp_port"): + self.vapi.ikev2_profile_set_ipsec_udp_port( + name=self.profile_name, **self.ipsec_udp_port + ) + if hasattr(self, "tun_itf"): + self.vapi.ikev2_set_tunnel_interface( + name=self.profile_name, sw_if_index=self.tun_itf + ) if not self.natt: self.vapi.ikev2_profile_disable_natt(name=self.profile_name) -- cgit 1.2.3-korg