Remove tap interface filtering - return all port mappings

Author: yrkurapati

ovs/openflow.go

@@ -23,7 +23,6 @@ import (
 	"io"
 	"regexp"
 	"strconv"
-	"strings"
 )
 
 var (
@@ -337,8 +336,7 @@ func (o *OpenFlowService) DumpAggregate(bridge string, flow *MatchFlow) (*FlowSt
 }
 
 // DumpPortMappings retrieves port mappings (ofport and MAC address) for all
-// tap interfaces and the LOCAL port from the specified bridge. The output is
-// parsed from 'ovs-ofctl show' command.
+// interfaces from the specified bridge. The output is parsed from 'ovs-ofctl show' command.
 func (o *OpenFlowService) DumpPortMappings(bridge string) (map[string]*PortMapping, error) {
 	args := []string{"show", bridge}
 	args = append(args, o.c.ofctlFlags...)
@@ -360,11 +358,6 @@ func (o *OpenFlowService) DumpPortMappings(bridge string) (map[string]*PortMappi
 		}
 
 		interfaceName := string(matches[2])
-		// Filter: only include interfaces starting with "tap" or "LOCAL"
-		if !strings.HasPrefix(interfaceName, "tap") && interfaceName != "LOCAL" {
-			continue
-		}
-
 		ofport, err := strconv.Atoi(string(matches[1]))
 		if err != nil {
 			// Skip malformed ofport numbers
@@ -405,7 +398,7 @@ var (
 	//dumpAggregatePrefix = []byte("NXST_AGGREGATE reply")
 
 	// portMappingPattern matches port lines from 'ovs-ofctl show' output.
-	// Pattern matches: " 7(tapext10396233): addr:fe:4f:76:09:88:2b"
+	// Pattern matches: " 7(interface1): addr:fe:4f:76:09:88:2b"
 	// or " 65534(LOCAL): addr:fe:4f:76:09:88:2b"
 	portMappingPattern = regexp.MustCompile(`^\s*(\d+)\(([^)]+)\):\s*addr:([a-fA-F0-9:]+)`)
 )

ovs/openflow_test.go

@@ -1418,26 +1418,30 @@ func mustVerifyFlowBundle(t *testing.T, stdin io.Reader, flows []*Flow, matchFlo
 
 func TestClientOpenFlowDumpPortMappingsOK(t *testing.T) {
 	want := map[string]*PortMapping{
-		"tapext10396233": {
+		"interface1": {
 			OfPort:     7,
 			MACAddress: "fe:4f:76:09:88:2b",
 		},
-		"tapext12716181": {
+		"interface2": {
 			OfPort:     8,
 			MACAddress: "fe:be:7b:0d:53:d8",
 		},
-		"tapext10864673": {
+		"interface3": {
 			OfPort:     9,
 			MACAddress: "fe:b6:4c:d5:40:79",
 		},
-		"tapint10396233": {
+		"interface4": {
 			OfPort:     20,
 			MACAddress: "fe:cf:a6:90:30:29",
 		},
 		"LOCAL": {
 			OfPort:     65534,
 			MACAddress: "fe:74:0f:80:cf:9a",
 		},
+		"eth0": {
+			OfPort:     1,
+			MACAddress: "aa:bb:cc:dd:ee:ff",
+		},
 	}
 
 	bridge := "br0"
@@ -1460,22 +1464,22 @@ OFPT_FEATURES_REPLY (xid=0x2): dpid:0000000000000001
 n_tables:254, n_buffers:256
 capabilities: FLOW_STATS TABLE_STATS PORT_STATS QUEUE_STATS ARP_MATCH_IP
 actions: output enqueue set_vlan_vid set_vlan_pcp strip_vlan mod_dl_src mod_dl_dst mod_nw_src mod_nw_dst mod_nw_tos mod_tp_src mod_tp_dst
- 7(tapext10396233): addr:fe:4f:76:09:88:2b
+ 7(interface1): addr:fe:4f:76:09:88:2b
      config:     0
      state:      0
      current:    10GB-FD COPPER
      speed: 10000 Mbps now, 0 Mbps max
- 8(tapext12716181): addr:fe:be:7b:0d:53:d8
+ 8(interface2): addr:fe:be:7b:0d:53:d8
      config:     0
      state:      0
      current:    10GB-FD COPPER
      speed: 10000 Mbps now, 0 Mbps max
- 9(tapext10864673): addr:fe:b6:4c:d5:40:79
+ 9(interface3): addr:fe:b6:4c:d5:40:79
      config:     0
      state:      0
      current:    10GB-FD COPPER
      speed: 10000 Mbps now, 0 Mbps max
- 20(tapint10396233): addr:fe:cf:a6:90:30:29
+ 20(interface4): addr:fe:cf:a6:90:30:29
      config:     0
      state:      0
      current:    10GB-FD COPPER
@@ -1485,7 +1489,7 @@ actions: output enqueue set_vlan_vid set_vlan_pcp strip_vlan mod_dl_src mod_dl_d
      state:      0
      current:    10GB-FD COPPER
      speed: 10000 Mbps now, 0 Mbps max
- 1(non-tap-interface): addr:aa:bb:cc:dd:ee:ff
+ 1(eth0): addr:aa:bb:cc:dd:ee:ff
      config:     0
      state:      0
 `), nil
@@ -1518,9 +1522,9 @@ actions: output enqueue set_vlan_vid set_vlan_pcp strip_vlan mod_dl_src mod_dl_d
 		}
 	}
 
-	// Verify non-tap interfaces are filtered out
-	if _, ok := got["non-tap-interface"]; ok {
-		t.Fatalf("non-tap interface should be filtered out")
+	// Verify all interfaces are included
+	if _, ok := got["eth0"]; !ok {
+		t.Fatalf("all interfaces should be included, eth0 missing")
 	}
 }
 
@@ -1541,7 +1545,18 @@ func TestClientOpenFlowDumpPortMappingsEmptyOutput(t *testing.T) {
 	}
 }
 
-func TestClientOpenFlowDumpPortMappingsNoTapInterfaces(t *testing.T) {
+func TestClientOpenFlowDumpPortMappingsAllInterfaces(t *testing.T) {
+	want := map[string]*PortMapping{
+		"eth0": {
+			OfPort:     1,
+			MACAddress: "aa:bb:cc:dd:ee:ff",
+		},
+		"eth1": {
+			OfPort:     2,
+			MACAddress: "11:22:33:44:55:66",
+		},
+	}
+
 	bridge := "br0"
 
 	c := testClient(nil, func(cmd string, args ...string) ([]byte, error) {
@@ -1557,8 +1572,25 @@ OFPT_FEATURES_REPLY (xid=0x2): dpid:0000000000000001
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	if len(got) != 0 {
-		t.Fatalf("unexpected mappings (should be empty):\n- want: 0\n-  got: %d", len(got))
+	if len(want) != len(got) {
+		t.Fatalf("unexpected number of mappings:\n- want: %d\n-  got: %d", len(want), len(got))
+	}
+
+	for name, wantMapping := range want {
+		gotMapping, ok := got[name]
+		if !ok {
+			t.Fatalf("missing mapping for interface %q", name)
+		}
+
+		if wantMapping.OfPort != gotMapping.OfPort {
+			t.Fatalf("unexpected OfPort for %q:\n- want: %d\n-  got: %d",
+				name, wantMapping.OfPort, gotMapping.OfPort)
+		}
+
+		if wantMapping.MACAddress != gotMapping.MACAddress {
+			t.Fatalf("unexpected MACAddress for %q:\n- want: %q\n-  got: %q",
+				name, wantMapping.MACAddress, gotMapping.MACAddress)
+		}
 	}
 }