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.

Sign up for GitHub

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

[ISSUE-1096] Fix lint and unit test error for resolution to atl-22498 #1098

Merged
merged 3 commits into from
Feb 26, 2024
Merged

[ISSUE-1096] Fix lint and unit test error for resolution to atl-22498 #1098

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
481eeb6
[Issue #1096] - Fix lint error for bug atl-22498
eddiepavkovic Feb 25, 2024
dfacddf
[Issue #1096] - Put code back that returned device if path set
eddiepavkovic Feb 26, 2024
c0a1c50
[ISSUE-1096] - Put back code from previous PR and removed invalid tes…
eddiepavkovic Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pkg/base/linuxutils/lsblk/lsblk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright © 2020 Dell Inc. or its subsidiaries. All Rights Reserved.
Copyright © 2020-2024 Dell Inc. or its subsidiaries. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
eddiepavkovic marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -161,8 +161,13 @@ func (l *LSBLK) GetBlockDevices(device string) ([]BlockDevice, error) {
// Receives an instance of drivecrd.Drive struct
// Returns drive's path based on provided drivecrd.Drive or error if something went wrong
func (l *LSBLK) SearchDrivePath(drive *api.Drive) (string, error) {
// device path might be already set by hwmgr
Copy link
Collaborator

Choose a reason for hiding this comment

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

adding this code back seems violate @prasant123 previous fix code intention. if device is in drive CR, then the device name in driveCR is returned here, this might be a wrong name due to device name change.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

ok i'll remove the test case and put back his orig code.
thanks

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@libzhang - do you have any idea why all the PR checks are no longer on this PR?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I am not sure, maybe there is some bug in the our release branch workflow.

device := drive.Path
if device != "" {
return device, nil
}

device := ""
device = ""
// try to find it with lsblk
lsblkOut, err := l.GetBlockDevices("")
if err != nil {
Expand Down