ovs: add conj_id matcher

Author: icosahedral

ovs/match.go

@@ -39,6 +39,7 @@ const (
 	arpSPA   = "arp_spa"
 	arpTHA   = "arp_tha"
 	arpTPA   = "arp_tpa"
+	conjID   = "conj_id"
 	ctMark   = "ct_mark"
 	ctState  = "ct_state"
 	ctZone   = "ct_zone"
@@ -247,6 +248,29 @@ func (m *networkMatch) GoString() string {
 	return fmt.Sprintf("ovs.NetworkDestination(%q)", m.ip)
 }
 
+// ConjunctionID matches flows that have matched all dimension of a conjunction
+// inside of the openflow table.
+func ConjunctionID(id uint32) Match {
+	return &conjunctionIDMatch{
+		id: id,
+	}
+}
+
+// A conjunctionIDMatch is a Match returned by ConjunctionID
+type conjunctionIDMatch struct {
+	id uint32
+}
+
+// MarshalText implements Match.
+func (m *conjunctionIDMatch) MarshalText() ([]byte, error) {
+	return bprintf("conj_id=%v", m.id), nil
+}
+
+// GoString implements Match.
+func (m *conjunctionIDMatch) GoString() string {
+	return fmt.Sprintf("ovs.ConjunctionID(%v)", m.id)
+}
+
 // NetworkProtocol matches packets with the specified IP or IPv6 protocol
 // number matching num.  For example, specifying 1 when a Flow's Protocol
 // is IPv4 matches ICMP packets, or 58 when Protocol is IPv6 matches ICMPv6

ovs/match_test.go

@@ -486,6 +486,39 @@ func TestMatchNetworkProtocol(t *testing.T) {
 	}
 }
 
+func TestMatchConjunctionID(t *testing.T) {
+	var tests = []struct {
+		desc string
+		num  uint32
+		out  string
+	}{
+		{
+			desc: "ID 1",
+			num:  1,
+			out:  "conj_id=1",
+		},
+		{
+			desc: "ID 11111",
+			num:  11111,
+			out:  "conj_id=11111",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.desc, func(t *testing.T) {
+			out, err := ConjunctionID(tt.num).MarshalText()
+			if err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+
+			if want, got := tt.out, string(out); want != got {
+				t.Fatalf("unexpected Match output:\n- want: %q\n-  got: %q",
+					want, got)
+			}
+		})
+	}
+}
+
 func TestMatchConnectionTrackingState(t *testing.T) {
 	var tests = []struct {
 		desc string
@@ -998,6 +1031,10 @@ func TestMatchGoString(t *testing.T) {
 			m: TunnelIDWithMask(0xa, 0x0f),
 			s: `ovs.TunnelIDWithMask(0xa, 0xf)`,
 		},
+		{
+			m: ConjunctionID(123),
+			s: `ovs.ConjunctionID(123)`,
+		},
 	}
 
 	for _, tt := range tests {

ovs/matchparser.go

@@ -33,6 +33,8 @@ func parseMatch(key string, value string) (Match, error) {
 		return parseIntMatch(key, value, math.MaxUint8)
 	case tpSRC, tpDST, ctZone:
 		return parseIntMatch(key, value, math.MaxUint16)
+	case conjID:
+		return parseIntMatch(key, value, math.MaxUint32)
 	case arpSPA:
 		return ARPSourceProtocolAddress(value), nil
 	case arpTPA:
@@ -108,6 +110,8 @@ func parseIntMatch(key string, value string, max int) (Match, error) {
 		return TransportDestinationPort(uint16(t)), nil
 	case ctZone:
 		return ConnectionTrackingZone(uint16(t)), nil
+	case conjID:
+		return ConjunctionID(uint32(t)), nil
 	}
 
 	return nil, fmt.Errorf("no action matched for %s=%s", key, value)

ovs/matchparser_test.go

@@ -287,6 +287,14 @@ func Test_parseMatch(t *testing.T) {
 			final: "tun_id=0xa/0x2",
 			m:     TunnelIDWithMask(10, 2),
 		},
+		{
+			s: "conj_id=123",
+			m: ConjunctionID(123),
+		},
+		{
+			s:       "conj_id=nope",
+			invalid: true,
+		},
 	}
 
 	for _, tt := range tests {