From 548c17d304167af5e3a81308ff26e70ac83d93f3 Mon Sep 17 00:00:00 2001 From: Zhijian Li Date: Mon, 21 Oct 2024 10:18:53 +0000 Subject: [PATCH 1/3] [MGFX] Fix transceiver checker function for MGFX DUT --- tests/common/platform/device_utils.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/common/platform/device_utils.py b/tests/common/platform/device_utils.py index 510bf6b43d..b56d581109 100644 --- a/tests/common/platform/device_utils.py +++ b/tests/common/platform/device_utils.py @@ -36,6 +36,9 @@ "armhf-nokia_ixs7215_52x-r0" ] +MGFX_HWSKU = ["Arista-720DT-G48S4", "Nokia-7215", "Nokia-M0-7215", "Celestica-E1031-T48S4"] +MGFX_XCVR_INTF = ['Ethernet48', 'Ethernet49', 'Ethernet50', 'Ethernet51'] + TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "templates") FMT = "%b %d %H:%M:%S.%f" @@ -294,6 +297,8 @@ def check_interfaces_and_transceivers(duthost, request): xcvr_info = duthost.command("redis-cli -n 6 keys TRANSCEIVER_INFO*") parsed_xcvr_info = parse_transceiver_info(xcvr_info["stdout_lines"]) interfaces = conn_graph_facts["device_conn"][duthost.hostname] + if duthost.facts['hwsku'] in MGFX_HWSKU: + interfaces = MGFX_XCVR_INTF for intf in interfaces: if intf not in parsed_xcvr_info: raise RebootHealthError( From a33f512e8cabab570ca06d086c7616a134bd5b9c Mon Sep 17 00:00:00 2001 From: Zhijian Li Date: Tue, 22 Oct 2024 02:02:43 +0000 Subject: [PATCH 2/3] trigger pr test --- tests/common/platform/device_utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/common/platform/device_utils.py b/tests/common/platform/device_utils.py index b56d581109..d40d6e55aa 100644 --- a/tests/common/platform/device_utils.py +++ b/tests/common/platform/device_utils.py @@ -25,6 +25,9 @@ logger = logging.getLogger(__name__) +MGFX_HWSKU = ["Arista-720DT-G48S4", "Nokia-7215", "Nokia-M0-7215", "Celestica-E1031-T48S4"] +MGFX_XCVR_INTF = ['Ethernet48', 'Ethernet49', 'Ethernet50', 'Ethernet51'] + LOGS_ON_TMPFS_PLATFORMS = [ "x86_64-arista_7050_qx32", "x86_64-arista_7050_qx32s", @@ -36,9 +39,6 @@ "armhf-nokia_ixs7215_52x-r0" ] -MGFX_HWSKU = ["Arista-720DT-G48S4", "Nokia-7215", "Nokia-M0-7215", "Celestica-E1031-T48S4"] -MGFX_XCVR_INTF = ['Ethernet48', 'Ethernet49', 'Ethernet50', 'Ethernet51'] - TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "templates") FMT = "%b %d %H:%M:%S.%f" From 21902451ebf992f7079c51b3a98f8b8f4eb406c6 Mon Sep 17 00:00:00 2001 From: Zhijian Li Date: Tue, 22 Oct 2024 02:32:47 +0000 Subject: [PATCH 3/3] trigger pr test --- tests/common/platform/device_utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/common/platform/device_utils.py b/tests/common/platform/device_utils.py index d40d6e55aa..b56d581109 100644 --- a/tests/common/platform/device_utils.py +++ b/tests/common/platform/device_utils.py @@ -25,9 +25,6 @@ logger = logging.getLogger(__name__) -MGFX_HWSKU = ["Arista-720DT-G48S4", "Nokia-7215", "Nokia-M0-7215", "Celestica-E1031-T48S4"] -MGFX_XCVR_INTF = ['Ethernet48', 'Ethernet49', 'Ethernet50', 'Ethernet51'] - LOGS_ON_TMPFS_PLATFORMS = [ "x86_64-arista_7050_qx32", "x86_64-arista_7050_qx32s", @@ -39,6 +36,9 @@ "armhf-nokia_ixs7215_52x-r0" ] +MGFX_HWSKU = ["Arista-720DT-G48S4", "Nokia-7215", "Nokia-M0-7215", "Celestica-E1031-T48S4"] +MGFX_XCVR_INTF = ['Ethernet48', 'Ethernet49', 'Ethernet50', 'Ethernet51'] + TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "templates") FMT = "%b %d %H:%M:%S.%f"