Skip to content

[psu] share the PSU line pattern across tests #3447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yxieca merged 2 commits into from
May 6, 2021
Merged

[psu] share the PSU line pattern across tests #3447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7220ad
[psu] share the PSU line pattern across tests
yxieca May 5, 2021
9373b6f
Fix LGTM warning
yxieca May 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions tests/common/platform/device_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,23 @@ def fanout_switch_port_lookup(fanout_switches, dut_name, dut_port):
return fanout, fanout.host_to_fanout_port_map[dut_host_port]

return None, None


def get_dut_psu_line_pattern(dut):
if "201811" in dut.os_version or "201911" in dut.os_version:
psu_line_pattern = re.compile(r"PSU\s+(\d)+\s+(OK|NOT OK|NOT PRESENT)")
else:
"""
Changed the pattern to match space (s+) and non-space (S+) only.
w+ cannot match following examples properly:

example 1:
PSU 1 PWR-500AC-R L8180S01HTAVP N/A N/A N/A OK green
PSU 2 PWR-500AC-R L8180S01HFAVP N/A N/A N/A OK green
example 2:
PSU 1 N/A N/A 12.05 3.38 40.62 OK green
PSU 2 N/A N/A 12.01 4.12 49.50 OK green

"""
psu_line_pattern = re.compile(r"PSU\s+(\d+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+\s+(OK|NOT OK|NOT PRESENT)\s+(green|amber|red|off)")
return psu_line_pattern
8 changes: 3 additions & 5 deletions tests/platform_tests/cli/test_show_platform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from pkg_resources import parse_version
from tests.common.helpers.assertions import pytest_assert
from tests.common.platform.daemon_utils import check_pmon_daemon_status
from tests.common.platform.device_utils import get_dut_psu_line_pattern
from tests.common.utilities import get_inventory_files, get_host_visible_vars

pytestmark = [
Expand Down Expand Up @@ -176,18 +177,15 @@ def test_show_platform_psustatus(duthosts, enum_supervisor_dut_hostname):
logging.info("Verifying output of '{}' on '{}' ...".format(cmd, duthost.hostname))
psu_status_output_lines = duthost.command(cmd)["stdout_lines"]

if "201811" in duthost.os_version or "201911" in duthost.os_version:
psu_line_pattern = re.compile(r"PSU\s+\d+\s+(OK|NOT OK|NOT PRESENT)")
else:
psu_line_pattern = re.compile(r"PSU\s+\d+\s+\w+\s+\w+\s+\w+\s+\w+\s+\w+\s+(OK|NOT OK|NOT PRESENT)\s+(green|amber|red|off)")
psu_line_pattern = get_dut_psu_line_pattern(duthost)

# Check that all PSUs are showing valid status and also at least one PSU is OK
num_psu_ok = 0

for line in psu_status_output_lines[2:]:
psu_match = psu_line_pattern.match(line)
pytest_assert(psu_match, "Unexpected PSU status output: '{}' on '{}'".format(line, duthost.hostname))
psu_status = psu_match.group(1)
psu_status = psu_match.group(2)
if psu_status == "OK":
num_psu_ok += 1

Expand Down
22 changes: 1 addition & 21 deletions tests/platform_tests/test_platform_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
"""
import json
import logging
import re
import time

import pytest

from tests.common.helpers.assertions import pytest_assert, pytest_require
from tests.common.plugins.loganalyzer.loganalyzer import LogAnalyzer, LogAnalyzerError
from tests.common.utilities import wait_until
from tests.common.platform.device_utils import get_dut_psu_line_pattern
from thermal_control_test_helper import *

pytestmark = [
Expand Down Expand Up @@ -140,26 +140,6 @@ def get_psu_num(dut):
return psu_num


def get_dut_psu_line_pattern(dut):
if "201811" in dut.os_version or "201911" in dut.os_version:
psu_line_pattern = re.compile(r"PSU\s+(\d)+\s+(OK|NOT OK|NOT PRESENT)")
else:
"""
Changed the pattern to match space (s+) and non-space (S+) only.
w+ cannot match following examples properly:

example 1:
PSU 1 PWR-500AC-R L8180S01HTAVP N/A N/A N/A OK green
PSU 2 PWR-500AC-R L8180S01HFAVP N/A N/A N/A OK green
example 2:
PSU 1 N/A N/A 12.05 3.38 40.62 OK green
PSU 2 N/A N/A 12.01 4.12 49.50 OK green

"""
psu_line_pattern = re.compile(r"PSU\s+(\d+)\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+\s+(OK|NOT OK|NOT PRESENT)\s+(green|amber|red|off)")
return psu_line_pattern


def check_vendor_specific_psustatus(dut, psu_status_line, psu_line_pattern):
"""
@summary: Vendor specific psu status check
Expand Down