Skip to content

refactor: move validate_metrics_value to utilities/monitoring#5546

Open
hmeir wants to merge 1 commit into
RedHatQE:mainfrom
hmeir:move-validate-metrics-value
Open

refactor: move validate_metrics_value to utilities/monitoring#5546
hmeir wants to merge 1 commit into
RedHatQE:mainfrom
hmeir:move-validate-metrics-value

Conversation

@hmeir

@hmeir hmeir commented Jul 7, 2026

Copy link
Copy Markdown
Contributor
What this PR does / why we need it:

Move validate_metrics_value from tests/observability/utils.py to
utilities/monitoring.py for cross-directory reuse.
Now accepts str | int expected_value (int 0 for absent metrics).
Add unit tests. Update all observability callers.

Which issue(s) this PR fixes:

Allows another packages to verify metrics tests.

Special notes for reviewer:
jira-ticket:

NONE

Summary by CodeRabbit

  • Refactor
    • Consolidated metric polling and validation into a shared monitoring helper for consistent observability checks.
    • Updated observability-related tests (including upgrade scenarios) to use the shared helper.
    • Removed duplicated metric-validation logic from the test utilities.
  • Tests
    • Added unit tests covering successful metric matching, type-sensitive comparisons, and timeout/error behavior.

@hmeir hmeir requested a deployment to external-pr-tests July 7, 2026 12:10 — with GitHub Actions Waiting
@coderabbitai

coderabbitai Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: 807ddb3a-9752-4924-b7de-8cfe4ef0d267

📥 Commits

Reviewing files that changed from the base of the PR and between c1c9232 and a779ee8.

📒 Files selected for processing (11)
  • tests/observability/metrics/conftest.py
  • tests/observability/metrics/test_aaq_metrics.py
  • tests/observability/metrics/test_general_metrics.py
  • tests/observability/metrics/test_metrics.py
  • tests/observability/metrics/test_migration_metrics.py
  • tests/observability/metrics/test_ssp_metrics.py
  • tests/observability/metrics/test_vms_metrics.py
  • tests/observability/upgrade/test_upgrade_observability.py
  • tests/observability/utils.py
  • utilities/monitoring.py
  • utilities/unittests/test_monitoring.py
🔗 Linked repositories identified

CodeRabbit considers these linked repositories for cross-repo context during reviews:

  • RedHatQE/openshift-virtualization-tests-design-docs (manual)
💤 Files with no reviewable changes (1)
  • tests/observability/utils.py

📝 Walkthrough

Walkthrough

validate_metrics_value is moved into utilities/monitoring.py, removed from tests/observability/utils.py, and all observability test modules update their imports to use the new helper location. Unit tests for the helper are added in utilities/unittests/test_monitoring.py.

Changes

Relocate validate_metrics_value helper

Layer / File(s) Summary
New validate_metrics_value implementation
utilities/monitoring.py
Adds conditional Prometheus typing, a datetime import, and validate_metrics_value, which samples get_metrics_value with TimeoutSampler until the metric matches or the timeout is re-raised after logging the last value.
Remove helper from tests observability utils
tests/observability/utils.py
Deletes validate_metrics_value and its supporting imports, leaving verify_no_listed_alerts_on_cluster and the alert allowlist configuration.
Update observability imports and coverage
tests/observability/metrics/conftest.py, tests/observability/metrics/test_aaq_metrics.py, tests/observability/metrics/test_general_metrics.py, tests/observability/metrics/test_metrics.py, tests/observability/metrics/test_migration_metrics.py, tests/observability/metrics/test_ssp_metrics.py, tests/observability/metrics/test_vms_metrics.py, tests/observability/upgrade/test_upgrade_observability.py, utilities/unittests/test_monitoring.py
Switches validate_metrics_value imports to utilities.monitoring across observability tests and adds unit coverage for matching and timeout behavior in the monitoring test suite.

Estimated code review effort: 2 (Simple) | ~10 minutes

Suggested labels: new-tests

Suggested reviewers: rnetser, dshchedr, RoniKishner

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed PASS: The title is under 120 characters and clearly states the refactor moving validate_metrics_value into utilities/monitoring.
Description check ✅ Passed PASS: The PR description matches the template sections and includes purpose, issue reference, notes, and jira-ticket.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stp Link Required ✅ Passed PASS: No new test files or def test_* additions under tests/ outside utilities/unittests/; touched files only adjust imports. The added unit tests are in the excluded path.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@openshift-virtualization-qe-bot-4

Copy link
Copy Markdown

Report bugs in Issues

Welcome! 🎉

This pull request will be automatically processed with the following features:

🔄 Automatic Actions

  • Reviewer Assignment: Reviewers are automatically assigned based on the OWNERS file in the repository root
  • Size Labeling: PR size labels (XS, S, M, L, XL, XXL) are automatically applied based on changes
  • Issue Creation: A tracking issue is created for this PR and will be closed when the PR is merged or closed
  • Branch Labeling: Branch-specific labels are applied to track the target branch
  • Auto-verification: Auto-verified users have their PRs automatically marked as verified
  • Labels: Enabled categories: branch, can-be-merged, cherry-pick, has-conflicts, hold, needs-rebase, size, verified, wip

📋 Available Commands

PR Status Management

  • /wip - Mark PR as work in progress (adds WIP: prefix to title)
  • /wip cancel - Remove work in progress status
  • /hold - Block PR merging (approvers only)
  • /hold cancel - Unblock PR merging
  • /verified - Mark PR as verified
  • /verified cancel - Remove verification status
  • /reprocess - Trigger complete PR workflow reprocessing (useful if webhook failed or configuration changed)
  • /regenerate-welcome - Regenerate this welcome message
  • /security-override - Set security check runs to pass (maintainers only)
  • /security-override cancel - Re-run security checks

Review & Approval

  • /lgtm - Approve changes (looks good to me)
  • /approve - Approve PR (approvers only)
  • /assign-reviewers - Assign reviewers based on OWNERS file
  • /assign-reviewer @username - Assign specific reviewer
  • /check-can-merge - Check if PR meets merge requirements

Testing & Validation

  • /retest tox - Run Python test suite with tox
  • /retest build-container - Rebuild and test container image
  • /retest verify-bugs-are-open - verify-bugs-are-open
  • /retest all - Run all available tests

Container Operations

  • /build-and-push-container - Build and push container image (tagged with PR number)
    • Supports additional build arguments: /build-and-push-container --build-arg KEY=value

Cherry-pick Operations

  • /cherry-pick <branch> - Schedule cherry-pick to target branch when PR is merged
    • Multiple branches: /cherry-pick branch1 branch2 branch3
  • /cherry-pick-retry <branch> - Retry a failed cherry-pick (merged PRs only)

Branch Management

  • /rebase - Rebase this PR branch onto its base branch

Label Management

  • /<label-name> - Add a label to the PR
  • /<label-name> cancel - Remove a label from the PR

✅ Merge Requirements

This PR will be automatically approved when the following conditions are met:

  1. Approval: /approve from at least one approver
  2. LGTM Count: Minimum 2 /lgtm from reviewers
  3. Status Checks: All required status checks must pass
  4. No Blockers: No wip, hold, has-conflicts labels and PR must be mergeable (no conflicts)
  5. Verified: PR must be marked as verified

📊 Review Process

Approvers and Reviewers

Approvers:

  • dshchedr
  • myakove
  • rnetser
  • vsibirsk

Reviewers:

  • OhadRevah
  • RoniKishner
  • albarker-rh
  • dshchedr
  • geetikakay
  • hmeir
  • rlobillo
  • rnetser
  • vsibirsk
Available Labels
  • hold
  • verified
  • wip
  • lgtm
  • approve
AI Features
  • Cherry-Pick Conflict Resolution: Enabled (claude/claude-opus-4-6-1m)
Security Checks
  • Suspicious Path Detection: Monitors paths: .claude/, .vscode/, .cursor/, .devcontainer/, .pi/, .github/workflows/, .github/actions/
  • Committer Identity Check: Verifies last committer matches PR author
  • Mandatory: Security checks block merge (use /security-override to bypass — maintainers only)

💡 Tips

  • WIP Status: Use /wip when your PR is not ready for review
  • Verification: The verified label is removed on new commits unless the push is detected as a clean rebase
  • Cherry-picking: Cherry-pick labels are processed when the PR is merged
  • Container Builds: Container images are automatically tagged with the PR number
  • Permission Levels: Some commands require approver permissions
  • Auto-verified Users: Certain users have automatic verification and merge privileges

📌 Additional Information

Custom Commands:

  • /test-plan — Triggers CodeRabbit to analyze the PR's changed files and post a test execution plan
  • /rerun-smoke — Adds retest-smoke label on the PR to trigger smoke tests execution

For more information, please refer to the project documentation or contact the maintainers.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@utilities/monitoring.py`:
- Around line 184-186: Add a Google-format docstring to validate_metrics_value
describing that it polls Prometheus for the metric, logs comparison snapshots
during validation, and may raise TimeoutExpiredError on timeout. Keep the
docstring aligned with the function signature and include Args and Raises
sections so the public side effects are clear.
- Around line 184-209: The `validate_metrics_value` helper is skipping
legitimate zero values because it only compares when `if sample:` is truthy, so
the `get_metrics_value()` empty-result path can never match `0`. Update
`validate_metrics_value` to compare every sample (or at least use an explicit
`is not None` check) and allow `expected_value` to accept `0` by widening its
type if needed, while keeping the existing `TimeoutSampler` and
`get_metrics_value` flow intact.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: 26757548-9156-4b90-bcfb-4d7193d391a7

📥 Commits

Reviewing files that changed from the base of the PR and between bd4fb7c and c1c9232.

📒 Files selected for processing (10)
  • tests/observability/metrics/conftest.py
  • tests/observability/metrics/test_aaq_metrics.py
  • tests/observability/metrics/test_general_metrics.py
  • tests/observability/metrics/test_metrics.py
  • tests/observability/metrics/test_migration_metrics.py
  • tests/observability/metrics/test_ssp_metrics.py
  • tests/observability/metrics/test_vms_metrics.py
  • tests/observability/upgrade/test_upgrade_observability.py
  • tests/observability/utils.py
  • utilities/monitoring.py
🔗 Linked repositories identified

CodeRabbit considers these linked repositories for cross-repo context during reviews:

  • RedHatQE/openshift-virtualization-tests-design-docs (manual)
💤 Files with no reviewable changes (1)
  • tests/observability/utils.py

Comment thread utilities/monitoring.py
Comment thread utilities/monitoring.py
Move `validate_metrics_value` from `tests/observability/utils.py` to
`utilities/monitoring.py` for cross-directory reuse.
Now accepts `str | int` expected_value (int 0 for absent metrics).
Add unit tests. Update all observability callers.

Signed-off-by: Harel Meir <hmeir@redhat.com>
@codecov

codecov Bot commented Jul 8, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.68%. Comparing base (a2dc143) to head (a779ee8).
⚠️ Report is 233 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5546      +/-   ##
==========================================
+ Coverage   98.67%   98.68%   +0.01%     
==========================================
  Files          25       42      +17     
  Lines        2487     2519      +32     
==========================================
+ Hits         2454     2486      +32     
  Misses         33       33              
Flag Coverage Δ
utilities 98.68% <100.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@hmeir

hmeir commented Jul 8, 2026

Copy link
Copy Markdown
Contributor Author

/build-and-push-container

@openshift-virtualization-qe-bot

Copy link
Copy Markdown

New container for quay.io/openshift-cnv/openshift-virtualization-tests:pr-5546 published

@OhadRevah

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-virtualization-qe-bot

Copy link
Copy Markdown

/build-and-push-container

@openshift-virtualization-qe-bot-4

Copy link
Copy Markdown

New container for quay.io/openshift-cnv/openshift-virtualization-tests:pr-5546 published

@openshift-virtualization-qe-bot

Copy link
Copy Markdown

/verified

All tests passed for PR #5546.
Job: openshift-virtualization-tests-runner #5904

Execution details
pytest -s -o log_cli=true -m tier2 --jira tests/observability/metrics
Image: openshift-virtualization-tests:pr-5546

@openshift-virtualization-qe-bot-3

Copy link
Copy Markdown
Contributor

@coderabbitai

Test execution plan request details

CRITICAL: You MUST post an inline review comment on the first changed line of the first file.
The inline comment should contain the full Test Execution Plan (smoke decision, gating decision, and specific affected tests).
Do NOT submit a blocking review event (REQUEST_CHANGES/APPROVE).
Post a single inline PR comment on Files Changed (non-blocking COMMENT flow).

As an expert software testing engineer, analyze all modified files in this PR and create a targeted test execution plan.
You will post an inline review comment with the test execution plan on the first changed file.
If you fail to run or post a comment, retry.

Analysis Requirements:

  1. Examine code changes in each modified file

  2. Identify affected code paths, functions, and classes

  3. Analyze pytest-specific elements: fixtures (scope, dependencies), parametrization, markers, conftest changes

  4. Trace test dependencies through imports, shared utilities, fixture inheritance, fixture teardown, and yield from cleanup in conftest

  5. Detect new tests introduced in the PR

  6. Utilities and libs impact (when utilities/ or libs/ changes):
    You MUST use shell scripts (rg, git diff) to trace the full impact.
    Follow these sub-steps in order:

    6a. Identify modified symbols: For each changed file under utilities/ or libs/,
    list every modified function or method.
    Example: git diff HEAD~1 --unified=0 -- utilities/hco.py | grep '^[+-]def '

    6b. Find direct callers: Search tests and conftest for each symbol from 6a.
    Example: rg -l 'get_hco_version' tests/

    6c. Trace fixture teardown and cleanup: Find fixtures that reach
    the modified symbol through yield from or context-manager wrappers.
    Example: rg -l 'yield from.*enable_common_boot|def.*enable_common_boot' tests/

    6d. Trace same-file callers: In each changed file, find other functions
    whose body calls a modified symbol (including code after yield
    in @contextmanager helpers).
    Example: rg 'get_hco_version|enable_common_boot' utilities/hco.py

    6e. Expand transitively: If function A calls modified B, then
    tests/fixtures that call A are affected — even when the test body
    never imports B directly.

    Do NOT limit impact to tests that import the modified symbol only.

  7. Smoke test impact: Intersect the affected set from step 6 with smoke-marked tests.
    Run: rg -l '@pytest.mark.smoke' tests/
    VERIFY the above command returned actual file paths before concluding False.
    Set True if either condition is met:

    • a smoke-marked file appears in the affected set from 6b-6e, OR
    • any conftest.py in the smoke test's parent-directory hierarchy (up to repo root)
      imports or calls a modified utilities/libs symbol — including autouse fixtures
      that depend on modified functions. ALL tests in that directory and below are affected.
      Example check: for each smoke_file, scan dirname(smoke_file)/conftest.py,
      dirname(dirname(smoke_file))/conftest.py, etc. for modified symbol imports
      and autouse fixtures that depend on modified symbols.
  8. Gating test impact: Intersect the affected set from step 6 with gating-marked tests.
    Run: rg -l '@pytest.mark.gating' tests/
    Set True if a gating-marked file also appears in the affected set from 6b-6e.
    Utilities/libs changes often affect gating tests without affecting smoke tests.
    Do NOT stop analysis after concluding Run smoke tests: False.

Output rules:
Do NOT include analysis step numbers (1-8) in your visible output.

Your deliverable:
Your inline informational comment will be based on the following requirements:

Test Execution Plan

  • Run smoke tests: True / False — If True, state the dependency path (test → fixture → changed symbol). True ONLY with a verified path.
  • Run gating tests: True / False — If True, state the dependency path. True if any gating-marked test is in the affected set.
  • Affected tests to run (required when utilities/, libs/, or shared conftest changes — list concrete paths even when smoke is False)

Use these formats:

  • path/to/test_file.py - When the entire test file needs verification
  • path/to/test_file.py::TestClass::test_method - When specific test(s) needed
  • path/to/test_file.py::test_function - When specific test(s) needed
  • -m marker - When a marker covers multiple affected tests (e.g. -m gating only if ALL gating tests in scope need run)
  • Tag each listed test or group with its marker when not obvious, e.g. (gating) or (smoke)

Real test commands (MANDATORY when changes affect session/runtime code):

When the affected code runs at session/collection time (conftest fixtures, pytest plugins,
config hooks, session-scoped setup) or modifies runtime behavior that unit tests mock away,
you MUST include concrete pytest commands the PR author must run on a real cluster
to verify the change works end-to-end. Include:

  • A command for the error/fix path (the scenario the PR fixes)
  • A command for the happy path (regression: the normal case still works)
  • Use lightweight tests (e.g., --collect-only for startup failures,
    a single small test for runtime behavior)
    If the PR only changes test logic (not utilities/libs/conftest), the affected test
    paths themselves serve as the real test commands — no separate section needed.

Example output for a session-startup fix:

**Real tests (cluster required)**
Error path (the fix):
`pytest tests/storage/.../test_foo.py --storage-class-matrix=nonexistent-sc --collect-only`
Expected: ValueError with clear message, not IndexError

Happy path (regression):
`pytest tests/storage/.../test_foo.py --storage-class-matrix=<valid-sc> -k test_bar`
Expected: session starts normally

Guidelines:

  • Include tests affected directly OR via fixture setup/teardown, yield from cleanup, or transitive utility call chains (caller calls modified helper)
  • Use a full file path only if ALL tests in that file require verification
  • Use file path + test name when only specific tests use an affected fixture or utility wrapper (preferred for partial file impact)
  • If a test marker can cover multiple files/tests, provide the marker
  • Balance coverage vs over-testing - Keep descriptions minimal
  • Example: if leaf helper foo() changes, include tests whose fixture teardown calls wrapper bar() where bar() calls foo(), even when the test body only imports an unrelated symbol from the same utilities module

Hardware-Related Checks (SR-IOV, GPU, DPDK):

When PR modifies fixtures for hardware-specific resources:

  • Collection Safety: Fixtures MUST have existence checks (return None when hardware unavailable)
  • Test Plan: MUST verify both WITH and WITHOUT hardware:
    • Run affected tests on cluster WITH hardware
    • Verify collection succeeds on cluster WITHOUT hardware

CRITICAL WORKFLOW COMPLETION RULES:

When responding to this test execution plan request, you MUST follow these rules EXACTLY:

  1. YOUR ONLY DELIVERABLE: Post one non-blocking inline comment containing the test execution plan on the first changed line
  2. THEN STOP IMMEDIATELY - Do NOT generate any additional response
  3. FALLBACK ONLY: If inline comment API calls fail after retrying, post as a regular PR comment
  4. SILENCE = SUCCESS: After successfully submitting the review, your task is complete. No confirmation needed.

ABSOLUTE PROHIBITIONS (violating these creates empty/meaningless reviews):

  • ❌ Do NOT post acknowledgment messages like "Test execution plan posted", "Review posted successfully", "I've successfully posted"
  • ❌ Do NOT mention review IDs, URLs, or confirmation of posting in the PR thread
  • ❌ Do NOT add any follow-up comments after submitting the review
  • ❌ Do NOT reply to confirm task completion
  • ❌ Do NOT explain what you did - just do it and stop

Remember: The pull request review is visible to users. Additional comments are redundant noise.

CRITICAL — Verification rules for smoke and gating decisions:
- For each True decision, you must have traced a concrete path: test file → fixture → utility function → modified symbol.
- Do NOT assume impact based on scope, file proximity, or infrastructure-sounding names.
Only set True when you trace a concrete path through steps 6a-6e, then 7 or 8.
WRONG: "utilities/hco.py changed → run smoke" (no traced dependency path)
WRONG: "Run smoke tests: False" with no affected-test list when gating tests use the changed utility
RIGHT: "Run smoke tests: False, Run gating tests: True" plus tests/.../test_foo.py::TestBar::test_baz (gating)
RIGHT: "Smoke test X uses fixture Y → wrapper Z → changed function W in utilities/hco.py"

@coderabbitai

coderabbitai Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

Tip

For best results, initiate chat on the files or code changes.

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
echo "=== callers of validate_metrics_value ==="
rg -n 'validate_metrics_value' --type py

echo "=== markers in affected files ==="
for f in tests/observability/metrics/conftest.py tests/observability/metrics/test_aaq_metrics.py tests/observability/metrics/test_general_metrics.py tests/observability/metrics/test_metrics.py tests/observability/metrics/test_migration_metrics.py tests/observability/metrics/test_ssp_metrics.py tests/observability/metrics/test_vms_metrics.py tests/observability/upgrade/test_upgrade_observability.py; do
  echo "--- $f ---"
  rg -n '`@pytest.mark`.(smoke|gating)' "$f" || echo "no smoke/gating marker"
done

echo "=== conftest hierarchy autouse fixtures ==="
rg -n 'autouse=True' tests/observability/conftest.py tests/observability/metrics/conftest.py tests/conftest.py 2>/dev/null

echo "=== smoke/gating files anywhere referencing these test files' fixtures ==="
rg -l '`@pytest.mark.smoke`' tests/observability/ 2>/dev/null
rg -l '`@pytest.mark.gating`' tests/observability/ 2>/dev/null

Length of output: 1430


🏁 Script executed:

#!/bin/bash
set +e
echo "=== callers of validate_metrics_value ==="
rg -n 'validate_metrics_value'

echo "=== markers in affected files ==="
for f in tests/observability/metrics/conftest.py tests/observability/metrics/test_aaq_metrics.py tests/observability/metrics/test_general_metrics.py tests/observability/metrics/test_metrics.py tests/observability/metrics/test_migration_metrics.py tests/observability/metrics/test_ssp_metrics.py tests/observability/metrics/test_vms_metrics.py tests/observability/upgrade/test_upgrade_observability.py; do
  echo "--- $f ---"
  rg -n '`@pytest.mark`.(smoke|gating)' "$f"
  echo "(end $f)"
done

echo "=== conftest hierarchy autouse fixtures ==="
rg -n 'autouse=True' tests/observability/conftest.py tests/observability/metrics/conftest.py tests/conftest.py

echo "=== smoke/gating files anywhere in tests/observability ==="
rg -l '`@pytest.mark.smoke`' tests/observability/
echo "---gating---"
rg -l '`@pytest.mark.gating`' tests/observability/

echo "=== other utilities/monitoring.py usages of validate_metrics_value/get_metrics_value ==="
rg -n 'get_metrics_value|validate_metrics_value' utilities/monitoring.py

Length of output: 1556


🏁 Script executed:

#!/bin/bash
set +e
echo "pwd: $(pwd)"
git status
git log --oneline -5
echo "=== fd search ==="
fd 'monitoring.py' utilities
fd 'test_metrics.py' tests
echo "=== cat utilities/monitoring.py grep ==="
grep -n 'validate_metrics_value\|get_metrics_value' utilities/monitoring.py
echo "=== grep in tests/observability ==="
grep -rn 'validate_metrics_value' tests/observability/

Length of output: 3934


🏁 Script executed:

#!/bin/bash
set +e
echo "=== markers in affected test files ==="
for f in tests/observability/metrics/conftest.py tests/observability/metrics/test_aaq_metrics.py tests/observability/metrics/test_general_metrics.py tests/observability/metrics/test_metrics.py tests/observability/metrics/test_migration_metrics.py tests/observability/metrics/test_ssp_metrics.py tests/observability/metrics/test_vms_metrics.py tests/observability/upgrade/test_upgrade_observability.py; do
  echo "--- $f ---"
  grep -n '`@pytest.mark.smoke`\|`@pytest.mark.gating`\|`@pytest.mark.tier`' "$f"
done

echo "=== conftest.py fixture context around validate_metrics_value calls ==="
sed -n '180,230p' tests/observability/metrics/conftest.py

echo "=== autouse fixtures in observability conftest hierarchy ==="
grep -n 'autouse=True' tests/observability/conftest.py tests/observability/metrics/conftest.py tests/observability/upgrade/conftest.py tests/conftest.py 2>/dev/null

echo "=== any smoke/gating markers anywhere in tests/observability ==="
grep -rl '`@pytest.mark.smoke`' tests/observability/
echo "---gating---"
grep -rl '`@pytest.mark.gating`' tests/observability/

Length of output: 3931


🏁 Script executed:

#!/bin/bash
set +e
sed -n '1965,1990p' tests/conftest.py
echo "=== check if monitoring.py imported in tests/conftest.py ==="
grep -n 'monitoring' tests/conftest.py

Length of output: 1345


@openshift-virtualization-qe-bot-3: I don't have a capability to post inline review comments on a specific diff line in this interface — my available actions are limited to shell/web/external-tools lookups and the standard reply/action-tag flow described in my instructions. I'm posting the Test Execution Plan here instead.

Test Execution Plan

  • Run smoke tests: Falserg -rl '@pytest.mark.smoke' tests/observability/ returns no files. No smoke-marked test exists anywhere under tests/observability/, so no dependency path exists.
  • Run gating tests: Falserg -rl '@pytest.mark.gating' tests/observability/ also returns no files.
  • Affected tests to run (all tier3, direct callers or fixture-teardown callers of validate_metrics_value, now sourced from utilities/monitoring.py):
    • tests/observability/metrics/test_metrics.py
    • tests/observability/metrics/test_aaq_metrics.py
    • tests/observability/metrics/test_general_metrics.py
    • tests/observability/metrics/test_migration_metrics.py
    • tests/observability/metrics/test_ssp_metrics.py
    • tests/observability/metrics/test_vms_metrics.py
    • tests/observability/upgrade/test_upgrade_observability.py
    • tests/observability/metrics/conftest.py::connected_vm_console_successfully and ::connected_vnc_console fixture teardown paths (both call validate_metrics_value after yield, exercised by any test consuming these fixtures in test_vms_metrics.py)
    • utilities/unittests/test_monitoring.py::TestValidateMetricsValue (new unit tests covering the moved/expanded function; pure unit-level, no cluster needed)

No separate "Real tests (cluster required)" section is needed beyond the list above — this PR only relocates/generalizes existing test logic (plus adds int support for expected_value), it does not touch session/collection-time or runtime behavior outside the observability metric-validation call chain. Running the listed tests/observability/** files (already covered by CI, per the /verified run in this thread: job #5904, pytest -m tier2 --jira tests/observability/metrics) together with the new unit tests is sufficient to validate the refactor end-to-end.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants