Skip to content

Commit

Permalink
Add unit tests for pkg/ovs/openflow
Browse files Browse the repository at this point in the history
Signed-off-by: Hongliang Liu <lhongliang@vmware.com>
  • Loading branch information
hongliangl committed Sep 22, 2022
1 parent b36a884 commit 6b3d255
Show file tree
Hide file tree
Showing 10 changed files with 2,406 additions and 63 deletions.
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module antrea.io/antrea
go 1.19

require (
antrea.io/libOpenflow v0.8.0
antrea.io/libOpenflow v0.8.1
antrea.io/ofnet v0.6.1
github.com/ClickHouse/clickhouse-go v1.5.4
github.com/DATA-DOG/go-sqlmock v1.5.0
Expand Down Expand Up @@ -211,3 +211,5 @@ require (
)

replace antrea.io/ofnet v0.6.0 => github.com/wenyingd/ofnet v0.0.0-20220817031400-cb451467adc1

replace antrea.io/ofnet v0.6.1 => github.com/hongliangl/ofnet v0.0.0-20220914072523-be2fd8a8929c
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
antrea.io/libOpenflow v0.8.0 h1:Xm6mlSqdXtDD418nf1lndoDvMi8scqUan8pkEUZ2oas=
antrea.io/libOpenflow v0.8.0/go.mod h1:CzEJZxDNAupiGxeL5VOw92PsxfyvehEAvE3PiC6gr8o=
antrea.io/ofnet v0.6.1 h1:w/FIagCrN7dKt2A2R9grlmcSyGrqlCu+uFYPthtfXeg=
antrea.io/ofnet v0.6.1/go.mod h1:qWqi11pI3kBYcS9SYWm92ZOiOPBx04Jx21cDmJlJhOg=
antrea.io/libOpenflow v0.8.1 h1:uxkXvhlPRXAVw26LW6Pt2jCSEh8NR56vQW70YGvy7aU=
antrea.io/libOpenflow v0.8.1/go.mod h1:CzEJZxDNAupiGxeL5VOw92PsxfyvehEAvE3PiC6gr8o=
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=
Expand Down Expand Up @@ -562,6 +560,8 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p
github.com/hashicorp/memberlist v0.4.0 h1:k3uda5gZcltmafuFF+UFqNEl5PrH+yPZ4zkjp1f/H/8=
github.com/hashicorp/memberlist v0.4.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
github.com/hongliangl/ofnet v0.0.0-20220914072523-be2fd8a8929c h1:9ta0njXcmlpUqc2dPPzsO9nj9yDrzJOxVmhta/tfB3U=
github.com/hongliangl/ofnet v0.0.0-20220914072523-be2fd8a8929c/go.mod h1:/gjpTqhUpyn8uZnef+ytdCCAeY5oGG1jCr/szPUqVXU=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
Expand Down
3 changes: 0 additions & 3 deletions pkg/ovs/openflow/interfaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,9 @@ type Action interface {
LoadRegMark(marks ...*RegMark) FlowBuilder
LoadPktMarkRange(value uint32, to *Range) FlowBuilder
LoadIPDSCP(value uint8) FlowBuilder
LoadRange(name string, addr uint64, to *Range) FlowBuilder
Move(from, to string) FlowBuilder
MoveRange(fromName, toName string, from, to Range) FlowBuilder
MoveFromTunMetadata(fromTunMetadataID int, toField string, fromRange, toRange Range, tlvLength uint8) FlowBuilder
Resubmit(port uint16, table uint8) FlowBuilder
ResubmitToTables(tables ...uint8) FlowBuilder
CT(commit bool, tableID uint8, zone int, zoneSrcField *RegField) CTAction
Drop() FlowBuilder
Expand Down Expand Up @@ -324,7 +322,6 @@ type LearnAction interface {
LoadRegMark(mark *RegMark) LearnAction
LoadFieldToField(fromField, toField *RegField) LearnAction
LoadXXRegToXXReg(fromXXField, toXXField *XXRegField) LearnAction
SetDstMAC(mac net.HardwareAddr) LearnAction
Done() FlowBuilder
}

Expand Down
Loading

0 comments on commit 6b3d255

Please sign in to comment.