CherryPicked: [4.20] [Storage] Test using Windows VMs should have vTPM - test_hotplug.py

[acinko-rh]

Short description:

Backport of #4761 to cnv-4.20: All Windows VMs in storage tests should be Windows 2022 using VTPM.

More details:

Added helper functions into utils.py that are context managers for DV and VM using Windows 2022 using instance types and preferences. These functions can be used in other modules such as CDI Clone, CDI Upload, Snasphots etc.

What this PR does / why we need it:

Backports Windows Server 2022 with vTPM support to cnv-4.20 branch.

Which issue(s) this PR fixes:

Backport of #4761

Special notes for reviewer:

• Cherry-pick had conflicts, manual replication was performed
• Branch-specific adaptation: Used assert_hotplugvolume_nonexist_optional_restart instead of assert_hotplugvolume_nonexist
• All changes from original PR applied successfully
• Original PR: [Storage] Test using Windows VMs should have vTPM - test_hotplug.py #4761
• Co-authored: Claude Code

jira-ticket:

https://redhat.atlassian.net/browse/CNV-51351

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 8849d528-0e83-4a06-bfb1-b412a6dafe21

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ 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

• X
• Mastodon
• Reddit
• LinkedIn

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

[openshift-virtualization-qe-bot-2]

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

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

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
• jpeimer
• myakove
• rnetser
• vsibirsk

Reviewers:

• Ahmad-Hafe
• RoniKishner
• acinko-rh
• dalia-frank
• dshchedr
• ema-aka-young
• geetikakay
• josemacassan
• jpeimer
• kgoldbla
• kshvaika
• rnetser
• vsibirsk

Available Labels

• hold
• verified
• wip
• lgtm
• approve

AI Features

• Cherry-Pick Conflict Resolution: Enabled (claude/claude-opus-4-6[1m])

💡 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

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

[rnetser]

/approve /lgtm

There are a few things that need to be reworked in the main branch and backported. But wouldn't hold this PR for now.

+1

/approve
/lgtm

[acinko-rh]

/approve /lgtm

There are a few things that need to be reworked in the main branch and backported. But wouldn't hold this PR for now.

#5300

@rnetser @jpeimer Created a separate PR for main to fix the names

[acinko-rh]

/check-can-merge

[openshift-virtualization-qe-bot-5]

Clean rebase detected — no code changes compared to previous head (b400434).
The following labels were preserved: verified, approved-jpeimer, commented-jpeimer, lgtm-jpeimer, lgtm-rnetser, commented-rnetser, commented-coderabbitai[bot], approved-rnetser, lgtm-ema-aka-young, commented-acinko-rh.

[acinko-rh]

/retest all

[acinko-rh]

/retest cnv-smoke/validation

[openshift-virtualization-qe-bot]

No cnv-smoke/validation configured for this repository

[Ahmad-Hafe]

/lgtm

[acinko-rh]

/retest all

[acinko-rh]

/retest cnv-smoke

[openshift-virtualization-qe-bot-3]

No cnv-smoke configured for this repository

[rnetser]

/retest cnv-smoke

@acinko-rh currently there is no option to manually re-trigger smoke.
comemnt with /verified cancel and once the label is removed, comment with /verified

[acinko-rh]

/verified cancel

[acinko-rh]

/retest all

[acinko-rh]

/verified

[openshift-virtualization-qe-bot-3]

@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]

Tip

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

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Get current head SHA
HEAD_SHA=$(gh api repos/RedHatQE/openshift-virtualization-tests/pulls/4844 --jq '.head.sha')
echo "HEAD_SHA=$HEAD_SHA"

# Get diff to find correct position for libs/infra/images.py
gh pr diff 4844 --repo RedHatQE/openshift-virtualization-tests -- libs/infra/images.py | head -30

Length of output: 539

---

🏁 Script executed:

#!/bin/bash
HEAD_SHA="95acd1603f09b3b49ea07a8646200dd46413ea8e"

# Get diff for libs/infra/images.py using grep
gh pr diff 4844 --repo RedHatQE/openshift-virtualization-tests 2>/dev/null | awk '/^diff --git a\/libs\/infra\/images\.py/,/^diff --git/' | head -30

echo "=== POST INLINE REVIEW ==="

python3 << 'PYEOF'
import json, subprocess

body = (
    "**Test Execution Plan**\n\n"
    "- **Run smoke tests: False** \u2014 No traced dependency path. "
    "Smoke test files and their conftest.py hierarchy do not import `DOCKER_IMAGE_DIR`, `CONTAINER_DISK_DV_SIZE`, or `get_windows_container_disk_path`.\n"
    "- **Run gating tests: False** \u2014 No gating-marked file imports the changed symbols (`DOCKER_IMAGE_DIR`, `CONTAINER_DISK_DV_SIZE`, or `get_windows_container_disk_path`).\n\n"
    "**Affected tests to run:**\n"
    "- `tests/storage/test_hotplug.py::TestHotPlugWindows` *(tier3)* \u2014 "
    "fixtures refactored to use `create_windows2022_dv_template_from_registry` / `create_windows2022_vm_with_vtpm` (tests/utils.py) "
    "\u2192 `get_windows_container_disk_path` (utilities/os_utils.py) "
    "\u2192 `Images.Windows.DOCKER_IMAGE_DIR` (libs/infra/images.py: `docker/` \u2192 `docker-local/`) "
    "and `Images.Windows.CONTAINER_DISK_DV_SIZE` (newly added `40Gi`)\n"
    "- `utilities/unittests/test_os_utils.py` \u2014 new unit tests for `get_windows_container_disk_path`\n\n"
    "**Suggested command:**\n"
    "```\n"
    "pytest -s -o log_cli=true --jira tests/storage/test_hotplug.py::TestHotPlugWindows\n"
    "```"
)

payload = {
    "commit_id": "95acd1603f09b3b49ea07a8646200dd46413ea8e",
    "event": "COMMENT",
    "body": "",
    "comments": [{"path": "libs/infra/images.py", "position": 6, "body": body}]
}

with open("/tmp/review_payload.json", "w") as f:
    json.dump(payload, f)

result = subprocess.run(
    ["gh", "api", "repos/RedHatQE/openshift-virtualization-tests/pulls/4844/reviews",
     "--method", "POST", "--input", "/tmp/review_payload.json"],
    capture_output=True, text=True
)
print("STDOUT:", result.stdout[:500] if result.stdout else "(empty)")
print("STDERR:", result.stderr[:500] if result.stderr else "(empty)")
print("Return code:", result.returncode)
PYEOF

Length of output: 2983

---

---

[openshift-virtualization-qe-bot-4]

Clean rebase detected — no code changes compared to previous head (95acd16).
The following labels were preserved: verified, approved-jpeimer, commented-jpeimer, lgtm-Ahmad-Hafe, lgtm-jpeimer, lgtm-rnetser, commented-rnetser, commented-coderabbitai[bot], approved-rnetser, lgtm-ema-aka-young, commented-acinko-rh.

[rnetser]

@jpeimer should we still backport it or wait for the updated code in main?

[rnetser]

@jpeimer should we still backport it or wait for the updated code in main?

@jpeimer in case this comment was missed
thanks

[jpeimer]

@jpeimer should we still backport it or wait for the updated code in main?

@jpeimer in case this comment was missed thanks

@rnetser Sorry, missed that. I'm okay with merging it.

[Ahmad-Hafe]

/lgtm

[openshift-virtualization-qe-bot-3]

/retest all

Auto-triggered: Files in this PR were modified by merged PR #5590.

Overlapping files

utilities/constants.py

[Ahmad-Hafe]

/lgtm