Skip to content

Commit

Permalink
Fix build error caused by merge conflict (#5582)
Browse files Browse the repository at this point in the history
dc0ca2d ("Add unit tests for pkg/ovs/openflow") was not rebased on
top of tree when it was merged, introducing a build error.

Signed-off-by: Quan Tian <[email protected]>
  • Loading branch information
tnqn authored Oct 16, 2023
1 parent dc0ca2d commit c7fba03
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/ovs/openflow/ofctrl_action_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ func TestFlowActions(t *testing.T) {
{
name: "Learn",
actionFn: func(b Action) FlowBuilder {
return b.Learn(tableID1, 100, 1800, 1800, 100).Done()
return b.Learn(tableID1, 100, 1800, 1800, 0, 0, 100).Done()
},
expectedActionField: &openflow15.NXActionLearn{
IdleTimeout: 1800,
Expand Down Expand Up @@ -1739,7 +1739,7 @@ func TestLearnActions(t *testing.T) {

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
learnAction := tc.learnActionFn(table.BuildFlow(1).Action().Learn(targetTable, priority, idleTimeout, hardTimeout, cookieID))
learnAction := tc.learnActionFn(table.BuildFlow(1).Action().Learn(targetTable, priority, idleTimeout, hardTimeout, 0, 0, cookieID))
action := learnAction.(*ofLearnAction).nxLearn.GetActionMessage().(*openflow15.NXActionLearn)
checkLearnSpecs(t, tc.expectedActionFields, action.LearnSpecs)
flowMod := getFlowMod(t, learnAction.Done().Done())
Expand Down

0 comments on commit c7fba03

Please sign in to comment.