Merge pull request #1911 from gravitl/story/GRA-822d-2

disallowed hosts removal if nodes still associated
This commit is contained in:
dcarns 2023-01-09 11:46:38 -05:00 committed by GitHub
commit 89bffba30e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -146,15 +146,7 @@ func UpsertHost(h *models.Host) error {
// RemoveHost - removes a given host from server
func RemoveHost(h *models.Host) error {
if len(h.Nodes) > 0 {
for i := range h.Nodes {
id := h.Nodes[i]
n, err := GetNodeByID(id)
if err == nil {
if err = DissasociateNodeFromHost(&n, h); err != nil {
return err // must remove associated nodes before removing a host
}
}
}
return fmt.Errorf("host still has associated nodes")
}
return database.DeleteRecord(database.HOSTS_TABLE_NAME, h.ID.String())
}