fix: not update lsp into another ls

Signed-off-by: bobz965 <[email protected]>
kubeovn · Dec 4, 2024 · 7e7adaf · 7e7adaf
1 parent e642eef
commit 7e7adaf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/pkg/ovs/ovn-nb-logical_switch.go b/pkg/ovs/ovn-nb-logical_switch.go
@@ -299,7 +299,8 @@ func (c *OVNNbClient) LogicalSwitchUpdatePortOp(lsName, lspUUID string, op ovsdb
 		return nil, nil
 	}
 
-	if lsName == "" && op == ovsdb.MutateOperationDelete {
+	if op == ovsdb.MutateOperationDelete {
+		// given ls for deleting lsp is not always real
 		lsList, err := c.ListLogicalSwitch(false, func(ls *ovnnb.LogicalSwitch) bool {
 			return slices.Contains(ls.Ports, lspUUID)
 		})

diff --git a/pkg/ovs/ovn-nb-logical_switch_port.go b/pkg/ovs/ovn-nb-logical_switch_port.go
@@ -105,9 +105,14 @@ func (c *OVNNbClient) CreateLogicalSwitchPort(lsName, lspName, ip, mac, podName,
 				return fmt.Errorf("failed to update logical switch port %s: %w", lspName, err)
 			}
 			return nil
-		}
-		if ops, err = c.LogicalSwitchUpdatePortOp(existingLsp.ExternalIDs[logicalSwitchKey], existingLsp.UUID, ovsdb.MutateOperationDelete); err != nil {
+		} else {
+			// delete lsp from the old logical switch
+			err := fmt.Errorf("logical switch port %s already exists in old logical switch %s, delete it", lspName, existingLsp.ExternalIDs[logicalSwitchKey])
 			klog.Error(err)
+			if err := c.DeleteLogicalSwitchPort(lspName); err != nil {
+				klog.Error(err)
+			}
+			// enqueue to re-create lsp in the new logical switch
 			return err
 		}
 	}

diff --git a/pkg/ovs/ovn-nb-logical_switch_port_test.go b/pkg/ovs/ovn-nb-logical_switch_port_test.go
@@ -223,7 +223,7 @@ func (suite *OvnClientTestSuite) testCreateLogicalSwitchPort() {
 		err = nbClient.CreateLogicalSwitchPort(lsName, lspName, ips, mac, podName, podNamespace, true, sgs, vips, true, dhcpUUIDs, vpcName)
 		require.NoError(t, err)
 		err = nbClient.CreateLogicalSwitchPort(lsName2, lspName, ips, mac, podName, podNamespace, true, sgs, vips, true, dhcpUUIDs, vpcName)
-		require.NoError(t, err)
+		require.Error(t, err)
 	})
 
 	t.Run("failed client create logical switch port op error", func(t *testing.T) {