From 41c0cdd40e92258a2fd13dffaf20fa437ec224b9 Mon Sep 17 00:00:00 2001 From: pkazlenka Date: Wed, 1 Feb 2023 09:32:11 +0100 Subject: [PATCH] #4964: Add information about lacp connection status for lag ports tests * Changed model --- .../traffexam/kilda/traffexam/action.py | 3 ++- .../traffexam/kilda/traffexam/model.py | 18 +++++++++--------- .../traffexam/kilda/traffexam/rest.py | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src-python/lab-service/traffexam/kilda/traffexam/action.py b/src-python/lab-service/traffexam/kilda/traffexam/action.py index 2e5fa679210..78dbf48aedd 100644 --- a/src-python/lab-service/traffexam/kilda/traffexam/action.py +++ b/src-python/lab-service/traffexam/kilda/traffexam/action.py @@ -88,9 +88,10 @@ def _encode(self, entry): return Ether() / SlowProtocol() / lacp.LACP(actor_state=actor_state_binary) @staticmethod - def _bool_to_byte(self, boolean): + def _bool_to_byte(boolean): return b'1' if boolean else b'0' + class ARPPush(Abstract): dst_ipv4 = "8.8.8.9" eth_broadcast = "FF:FF:FF:FF:FF:FF" diff --git a/src-python/lab-service/traffexam/kilda/traffexam/model.py b/src-python/lab-service/traffexam/kilda/traffexam/model.py index c5f6875607d..7fe6d9cced6 100644 --- a/src-python/lab-service/traffexam/kilda/traffexam/model.py +++ b/src-python/lab-service/traffexam/kilda/traffexam/model.py @@ -361,16 +361,16 @@ def __init__(self, mac_address, port_number, chassis_id, ttl, **fields): class LACPPush(Abstract): - def __init__(self, payload, **fields): + def __init__(self, fields): super().__init__(**fields) - self.expired = payload.expired - self.defaulted = payload.defaulted - self.distributing = payload.distributing - self.collecting = payload.collecting - self.synchronization = payload.synchronization - self.aggregation = payload.aggregation - self.lacp_timeout = payload.lacp_timeout - self.lacp_activity = payload.lacp_activity + # self.expired = payload.expired + # self.defaulted = payload.defaulted + # self.distributing = payload.distributing + # self.collecting = payload.collecting + # self.synchronization = payload.synchronization + # self.aggregation = payload.aggregation + # self.lacp_timeout = payload.lacp_timeout + # self.lacp_activity = payload.lacp_activity class ARPPush(Abstract): diff --git a/src-python/lab-service/traffexam/kilda/traffexam/rest.py b/src-python/lab-service/traffexam/kilda/traffexam/rest.py index f5a19833242..827216df475 100644 --- a/src-python/lab-service/traffexam/kilda/traffexam/rest.py +++ b/src-python/lab-service/traffexam/kilda/traffexam/rest.py @@ -141,7 +141,7 @@ def address_emmit_lacp_packet(idnr): payload = {} try: - push_entry = model.LACPPush(payload, **{}) + push_entry = model.LACPPush(payload) get_context().action.lacp_push(address.iface, push_entry) except ValueError as e: return bottle.HTTPError(400, 'Invalid LACP payload - {}'.format(e))