refactor(iuo): migrate iuo and observability imports to submodules#5316
refactor(iuo): migrate iuo and observability imports to submodules#5316vsibirsk wants to merge 2 commits into
Conversation
|
Report bugs in Issues Welcome! 🎉This pull request will be automatically processed with the following features: 🔄 Automatic Actions
📋 Available CommandsPR Status Management
Review & Approval
Testing & Validation
Container Operations
Cherry-pick Operations
Branch Management
Label Management
✅ Merge RequirementsThis PR will be automatically approved when the following conditions are met:
📊 Review ProcessApprovers and ReviewersApprovers:
Reviewers:
Available Labels
AI Features
Security Checks
💡 Tips
For more information, please refer to the project documentation or contact the maintainers. |
|
Warning Review limit reached
More reviews will be available in 20 minutes and 2 seconds. Learn how PR review limits work. Your organization has used up its prepaid credits, and credit purchases are no longer available. Enable the review add-on in the billing tab to keep reviews running — you're only billed for reviews past your plan's rate limits ($0.25/file). ⌛ How to resolve this issue?After more reviews become available, a review can be triggered using the To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based credits. 🚦 How do rate limits work?CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability. For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window. Please see our Fair Usage Limits Policy for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: ASSERTIVE Plan: Pro Run ID: 📒 Files selected for processing (3)
📝 WalkthroughWalkthroughThis PR changes test imports to use specific ChangesConstants submodule import migration
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Possibly related PRs
Suggested reviewers
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Warning Review ran into problems🔥 ProblemsLinked repositories: Your configuration references 1 linked repositories, but your current plan allows 0. Analyzed ``, skipped 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. Comment |
openshift-virtualization-qe-bot-5
requested review from
RoniKishner and
dshchedr
openshift-virtualization-qe-bot
added
the
tox:verify-tc-requirement-polarion:running
vsibirsk
changed the title
openshift-virtualization-qe-bot
added
tox:verify-tc-requirement-polarion:passed
|
@coderabbitai full review |
✅ Action performedFull review finished. |
✅ Action performedFull review finished. |
|
@coderabbitai full review |
✅ Action performedFull review finished. |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Replace `from utilities.constants import` with direct submodule imports in tests/install_upgrade_operators/ and tests/observability/. Images remains on the package shim in two observability files until the compat layer is removed. Generated-by: Claude Sonnet 4.6 Signed-off-by: vsibirsk <vsibirsk@redhat.com>
vsibirsk
force-pushed
the
vk-migrate-iuo-imports
branch
from
c8b6143 to
13e8cfe
Compare
Test execution plan request detailsCRITICAL: You MUST post an inline review comment on the first changed line of the first file. As an expert software testing engineer, analyze all modified files in this PR and create a targeted test execution plan. Analysis Requirements:
Output rules: Your deliverable: Test Execution Plan
Use these formats:
Real test commands (MANDATORY when changes affect session/runtime code): When the affected code runs at session/collection time (conftest fixtures, pytest plugins,
Example output for a session-startup fix: Guidelines:
Hardware-Related Checks (SR-IOV, GPU, DPDK): When PR modifies fixtures for hardware-specific resources:
CRITICAL WORKFLOW COMPLETION RULES: When responding to this test execution plan request, you MUST follow these rules EXACTLY:
ABSOLUTE PROHIBITIONS (violating these creates empty/meaningless reviews):
Remember: The pull request review is visible to users. Additional comments are redundant noise. CRITICAL — Verification rules for smoke and gating decisions: |
| HCO_CR_CERT_CONFIG_SERVER_KEY, | ||
| ) | ||
| from utilities.constants import TIMEOUT_1MIN, TIMEOUT_11MIN | ||
| from utilities.constants.timeouts import ( |
There was a problem hiding this comment.
Test Execution Plan
Run smoke tests: False
No traced path: tests/install_upgrade_operators/csv/test_csv.py (smoke-marked) was not modified, and no utilities/ or libs/ symbols were changed in this PR to create a transitive dependency.
Run gating tests: True
Direct modification path:
tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py— file directly modified (import refactor), carries@pytest.mark.gatingtests/install_upgrade_operators/deployment/test_hco_deployment_params.py— file directly modified (import refactor), carries@pytest.mark.gating
Affected tests to run
All changes are pure import-path refactoring (no logic changes). A --collect-only run was already verified (893/904 collected). The affected gating tests should be smoke-checked for import resolution:
tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py (gating)
tests/install_upgrade_operators/deployment/test_hco_deployment_params.py (gating)
Real tests (cluster required)
Happy path (regression — verify imports resolve at collection time):
pytest tests/install_upgrade_operators/ tests/observability/ --collect-only
Expected: all tests collect without ImportError (already confirmed: 893/904 collected).
Targeted gating run:
pytest tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py tests/install_upgrade_operators/deployment/test_hco_deployment_params.py -m gating
|
Tip For best results, initiate chat on the files or code changes. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
set -euo pipefail
PR_NUMBER=5316
REPO="RedHatQE/openshift-virtualization-tests"
echo "=== PR Files Changed (first file) ==="
gh pr view "$PR_NUMBER" --repo "$REPO" --json files --jq '.files[0]'
echo ""
echo "=== All changed files ==="
gh pr view "$PR_NUMBER" --repo "$REPO" --json files --jq '[.files[].path]'
echo ""
echo "=== Check smoke markers in affected test dirs ==="
rg -l '`@pytest.mark.smoke`' tests/install_upgrade_operators/ tests/observability/ 2>/dev/null || echo "No smoke markers found"
echo ""
echo "=== Check gating markers in affected test dirs ==="
rg -l '`@pytest.mark.gating`' tests/install_upgrade_operators/ tests/observability/ 2>/dev/null || echo "No gating markers found"
echo ""
echo "=== Get PR diff to find first changed file and line number ==="
gh api "repos/$REPO/pulls/$PR_NUMBER/files" --jq '.[0] | {filename: .filename, patch: .patch}' | head -50Length of output: 7746 🏁 Script executed: #!/bin/bash
set -euo pipefail
PR_NUMBER=5316
REPO="RedHatQE/openshift-virtualization-tests"
# Get the latest commit SHA for the PR
COMMIT_SHA=$(gh api "repos/$REPO/pulls/$PR_NUMBER" --jq '.head.sha')
echo "Commit SHA: $COMMIT_SHA"
# Post inline review comment on the first changed line of the first file
# File: tests/install_upgrade_operators/cert_renewal/conftest.py
# First changed line in new file: line 22 (the `from utilities.constants.timeouts import (` line)
COMMENT_BODY="## Test Execution Plan
**Run smoke tests: False**
No traced path: \`tests/install_upgrade_operators/csv/test_csv.py\` (smoke-marked) was not modified, and no \`utilities/\` or \`libs/\` symbols were changed in this PR to create a transitive dependency.
**Run gating tests: True**
Direct modification path:
- \`tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py\` — file directly modified (import refactor), carries \`@pytest.mark.gating\`
- \`tests/install_upgrade_operators/deployment/test_hco_deployment_params.py\` — file directly modified (import refactor), carries \`@pytest.mark.gating\`
**Affected tests to run**
All changes are pure import-path refactoring (no logic changes). A \`--collect-only\` run was already verified (893/904 collected). The affected gating tests should be smoke-checked for import resolution:
\`\`\`
tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py (gating)
tests/install_upgrade_operators/deployment/test_hco_deployment_params.py (gating)
\`\`\`
**Real tests (cluster required)**
Happy path (regression — verify imports resolve at collection time):
\`\`\`
pytest tests/install_upgrade_operators/ tests/observability/ --collect-only
\`\`\`
Expected: all tests collect without ImportError (already confirmed: 893/904 collected).
Targeted gating run:
\`\`\`
pytest tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py tests/install_upgrade_operators/deployment/test_hco_deployment_params.py -m gating
\`\`\`"
gh api "repos/$REPO/pulls/$PR_NUMBER/comments" \
--method POST \
--field body="$COMMENT_BODY" \
--field commit_id="$COMMIT_SHA" \
--field path="tests/install_upgrade_operators/cert_renewal/conftest.py" \
--field line=22 \
--field side="RIGHT"
echo "Inline comment posted successfully"Length of output: 6956 |
|
/approve |
openshift-virtualization-qe-bot
added
tox:verify-tc-requirement-polarion:running
|
/verified |
Test execution plan request detailsCRITICAL: You MUST post an inline review comment on the first changed line of the first file. As an expert software testing engineer, analyze all modified files in this PR and create a targeted test execution plan. Analysis Requirements:
Output rules: Your deliverable: Test Execution Plan
Use these formats:
Real test commands (MANDATORY when changes affect session/runtime code): When the affected code runs at session/collection time (conftest fixtures, pytest plugins,
Example output for a session-startup fix: Guidelines:
Hardware-Related Checks (SR-IOV, GPU, DPDK): When PR modifies fixtures for hardware-specific resources:
CRITICAL WORKFLOW COMPLETION RULES: When responding to this test execution plan request, you MUST follow these rules EXACTLY:
ABSOLUTE PROHIBITIONS (violating these creates empty/meaningless reviews):
Remember: The pull request review is visible to users. Additional comments are redundant noise. CRITICAL — Verification rules for smoke and gating decisions: |
|
Tip For best results, initiate chat on the files or code changes. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
set -euo pipefail
repo="RedHatQE/openshift-virtualization-tests"
pr="5316"
echo "=== First changed file metadata ==="
gh api "repos/$repo/pulls/$pr/files" --paginate \
| jq -r '.[0] | {filename, status, additions, deletions, patch}'
echo
echo "=== All changed files ==="
gh pr view "$pr" --repo "$repo" --json files \
--jq '.files[].path'
echo
echo "=== Changed conftest files ==="
gh pr view "$pr" --repo "$repo" --json files \
--jq '.files[].path' | rg '/conftest\.py$|^tests/.*/conftest\.py$' || true
echo
echo "=== Changed test files with markers (smoke/gating) ==="
changed_tmp="$(mktemp)"
gh pr view "$pr" --repo "$repo" --json files --jq '.files[].path' > "$changed_tmp"
while IFS= read -r f; do
[ -f "$f" ] || continue
if rg -n '`@pytest`\.mark\.(smoke|gating)\b' "$f" >/dev/null 2>&1; then
echo "--- $f"
rg -n '`@pytest`\.mark\.(smoke|gating)\b' "$f"
fi
done < "$changed_tmp"
echo
echo "=== All smoke files in affected top-level areas ==="
rg -l '`@pytest`\.mark\.smoke\b' tests/install_upgrade_operators tests/observability || true
echo
echo "=== All gating files in affected top-level areas ==="
rg -l '`@pytest`\.mark\.gating\b' tests/install_upgrade_operators tests/observability || true
echo
echo "=== Descendant test files under changed conftest directories with smoke/gating markers ==="
while IFS= read -r f; do
[ -n "$f" ] || continue
dir="$(dirname "$f")"
echo "--- CONFTST DIR: $dir"
fd -t f 'test_.*\.py$' "$dir" | while IFS= read -r tf; do
if rg -n '`@pytest`\.mark\.(smoke|gating)\b' "$tf" >/dev/null 2>&1; then
echo "FILE $tf"
rg -n '`@pytest`\.mark\.(smoke|gating)\b' "$tf"
fi
done
done < <(gh pr view "$pr" --repo "$repo" --json files --jq '.files[].path' | rg '/conftest\.py$|^tests/.*/conftest\.py$' || true)
rm -f "$changed_tmp"Length of output: 9881 🏁 Script executed: #!/bin/bash
set -euo pipefail
repo="RedHatQE/openshift-virtualization-tests"
pr="5316"
echo "=== Parent conftest for smoke file ==="
python - <<'PY'
from pathlib import Path
smoke = Path("tests/install_upgrade_operators/csv/test_csv.py")
p = smoke.parent
while True:
cf = p / "conftest.py"
if cf.exists():
print(cf)
if p == Path(".") or str(p) == ".":
break
p = p.parent
PY
echo
echo "=== Changed files under directories with changed conftest.py ==="
python - <<'PY'
from pathlib import Path
import subprocess, json
repo="RedHatQE/openshift-virtualization-tests"
pr="5316"
files = subprocess.check_output(
["gh","pr","view",pr,"--repo",repo,"--json","files","--jq",".files[].path"],
text=True
).splitlines()
changed = set(files)
conftests = [Path(f) for f in files if f.endswith("conftest.py")]
for cf in conftests:
d = cf.parent
descendants = sorted(f for f in changed if f.startswith(str(d) + "/") and f.endswith(".py") and Path(f).name != "conftest.py")
print(f"--- {cf}")
for f in descendants:
print(f)
PY
echo
echo "=== Marker lines in key affected files ==="
for f in \
tests/install_upgrade_operators/csv/test_csv.py \
tests/install_upgrade_operators/deployment/test_hco_deployment_params.py \
tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py \
tests/install_upgrade_operators/product_upgrade/test_upgrade.py \
tests/install_upgrade_operators/product_upgrade/test_upgrade_iuo.py
do
if [ -f "$f" ]; then
echo "--- $f"
rg -n '`@pytest`\.mark\.(smoke|gating)\b' "$f" || true
fi
done
echo
echo "=== Post corrected inline test execution plan ==="
commit_sha="$(gh api "repos/$repo/pulls/$pr" --jq '.head.sha')"
read -r -d '' body <<'EOF' || true
## Test Execution Plan
**Run smoke tests: True**
Dependency path: `tests/install_upgrade_operators/csv/test_csv.py` `(smoke)` → parent `tests/install_upgrade_operators/conftest.py` (changed, imported at collection/session startup) → updated constant imports from `utilities.constants.architecture` / `utilities.constants.components`.
Why this is required: shared `conftest.py` changes execute before tests run, so import-path regressions surface at collection time and can block the whole subtree.
**Run gating tests: True**
Dependency paths:
- `tests/install_upgrade_operators/deployment/test_hco_deployment_params.py` `(gating)` → same file modified (import-path update)
- `tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py` `(gating)` → same file modified (import-path update)
- `tests/install_upgrade_operators/product_upgrade/test_upgrade.py` `(gating)` / `tests/install_upgrade_operators/product_upgrade/test_upgrade_iuo.py` → parent `tests/install_upgrade_operators/product_upgrade/conftest.py` (changed at collection/session startup)
**Affected tests to run**
- `tests/install_upgrade_operators/csv/test_csv.py` `(smoke)`
- `tests/install_upgrade_operators/deployment/test_hco_deployment_params.py` `(gating)`
- `tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py` `(gating)`
- `tests/install_upgrade_operators/product_upgrade/test_upgrade.py` `(gating)`
- `tests/install_upgrade_operators/product_upgrade/test_upgrade_iuo.py`
**Real tests (cluster required)**
Error/fix path (collection/session startup validation for the changed shared conftest imports):
`uv run pytest -rA -s -o log_cli=true --tc-file=tests/global_config_amd64.py --tc-format=python --cluster-sanity-skip-check --storage-class-matrix=ocs-storagecluster-ceph-rbd-virtualization --skip-deprecated-api-test tests/install_upgrade_operators/ tests/observability/ --collect-only`
Happy path (regression on representative smoke + gating coverage):
`uv run pytest -rA -s -o log_cli=true --tc-file=tests/global_config_amd64.py --tc-format=python --cluster-sanity-skip-check --storage-class-matrix=ocs-storagecluster-ceph-rbd-virtualization --skip-deprecated-api-test tests/install_upgrade_operators/csv/test_csv.py tests/install_upgrade_operators/deployment/test_hco_deployment_params.py tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py tests/install_upgrade_operators/product_upgrade/test_upgrade.py tests/install_upgrade_operators/product_upgrade/test_upgrade_iuo.py`
EOF
gh api "repos/$repo/pulls/$pr/comments" \
--method POST \
--field body="$body" \
--field commit_id="$commit_sha" \
--field path="tests/install_upgrade_operators/cert_renewal/conftest.py" \
--field line=22 \
--field side="RIGHT" >/dev/nullLength of output: 14358 🏁 Script executed: #!/bin/bash
set -euo pipefail
repo="RedHatQE/openshift-virtualization-tests"
pr="5316"
read -r -d '' body <<'EOF' || true
## Test Execution Plan
**Run smoke tests: True**
Dependency path: `tests/install_upgrade_operators/csv/test_csv.py` `(smoke)` → parent `tests/install_upgrade_operators/conftest.py` (changed, imported at collection/session startup) → updated constant imports from `utilities.constants.architecture` / `utilities.constants.components`.
Why this is required: shared `conftest.py` changes execute before tests run, so import-path regressions surface at collection time and can block the whole `tests/install_upgrade_operators/` subtree.
**Run gating tests: True**
Dependency paths:
- `tests/install_upgrade_operators/deployment/test_hco_deployment_params.py` `(gating)` → same file modified (import-path update)
- `tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py` `(gating)` → same file modified (import-path update)
- `tests/install_upgrade_operators/product_upgrade/test_upgrade.py` `(gating)` / `tests/install_upgrade_operators/product_upgrade/test_upgrade_iuo.py` → parent `tests/install_upgrade_operators/product_upgrade/conftest.py` (changed at collection/session startup)
**Affected tests to run**
- `tests/install_upgrade_operators/csv/test_csv.py` `(smoke)`
- `tests/install_upgrade_operators/deployment/test_hco_deployment_params.py` `(gating)`
- `tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py` `(gating)`
- `tests/install_upgrade_operators/product_upgrade/test_upgrade.py` `(gating)`
- `tests/install_upgrade_operators/product_upgrade/test_upgrade_iuo.py`
**Real tests (cluster required)**
Error/fix path (collection/session startup validation for the changed shared conftest imports):
`uv run pytest -rA -s -o log_cli=true --tc-file=tests/global_config_amd64.py --tc-format=python --cluster-sanity-skip-check --storage-class-matrix=ocs-storagecluster-ceph-rbd-virtualization --skip-deprecated-api-test tests/install_upgrade_operators/ tests/observability/ --collect-only`
Happy path (regression on representative smoke + gating coverage):
`uv run pytest -rA -s -o log_cli=true --tc-file=tests/global_config_amd64.py --tc-format=python --cluster-sanity-skip-check --storage-class-matrix=ocs-storagecluster-ceph-rbd-virtualization --skip-deprecated-api-test tests/install_upgrade_operators/csv/test_csv.py tests/install_upgrade_operators/deployment/test_hco_deployment_params.py tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py tests/install_upgrade_operators/product_upgrade/test_upgrade.py tests/install_upgrade_operators/product_upgrade/test_upgrade_iuo.py`
EOF
# Fallback path requested by the bot when inline review comments are not possible.
gh api "repos/$repo/issues/$pr/comments" \
--method POST \
--field body="$body" >/dev/nullLength of output: 3325
CRITICAL: I could not complete the requested posting step because GitHub rejected both APIs with
That means this is a permissions blocker, not an analysis blocker. Prepared Test Execution Plan to post: ## Test Execution Plan
**Run smoke tests: True**
Dependency path: `tests/install_upgrade_operators/csv/test_csv.py` `(smoke)` → parent `tests/install_upgrade_operators/conftest.py` (changed, imported at collection/session startup) → updated constant imports from `utilities.constants.architecture` / `utilities.constants.components`.
Why this is required: shared `conftest.py` changes execute before tests run, so import-path regressions surface at collection time and can block the whole `tests/install_upgrade_operators/` subtree.
**Run gating tests: True**
Dependency paths:
- `tests/install_upgrade_operators/deployment/test_hco_deployment_params.py` `(gating)` → same file modified (import-path update)
- `tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py` `(gating)` → same file modified (import-path update)
- `tests/install_upgrade_operators/product_upgrade/test_upgrade.py` `(gating)` / `tests/install_upgrade_operators/product_upgrade/test_upgrade_iuo.py` → parent `tests/install_upgrade_operators/product_upgrade/conftest.py` (changed at collection/session startup)
**Affected tests to run**
- `tests/install_upgrade_operators/csv/test_csv.py` `(smoke)`
- `tests/install_upgrade_operators/deployment/test_hco_deployment_params.py` `(gating)`
- `tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py` `(gating)`
- `tests/install_upgrade_operators/product_upgrade/test_upgrade.py` `(gating)`
- `tests/install_upgrade_operators/product_upgrade/test_upgrade_iuo.py`
**Real tests (cluster required)**
Error/fix path (collection/session startup validation for the changed shared conftest imports):
`uv run pytest -rA -s -o log_cli=true --tc-file=tests/global_config_amd64.py --tc-format=python --cluster-sanity-skip-check --storage-class-matrix=ocs-storagecluster-ceph-rbd-virtualization --skip-deprecated-api-test tests/install_upgrade_operators/ tests/observability/ --collect-only`
Happy path (regression on representative smoke + gating coverage):
`uv run pytest -rA -s -o log_cli=true --tc-file=tests/global_config_amd64.py --tc-format=python --cluster-sanity-skip-check --storage-class-matrix=ocs-storagecluster-ceph-rbd-virtualization --skip-deprecated-api-test tests/install_upgrade_operators/csv/test_csv.py tests/install_upgrade_operators/deployment/test_hco_deployment_params.py tests/install_upgrade_operators/hco_enablement_golden_image_updates/test_custom_golden_images_namespace.py tests/install_upgrade_operators/product_upgrade/test_upgrade.py tests/install_upgrade_operators/product_upgrade/test_upgrade_iuo.py` |
|
/approve |
9 participants
What this PR does / why we need it:
Replace
from utilities.constants importwith direct submodule imports in tests/install_upgrade_operators/ and tests/observability/. Images remains on the package shim in two observability files until the compat layer is removed.Generated-by: Claude Sonnet 4.6
Which issue(s) this PR fixes:
Special notes for reviewer:
This is a next PR in a series.
https://redhat.atlassian.net/browse/CNV-80952 and a follow up of #5188
jira-ticket:
https://redhat.atlassian.net/browse/CNV-89563
Summary by CodeRabbit