Skip to content

Quick fix for wrong machine connections #644

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

Draft
iljarotar wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Quick fix for wrong machine connections #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 cmd/metal-api/internal/datastore/switch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,16 @@ func (rs *RethinkStore) SearchSwitches(q *SwitchSearchQuery, ss *metal.Switches)
return rs.searchEntities(q.generateTerm(rs), ss)
}

// SearchSwitchesConnectedToMachine searches switches that are connected to the given machine.
// SearchSwitchesConnectedToMachine searches switches that are connected to the given machine in the machine's rack.
func (rs *RethinkStore) SearchSwitchesConnectedToMachine(m *metal.Machine) (metal.Switches, error) {
return rs.SearchSwitchesConnectedToMachineInRack(m, &m.RackID)
}

// SearchSwitchesConnectedToMachineInRack search for machine connections in a specific rack or in all racks if rack == nil.
func (rs *RethinkStore) SearchSwitchesConnectedToMachineInRack(m *metal.Machine, rack *string) (metal.Switches, error) {
switches := metal.Switches{}

err := rs.SearchSwitches(&SwitchSearchQuery{RackID: &m.RackID}, &switches)
err := rs.SearchSwitches(&SwitchSearchQuery{RackID: rack}, &switches)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/metal-api/internal/service/machine-service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@ func (r *machineResource) deleteMachine(request *restful.Request, response *rest
return
}

switches, err := r.ds.SearchSwitchesConnectedToMachine(m)
switches, err := r.ds.SearchSwitchesConnectedToMachineInRack(m, nil)
if err != nil {
r.sendError(request, response, defaultError(err))
return
Expand Down
Loading