u2o keep src flow should consider multi-vlan on the same provider (#5385)

Signed-off-by: clyi <clyi@alauda.io>

Author: changluyi

pkg/daemon/controller_linux.go

@@ -792,7 +792,7 @@ func (c *Controller) GetProviderInfoFromSubnet(subnet *kubeovnv1.Subnet) (bridge
 	return bridgeName, chassisMac, nil
 }
 
-func HandleU2OForPod(ovsClient *ovsutil.Client, pod *v1.Pod, bridgeName, chassisMac string, isAdd bool) error {
+func HandleU2OForPod(ovsClient *ovsutil.Client, pod *v1.Pod, bridgeName, chassisMac, subnetName string, isAdd bool) error {
 	if pod == nil {
 		return errors.New("pod is nil")
 	}
@@ -806,9 +806,9 @@ func HandleU2OForPod(ovsClient *ovsutil.Client, pod *v1.Pod, bridgeName, chassis
 		for _, podIP := range podIPs {
 			var err error
 			if isAdd {
-				err = ovs.AddOrUpdateU2OKeepSrcMac(ovsClient, bridgeName, podIP, podMac, chassisMac)
+				err = ovs.AddOrUpdateU2OKeepSrcMac(ovsClient, bridgeName, podIP, podMac, chassisMac, subnetName)
 			} else {
-				err = ovs.DeleteU2OKeepSrcMac(ovsClient, bridgeName, podIP, chassisMac)
+				err = ovs.DeleteU2OKeepSrcMac(ovsClient, bridgeName, podIP, chassisMac, subnetName)
 			}
 
 			if err != nil {
@@ -841,7 +841,7 @@ func (c *Controller) HandleU2OForSubnet(subnet *kubeovnv1.Subnet, isAdd bool) er
 		if pod.Annotations[util.LogicalSwitchAnnotation] != subnet.Name {
 			continue
 		}
-		if err := HandleU2OForPod(c.ovsClient, pod, bridgeName, chassisMac, isAdd); err != nil {
+		if err := HandleU2OForPod(c.ovsClient, pod, bridgeName, chassisMac, subnet.Name, isAdd); err != nil {
 			klog.Error(err)
 			return err
 		}
@@ -899,7 +899,7 @@ func (c *Controller) handleUpdatePod(key string) error {
 				klog.Error(err)
 				return err
 			}
-			if err := HandleU2OForPod(c.ovsClient, pod, bridgeName, chassisMac, true); err != nil {
+			if err := HandleU2OForPod(c.ovsClient, pod, bridgeName, chassisMac, subnet.Name, true); err != nil {
 				klog.Error(err)
 				return err
 			}
@@ -1007,7 +1007,7 @@ func (c *Controller) handleDeletePod(key string) error {
 		return err
 	}
 
-	if err := HandleU2OForPod(c.ovsClient, pod, bridgeName, chassisMac, false); err != nil {
+	if err := HandleU2OForPod(c.ovsClient, pod, bridgeName, chassisMac, subnet.Name, false); err != nil {
 		klog.Error(err)
 		return err
 	}

pkg/ovs/ovs-ofctl.go

@@ -3,6 +3,7 @@ package ovs
 import (
 	"fmt"
 	"net"
+	"strconv"
 
 	ovs "github.com/digitalocean/go-openvswitch/ovs"
 	v1 "k8s.io/api/core/v1"
@@ -12,6 +13,29 @@ import (
 	"github.com/kubeovn/kube-ovn/pkg/util"
 )
 
+func getOfportByPeer(peer string) (int, error) {
+	// ovs-vsctl find interface options:peer="<peer>"
+	ifaceNames, err := ovsFind("Interface", "name", fmt.Sprintf(`options:peer="%s"`, peer))
+	if err != nil {
+		return -1, fmt.Errorf("failed to find interface with peer %s: %w", peer, err)
+	}
+	if len(ifaceNames) == 0 {
+		return -1, fmt.Errorf("no interface found with peer %s", peer)
+	}
+	if len(ifaceNames) > 1 {
+		// This should not happen for patch ports
+		klog.Warningf("multiple interfaces found with peer %s: %v", peer, ifaceNames)
+	}
+	ifaceName := ifaceNames[0]
+
+	ofportStr, err := ovsGet("Interface", ifaceName, "ofport", "")
+	if err != nil {
+		return -1, fmt.Errorf("failed to get ofport for interface %s: %w", ifaceName, err)
+	}
+
+	return strconv.Atoi(ofportStr)
+}
+
 func AddOrUpdateUnderlaySubnetSvcLocalOpenFlow(client *ovs.Client, bridgeName, lbServiceIP, protocol, dstMAC, underlayNic string, lbServicePort uint16) error {
 	isIPv6 := util.CheckProtocol(lbServiceIP) == kubeovnv1.ProtocolIPv6
 	var inPortID, outPortID int
@@ -143,20 +167,20 @@ func DeleteUnderlaySubnetSvcLocalOpenFlow(client *ovs.Client, bridgeName, lbServ
 	return nil
 }
 
-func AddOrUpdateU2OKeepSrcMac(client *ovs.Client, bridgeName, podIP, podMac, chassisMac string) error {
+func AddOrUpdateU2OKeepSrcMac(client *ovs.Client, bridgeName, podIP, podMac, chassisMac, subnetName string) error {
 	var localnetPatchPortID int
 	var podMacAddr net.HardwareAddr
 	var err error
 	var matchs []ovs.Match
 	var protocolType ovs.Protocol
 	isIPv6 := util.CheckProtocol(podIP) == kubeovnv1.ProtocolIPv6
 
-	portInfo, err := client.OpenFlow.DumpPort(bridgeName, "patch-localnet.")
+	peer := fmt.Sprintf("patch-br-int-to-localnet.%s", subnetName)
+	localnetPatchPortID, err = getOfportByPeer(peer)
 	if err != nil {
-		klog.Errorf("failed to dump bridge %s port %s: %v", bridgeName, "patch-localnet.", err)
+		klog.Errorf("failed to get ofport for peer %s: %v", peer, err)
 		return err
 	}
-	localnetPatchPortID = portInfo.PortID
 
 	podMacAddr, err = net.ParseMAC(podMac)
 	if err != nil {
@@ -215,19 +239,19 @@ func AddOrUpdateU2OKeepSrcMac(client *ovs.Client, bridgeName, podIP, podMac, cha
 	return client.OpenFlow.AddFlow(bridgeName, flow)
 }
 
-func DeleteU2OKeepSrcMac(client *ovs.Client, bridgeName, podIP, chassisMac string) error {
+func DeleteU2OKeepSrcMac(client *ovs.Client, bridgeName, podIP, chassisMac, subnetName string) error {
 	var localnetPatchPortID int
 	var err error
 	var matchs []ovs.Match
 	var protocolType ovs.Protocol
 	isIPv6 := util.CheckProtocol(podIP) == kubeovnv1.ProtocolIPv6
 
-	portInfo, err := client.OpenFlow.DumpPort(bridgeName, "patch-localnet.")
+	peer := fmt.Sprintf("patch-br-int-to-localnet.%s", subnetName)
+	localnetPatchPortID, err = getOfportByPeer(peer)
 	if err != nil {
-		klog.Errorf("failed to dump bridge %s port %s: %v", bridgeName, "patch-localnet.", err)
+		klog.Errorf("failed to get ofport for peer %s: %v", peer, err)
 		return err
 	}
-	localnetPatchPortID = portInfo.PortID
 
 	if isIPv6 {
 		protocolType = ovs.ProtocolIPv6