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

fix lsp deletion failure when external-ids:ls is empty #2544

Merged
merged 1 commit into from
Mar 23, 2023
Merged

fix lsp deletion failure when external-ids:ls is empty #2544

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
26 changes: 26 additions & 0 deletions pkg/ovs/ovn-nb-logical_switch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/ovn-org/libovsdb/model"
"github.com/ovn-org/libovsdb/ovsdb"
"k8s.io/klog/v2"

"github.com/kubeovn/kube-ovn/pkg/ovsdb/ovnnb"
"github.com/kubeovn/kube-ovn/pkg/util"
Expand Down Expand Up @@ -237,6 +238,31 @@ func (c *ovnClient) LogicalSwitchUpdatePortOp(lsName string, lspUUID string, op
return nil, nil
}

if lsName == "" {
lsList, err := c.ListLogicalSwitch(false, func(ls *ovnnb.LogicalSwitch) bool {
return util.ContainsString(ls.Ports, lspUUID)
})
if err != nil {
klog.Error(err)
return nil, fmt.Errorf("failed to list LS by LSP UUID %s: %v", lspUUID, err)
}
if len(lsList) == 0 {
err = fmt.Errorf("no LS found for LSP %s", lspUUID)
klog.Error(err)
return nil, err
}
if len(lsList) != 1 {
lsNames := make([]string, len(lsList))
for _, ls := range lsList {
lsNames = append(lsNames, ls.Name)
}
err = fmt.Errorf("multiple LS found for LSP %s: %s", lspUUID, strings.Join(lsNames, ", "))
klog.Error(err)
return nil, err
}
lsName = lsList[0].Name
}

mutation := func(ls *ovnnb.LogicalSwitch) *model.Mutation {
mutation := &model.Mutation{
Field: &ls.Ports,
Expand Down
6 changes: 1 addition & 5 deletions pkg/ovs/ovn-nb-logical_switch_port.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,12 +575,8 @@ func (c *ovnClient) DeleteLogicalSwitchPortOp(lspName string) ([]ovsdb.Operation
return nil, nil
}

lsName, ok := lsp.ExternalIDs[logicalSwitchKey]
if !ok {
return nil, fmt.Errorf("no %s exist in lsp's external_ids", logicalSwitchKey)
}

// remove logical switch port from logical switch
lsName := lsp.ExternalIDs[logicalSwitchKey]
lspRemoveOp, err := c.LogicalSwitchUpdatePortOp(lsName, lsp.UUID, ovsdb.MutateOperationDelete)
if err != nil {
return nil, fmt.Errorf("generate operations for removing port %s from logical switch %s: %v", lspName, lsName, err)
Expand Down