Add unit tests for pkg/ovs/openflow

Signed-off-by: Hongliang Liu <lhongliang@vmware.com>

Author: hongliangl

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	antrea.io/libOpenflow v0.8.1
-	antrea.io/ofnet v0.6.2
+	antrea.io/ofnet v0.6.3
 	github.com/ClickHouse/clickhouse-go v1.5.4
 	github.com/DATA-DOG/go-sqlmock v1.5.0
 	github.com/Mellanox/sriovnet v1.1.0

go.sum

@@ -1,7 +1,7 @@
 antrea.io/libOpenflow v0.8.1 h1:uxkXvhlPRXAVw26LW6Pt2jCSEh8NR56vQW70YGvy7aU=
 antrea.io/libOpenflow v0.8.1/go.mod h1:CzEJZxDNAupiGxeL5VOw92PsxfyvehEAvE3PiC6gr8o=
-antrea.io/ofnet v0.6.2 h1:CCW2lOVBtEgpbsIT+DatHcYCfQ5+MDTHSSlQrc2Qelc=
-antrea.io/ofnet v0.6.2/go.mod h1:/gjpTqhUpyn8uZnef+ytdCCAeY5oGG1jCr/szPUqVXU=
+antrea.io/ofnet v0.6.3 h1:nRd8+MV+X60OL6iOmJBMEMFGQExAEQVyhMh9VtouH5U=
+antrea.io/ofnet v0.6.3/go.mod h1:/gjpTqhUpyn8uZnef+ytdCCAeY5oGG1jCr/szPUqVXU=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=

pkg/ovs/openflow/ofctrl_action_test.go

@@ -98,7 +98,8 @@ func (b *ofFlowBuilder) MatchXXReg(regID int, data []byte) FlowBuilder {
 
 // matchRegRange adds match condition for matching data in the target register at specified range.
 func (b *ofFlowBuilder) matchRegRange(regID int, data uint32, rng *Range) FlowBuilder {
-	s := fmt.Sprintf("reg%d[%d..%d]=0x%x", regID, rng[0], rng[1], data)
+	mask := rng.ToNXRange().ToUint32Mask()
+	s := fmt.Sprintf("reg%d=0x%x/0x%x", regID, (data<<rng.Offset())&mask, mask)
 	b.matchers = append(b.matchers, s)
 	reg := &ofctrl.NXRegister{
 		ID:    regID,
@@ -302,31 +303,37 @@ func ctLabelRange(high, low uint64, rng *Range, match *ofctrl.FlowMatch) {
 	match.CtLabelLo = low
 	match.CtLabelHiMask = 0xffff_ffff_ffff_ffff
 	match.CtLabelLoMask = 0xffff_ffff_ffff_ffff
-	if rng[0] == rng[1] {
-		if rng[0] < 64 {
-			match.CtLabelLoMask = 1 << rng[0]
-			match.CtLabelHiMask = 0
-		} else {
-			match.CtLabelHiMask = 1 << (rng[0] - 64)
-			match.CtLabelLoMask = 0
-		}
-	} else if rng[0] < 64 && rng[1] >= 64 {
-		match.CtLabelLoMask <<= rng[0]
-		match.CtLabelHiMask >>= 127 - rng[1]
-	} else if rng[1] < 64 {
+	if rng[1] < 64 {
 		match.CtLabelLoMask &= 0xffff_ffff_ffff_ffff << rng[0]
 		match.CtLabelLoMask &= 0xffff_ffff_ffff_ffff >> (63 - rng[1])
+		match.CtLabelLo &= match.CtLabelLoMask
+		match.CtLabelHi = 0
 		match.CtLabelHiMask = 0
 	} else if rng[0] >= 64 {
 		match.CtLabelHiMask &= 0xffff_ffff_ffff_ffff << (rng[0] - 64)
 		match.CtLabelHiMask &= 0xffff_ffff_ffff_ffff >> (127 - rng[1])
+		match.CtLabelHi &= match.CtLabelHiMask
+		match.CtLabelLo = 0
 		match.CtLabelLoMask = 0
+	} else {
+		match.CtLabelLoMask <<= rng[0]
+		match.CtLabelHiMask >>= 127 - rng[1]
+		match.CtLabelLo &= match.CtLabelLoMask
+		match.CtLabelHi &= match.CtLabelHiMask
 	}
 }
 
 func (b *ofFlowBuilder) MatchCTLabelField(high, low uint64, field *CtLabel) FlowBuilder {
-	b.matchers = append(b.matchers, fmt.Sprintf("ct_label[%d..%d]=0x%x%x", field.rng[0], field.rng[1], high, low))
 	ctLabelRange(high, low, field.GetRange(), &b.ofFlow.Match)
+	var matchStr string
+	if field.rng[1] < 64 {
+		matchStr = fmt.Sprintf("ct_label=0x%x/0x%x", b.ofFlow.Match.CtLabelLo, b.ofFlow.Match.CtLabelLoMask)
+	} else if field.rng[0] > 63 {
+		matchStr = fmt.Sprintf("ct_label=0x%x%016x/0x%x%016x", b.ofFlow.Match.CtLabelHi, 0, b.ofFlow.Match.CtLabelHiMask, 0)
+	} else {
+		matchStr = fmt.Sprintf("ct_label=0x%x%016x/0x%x%016x", b.ofFlow.Match.CtLabelHi, b.ofFlow.Match.CtLabelLo, b.ofFlow.Match.CtLabelHiMask, b.ofFlow.Match.CtLabelLoMask)
+	}
+	b.matchers = append(b.matchers, matchStr)
 	return b
 }