Skip to content

network tests: add hardware markers wherever there is special_infra #1191

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.

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
merged 1 commit into from
Jun 17, 2025

Conversation

servolkov
Copy link
Contributor

@servolkov servolkov commented Jun 10, 2025

What this PR does / why we need it:

We strive to remove special_infra marker for all tests, this PR adds the use of available network hardware markers wherever there is a special_infra marker and guarantees an interchangeability. New markers are not needed in this case, we already have sriov and jumbo_frame.

Which issue(s) this PR fixes:
Special notes for reviewer:

After this PR we will have an interchangeability of special_infra marker and network hardware markers:

$ pytest --collect-only -m special_infra tests/network/
.....
collected 201 items / 150 deselected / 51 selected                                                                                                                          

<Dir openshift-virtualization-tests>
  <Package tests>
    <Package network>
      <Package checkup_framework>
        <Module test_checkup_framework.py>
          <Function test_disconnected_network_sriov_job_failure>
          <Class TestCheckupLatencySriovNetwork>
            <Function test_basic_configmap_sriov_network>
            <Function test_basic_configmap_sriov_network_on_same_node>
            <Function test_two_configmaps_and_jobs_with_success_sriov_network>
            <Function test_concurrent_checkup_jobs_sriov_network>
            <Function test_job_failure_sriov_network_nonexistent_configmap_env>
            <Function test_job_failure_sriov_network>
            <Function test_configmap_error_job_failure_sriov_network_nonexistent_nad>
            <Function test_configmap_error_job_failure_sriov_network_nonexistent_namespace>
            <Function test_configmap_error_job_failure_sriov_network_one_second_timeout>
            <Function test_configmap_error_job_failure_sriov_network_zero_milliseconds>
            <Function test_configmap_error_job_failure_sriov_network_nonexistent_node>
      <Package jumbo_frame>
        <Module test_bond.py>
          <Class TestBondJumboFrame>
            <Function test_connectivity_over_linux_bond_large_mtu[#linux-bridge#]>
            <Function test_negative_mtu_linux_bond[#linux-bridge#]>
            <Function test_connectivity_over_linux_bond_large_mtu[#ovs-bridge#]>
            <Function test_negative_mtu_linux_bond[#ovs-bridge#]>
        <Module test_bridge.py>
          <Class TestJumboFrameBridge>
            <Function test_connectivity_over_linux_bridge_large_mtu[#linux-bridge#]>
            <Function test_negative_mtu_linux_bridge[#linux-bridge#]>
            <Function test_connectivity_over_linux_bridge_large_mtu[#ovs-bridge#]>
            <Function test_negative_mtu_linux_bridge[#ovs-bridge#]>
        <Module test_pod_network_ovn.py>
          <Class TestJumboPodNetworkOnly>
            <Function test_jumbo_traffic_over_pod_network_separate_nodes>
            <Function test_jumbo_traffic_over_pod_network_same_node>
            <Function test_jumbo_negative_traffic_over_pod_network_with_oversized_traffic>
          <Class TestJumboPodNetworkAndSecondary>
            <Function test_jumbo_traffic_over_pod_network_while_secondary_traffic_flows>
      <Package l2_bridge>
        <Module test_bridge_nic_hot_plug.py>
          <Class TestHotPlugInterfaceToVmWithOnlyPrimaryInterface>
            <Function test_vmi_spec_updated_with_hot_plugged_interface>
            <Function test_multiple_interfaces_hot_plugged>
            <Function test_basic_connectivity_of_hot_plugged_interface>
            <Function test_basic_connectivity_of_hot_plugged_interface_after_second_migration>
            <Function test_mac_of_hot_plugged_interface_from_kubemacpool>
            <Function test_primary_interface_not_modified_after_hot_plug>
            <Function test_connectivity_of_hot_plugged_jumbo_interface>
            <Function test_hot_plug_flat_overlay_network>
            <Function test_mac_of_hot_plugged_interface_returned_to_kubemacpool_after_vm_delete>
            <Function test_connectivity_of_hot_plugged_sriov_interface>
          <Class TestHotPlugInterfaceToVmWithSecondaryInterface>
            <Function test_basic_connectivity_vm_with_secondary_and_hot_plugged_interfaces[eth2]>
            <Function test_basic_connectivity_vm_with_secondary_and_hot_plugged_interfaces[eth1]>
            <Function test_hot_unplugged_interface_removed_from_vmi_spec>
            <Function test_basic_connectivity_vm_with_secondary_after_hot_unplug>
            <Function test_mac_of_hot_plugged_interface_returned_to_kubemacpool_after_hot_unplug>
            <Function test_hot_unplug_secondary_interface_from_setup>
      <Package sriov>
        <Module test_sriov.py>
          <Class TestPingConnectivity>
            <Function test_sriov_basic_connectivity>
            <Function test_sriov_custom_mtu_connectivity>
            <Function test_sriov_basic_connectivity_vlan>
            <Function test_sriov_no_connectivity_no_vlan_to_vlan>
            <Function test_sriov_interfaces_post_reboot[1]>
            <Function test_sriov_interfaces_post_reboot[2]>
            <Function test_sriov_interfaces_post_reboot[3]>
            <Function test_sriov_interfaces_post_reboot[4]>
            <Function test_sriov_interfaces_post_reboot[5]>
          <Class TestSriovLiveMigration>
            <Function test_sriov_migration>
          <Class TestSriovDpdk>
            <Function test_sriov_dpdk_testpmd>
.....

and

$ pytest --collect-only -m 'jumbo_frame or sriov' tests/network/
.....
collected 201 items / 150 deselected / 51 selected                                                                                                                          

<Dir openshift-virtualization-tests>
  <Package tests>
    <Package network>
      <Package checkup_framework>
        <Module test_checkup_framework.py>
          <Function test_disconnected_network_sriov_job_failure>
          <Class TestCheckupLatencySriovNetwork>
            <Function test_basic_configmap_sriov_network>
            <Function test_basic_configmap_sriov_network_on_same_node>
            <Function test_two_configmaps_and_jobs_with_success_sriov_network>
            <Function test_concurrent_checkup_jobs_sriov_network>
            <Function test_job_failure_sriov_network_nonexistent_configmap_env>
            <Function test_job_failure_sriov_network>
            <Function test_configmap_error_job_failure_sriov_network_nonexistent_nad>
            <Function test_configmap_error_job_failure_sriov_network_nonexistent_namespace>
            <Function test_configmap_error_job_failure_sriov_network_one_second_timeout>
            <Function test_configmap_error_job_failure_sriov_network_zero_milliseconds>
            <Function test_configmap_error_job_failure_sriov_network_nonexistent_node>
      <Package jumbo_frame>
        <Module test_bond.py>
          <Class TestBondJumboFrame>
            <Function test_connectivity_over_linux_bond_large_mtu[#linux-bridge#]>
            <Function test_negative_mtu_linux_bond[#linux-bridge#]>
            <Function test_connectivity_over_linux_bond_large_mtu[#ovs-bridge#]>
            <Function test_negative_mtu_linux_bond[#ovs-bridge#]>
        <Module test_bridge.py>
          <Class TestJumboFrameBridge>
            <Function test_connectivity_over_linux_bridge_large_mtu[#linux-bridge#]>
            <Function test_negative_mtu_linux_bridge[#linux-bridge#]>
            <Function test_connectivity_over_linux_bridge_large_mtu[#ovs-bridge#]>
            <Function test_negative_mtu_linux_bridge[#ovs-bridge#]>
        <Module test_pod_network_ovn.py>
          <Class TestJumboPodNetworkOnly>
            <Function test_jumbo_traffic_over_pod_network_separate_nodes>
            <Function test_jumbo_traffic_over_pod_network_same_node>
            <Function test_jumbo_negative_traffic_over_pod_network_with_oversized_traffic>
          <Class TestJumboPodNetworkAndSecondary>
            <Function test_jumbo_traffic_over_pod_network_while_secondary_traffic_flows>
      <Package l2_bridge>
        <Module test_bridge_nic_hot_plug.py>
          <Class TestHotPlugInterfaceToVmWithOnlyPrimaryInterface>
            <Function test_vmi_spec_updated_with_hot_plugged_interface>
            <Function test_multiple_interfaces_hot_plugged>
            <Function test_basic_connectivity_of_hot_plugged_interface>
            <Function test_basic_connectivity_of_hot_plugged_interface_after_second_migration>
            <Function test_mac_of_hot_plugged_interface_from_kubemacpool>
            <Function test_primary_interface_not_modified_after_hot_plug>
            <Function test_connectivity_of_hot_plugged_jumbo_interface>
            <Function test_hot_plug_flat_overlay_network>
            <Function test_mac_of_hot_plugged_interface_returned_to_kubemacpool_after_vm_delete>
            <Function test_connectivity_of_hot_plugged_sriov_interface>
          <Class TestHotPlugInterfaceToVmWithSecondaryInterface>
            <Function test_basic_connectivity_vm_with_secondary_and_hot_plugged_interfaces[eth2]>
            <Function test_basic_connectivity_vm_with_secondary_and_hot_plugged_interfaces[eth1]>
            <Function test_hot_unplugged_interface_removed_from_vmi_spec>
            <Function test_basic_connectivity_vm_with_secondary_after_hot_unplug>
            <Function test_mac_of_hot_plugged_interface_returned_to_kubemacpool_after_hot_unplug>
            <Function test_hot_unplug_secondary_interface_from_setup>
      <Package sriov>
        <Module test_sriov.py>
          <Class TestPingConnectivity>
            <Function test_sriov_basic_connectivity>
            <Function test_sriov_custom_mtu_connectivity>
            <Function test_sriov_basic_connectivity_vlan>
            <Function test_sriov_no_connectivity_no_vlan_to_vlan>
            <Function test_sriov_interfaces_post_reboot[1]>
            <Function test_sriov_interfaces_post_reboot[2]>
            <Function test_sriov_interfaces_post_reboot[3]>
            <Function test_sriov_interfaces_post_reboot[4]>
            <Function test_sriov_interfaces_post_reboot[5]>
          <Class TestSriovLiveMigration>
            <Function test_sriov_migration>
          <Class TestSriovDpdk>
            <Function test_sriov_dpdk_testpmd>
.....
jira-ticket: https://issues.redhat.com/browse/CNV-62769

Summary by CodeRabbit

  • Tests
    • Updated test markers to include additional scenarios for jumbo frame support and special infrastructure conditions.

Copy link

coderabbitai bot commented Jun 10, 2025

Walkthrough

The global pytest markers in the test module were simplified by removing special_infra from the global list and retaining only usefixtures("label_schedulable_nodes"). The test method test_connectivity_of_hot_plugged_jumbo_interface was explicitly decorated with special_infra and jumbo_frame markers. No functional changes were made.

Changes

File(s) Change Summary
tests/network/l2_bridge/test_bridge_nic_hot_plug.py Simplified global pytest markers to only usefixtures("label_schedulable_nodes"); added special_infra and jumbo_frame markers to a specific test method

Suggested labels

verified, can-be-merged, lgtm-rnetser, lgtm-EdDev, approved-EdDev, approved-rnetser

Suggested reviewers

  • EdDev
  • Anatw
  • sbahar619
  • rnetser

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between b0a1558 and 5e73d86.

📒 Files selected for processing (1)
  • tests/network/l2_bridge/test_bridge_nic_hot_plug.py (2 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • tests/network/l2_bridge/test_bridge_nic_hot_plug.py
⏰ Context from checks skipped due to timeout of 90000ms (5)
  • GitHub Check: can-be-merged
  • GitHub Check: can-be-merged
  • GitHub Check: can-be-merged
  • GitHub Check: tox
  • GitHub Check: build-container
✨ Finishing Touches
  • 📝 Generate Docstrings

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
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@openshift-virtualization-qe-bot-2

Report bugs in Issues

The following are automatically added:

  • Add reviewers from OWNER file (in the root of the repository) under reviewers section.
  • Set PR size label.
  • New issue is created for the PR. (Closed when PR is merged/closed)
  • Run pre-commit if .pre-commit-config.yaml exists in the repo.

Available user actions:

  • To mark PR as WIP comment /wip to the PR, To remove it from the PR comment /wip cancel to the PR.
  • To block merging of PR comment /hold, To un-block merging of PR comment /hold cancel.
  • To mark PR as verified comment /verified to the PR, to un-verify comment /verified cancel to the PR.
    verified label removed on each new commit push.
  • To cherry pick a merged PR comment /cherry-pick <target branch to cherry-pick to> in the PR.
    • Multiple target branches can be cherry-picked, separated by spaces. (/cherry-pick branch1 branch2)
    • Cherry-pick will be started when PR is merged
  • To build and push container image command /build-and-push-container in the PR (tag will be the PR number).
    • You can add extra args to the Podman build command
      • Example: /build-and-push-container --build-arg OPENSHIFT_PYTHON_WRAPPER_COMMIT=<commit_hash>
  • To add a label by comment use /<label name>, to remove, use /<label name> cancel
  • To assign reviewers based on OWNERS file use /assign-reviewers
  • To check if PR can be merged use /check-can-merge
  • to assign reviewer to PR use /assign-reviewer @<reviewer>

PR will be approved when the following conditions are met:

  • /approve from one of the approvers.
  • Minimum number of required /lgtm (2) is met.
Approvers and Reviewers
  • Approvers:

    • EdDev
  • Reviewers:

    • Anatw
    • EdDev
    • sbahar619
    • yossisegev
Supported /retest check runs
  • /retest tox: Retest tox
  • /retest build-container: Retest build-container
  • /retest all: Retest all
Supported labels
  • hold
  • verified
  • wip
  • lgtm
  • approve

Copy link
Contributor

@EdDev EdDev left a comment

Choose a reason for hiding this comment

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

The ref ticket talks about adding markers but not removing anything at this stage.
Removing markers can be done only after the test infra (i.e. the execution of the tests are no longer using the marker in question).

@rnetser , can you please confirm?

Two other points:

  • The commit message needs to include a good description, especially about the reasoning and intent. The text in the PR description is good and can be duplicated to the commit.
  • The commit message better include a sign-off line [1].

@rnetser , I think sign-off needs to be enforce [2].

[1] https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-commit-signoff-policy-for-your-repository
[2] https://github.com/apps/dco

@rnetser
Copy link
Collaborator

rnetser commented Jun 11, 2025

The ref ticket talks about adding markers but not removing anything at this stage. Removing markers can be done only after the test infra (i.e. the execution of the tests are no longer using the marker in question).

@rnetser , can you please confirm?
Yes, we have a discussion about this in slack. Devops need to support this before we merge this PR

Two other points:

  • The commit message needs to include a good description, especially about the reasoning and intent. The text in the PR description is good and can be duplicated to the commit.
  • The commit message better include a sign-off line [1].

@rnetser , I think sign-off needs to be enforce [2].
+1

[1] https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-commit-signoff-policy-for-your-repository [2] https://github.com/apps/dco

We strive to remove special_infra marker for all tests, this PR adds the use of available network hardware markers wherever there is a special_infra marker and guarantees an interchangeability. New markers are not needed in this case, we already have sriov and jumbo_frame.
jira-ticket: https://issues.redhat.com/browse/CNV-62769

Signed-off-by: Sergei Volkov <[email protected]>
@servolkov
Copy link
Contributor Author

/verified

@rnetser
Copy link
Collaborator

rnetser commented Jun 17, 2025

/approve
/lgtm

@rnetser rnetser merged commit fb634af into RedHatQE:main Jun 17, 2025
8 checks passed
@openshift-virtualization-qe-bot-3

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

rnetser pushed a commit to rnetser/openshift-virtualization-tests that referenced this pull request Jun 19, 2025
…edHatQE#1191)

We strive to remove special_infra marker for all tests, this PR adds the use of available network hardware markers wherever there is a special_infra marker and guarantees an interchangeability. New markers are not needed in this case, we already have sriov and jumbo_frame.
jira-ticket: https://issues.redhat.com/browse/CNV-62769

Signed-off-by: Sergei Volkov <[email protected]>
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