Skip to content
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

CNV-38360: Fix NIC hot-unplug alert message #1811

Merged

Conversation

pcbailey
Copy link
Member

@pcbailey pcbailey commented Feb 21, 2024

📝 Description

This PR fixes the alert message shown when a NIC is deleted as well as the logic dictating when the alert is shown. The alert is to be shown only when a hot-plug NIC is being deleted while the VM is running.

Jira: https://issues.redhat.com/browse/CNV-38360

🎥 Screenshots

Before

Hot-plug NIC

fix-nic-unplug-message--hot-plug-nic--BEFORE-2024-02-20_22-09

Default NIC

fix-nic-unplug-message--default-nic--BEFORE-2024-02-20_22-10

After

Hot-plug NIC

fix-nic-unplug-message--hot-plug-nic--AFTER-2024-02-20_22-00

Default NIC

fix-nic-unplug-message--default-nic--AFTER-2024-02-20_22-00

@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Feb 21, 2024

@pcbailey: This pull request references CNV-38360 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.16.0" version, but no target version was set.

In response to this:

📝 Description

This PR fixes the alert message shown when a NIC is deleted as well as the logic dictating when the alert is shown. The alert is to be shown only when a hot-plug NIC is being deleted while the VM is running.

Jira: https://issues.redhat.com/browse/CNV-38360

🎥 Screenshots

Before

Hot-plug NIC

fix-nic-unplug-message--hot-plug-nic--BEFORE-2024-02-20_22-09

Def

fix-nic-unplug-message--default-nic--BEFORE-2024-02-20_22-10
ault NIC

After

Ho

fix-nic-unplug-message--hot-plug-nic--AFTER-2024-02-20_22-00
t-plug NIC

Default NIC

fix-nic-unplug-message--default-nic--AFTER-2024-02-20_22-00

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the approved This issue is something we want to fix label Feb 21, 2024
@metalice
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Passed code review, ready for merge label Feb 27, 2024
Copy link
Contributor

openshift-ci bot commented Feb 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: metalice, pcbailey

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@pcbailey
Copy link
Member Author

/retest

@openshift-merge-bot openshift-merge-bot bot merged commit 2ee1ef3 into kubevirt-ui:main Feb 28, 2024
9 checks passed
@gouyang
Copy link
Member

gouyang commented Mar 25, 2024

/cherry-pick release-4.15

@gouyang
Copy link
Member

gouyang commented Mar 25, 2024

/cherry-pick release-4.14

@openshift-cherrypick-robot
Copy link
Collaborator

@gouyang: new pull request created: #1854

In response to this:

/cherry-pick release-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot
Copy link
Collaborator

@gouyang: #1811 failed to apply on top of branch "release-4.14":

Applying: Fix NIC hot-unplug message
Using index info to reconstruct a base tree...
M	locales/en/plugin__kubevirt-plugin.json
M	src/views/virtualmachines/details/tabs/configuration/network/components/list/NetworkInterfaceActions.tsx
Falling back to patching base and 3-way merge...
Auto-merging src/views/virtualmachines/details/tabs/configuration/network/components/list/NetworkInterfaceActions.tsx
CONFLICT (content): Merge conflict in src/views/virtualmachines/details/tabs/configuration/network/components/list/NetworkInterfaceActions.tsx
Auto-merging locales/en/plugin__kubevirt-plugin.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix NIC hot-unplug message
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved This issue is something we want to fix jira/valid-reference lgtm Passed code review, ready for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants