Skip to content

controller: fix LSP gc when no ls key in external-ids #6103

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

Merged
zhangzujian merged 2 commits into from
Dec 25, 2025
Merged

controller: fix LSP gc when no ls key in external-ids #6103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6f44a7
controller: fix LSP gc when no ls key in external-ids
zhangzujian Dec 25, 2025
bf9d0e1
fix ut
zhangzujian Dec 25, 2025
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
16 changes: 9 additions & 7 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 @@ -810,13 +810,15 @@ func (c *OVNNbClient) CreateLogicalSwitchPortOp(lsp *ovnnb.LogicalSwitchPort, ls

// DeleteLogicalSwitchPortOp create operations which delete logical switch port
func (c *OVNNbClient) DeleteLogicalSwitchPortOp(lsName, lspUUID string) ([]ovsdb.Operation, error) {
exist, err := c.LogicalSwitchExists(lsName)
if err != nil {
klog.Error(err)
return nil, err
}
if !exist {
lsName = ""
if lsName != "" {
exist, err := c.LogicalSwitchExists(lsName)
if err != nil {
klog.Error(err)
return nil, err
}
if !exist {
lsName = ""
}
}
klog.Infof("delete logical switch port with UUID %s from logical switch %q", lspUUID, lsName)
ops, err := c.LogicalSwitchUpdatePortOp(lsName, lspUUID, ovsdb.MutateOperationDelete)
Expand Down
2 changes: 1 addition & 1 deletion pkg/ovs/ovn-nb-logical_switch_port_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1812,7 +1812,7 @@ func (suite *OvnClientTestSuite) testDeleteLogicalSwitchPortOp() {

t.Run("failed client delete nonexistent logical switch port", func(t *testing.T) {
ops, err := failedNbClient.DeleteLogicalSwitchPortOp("", "")
require.Error(t, err)
require.NoError(t, err)
require.Nil(t, ops)
_, err = failedNbClient.DeleteLogicalSwitchPortOp("", string(uuid.NewUUID()))
require.Error(t, err)
Expand Down
Loading