diff --git a/pkg/ovs/ovn-nb-logical_switch_port.go b/pkg/ovs/ovn-nb-logical_switch_port.go index 7ee668b186d..595248720c9 100644 --- a/pkg/ovs/ovn-nb-logical_switch_port.go +++ b/pkg/ovs/ovn-nb-logical_switch_port.go @@ -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) diff --git a/pkg/ovs/ovn-nb-logical_switch_port_test.go b/pkg/ovs/ovn-nb-logical_switch_port_test.go index d6a1d33db13..a238399bda7 100644 --- a/pkg/ovs/ovn-nb-logical_switch_port_test.go +++ b/pkg/ovs/ovn-nb-logical_switch_port_test.go @@ -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)