diff --git a/go.mod b/go.mod index 3badf45d451..1c3d89708d6 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module antrea.io/antrea go 1.19 require ( - antrea.io/libOpenflow v0.10.2 - antrea.io/ofnet v0.7.1 + antrea.io/libOpenflow v0.10.3 + antrea.io/ofnet v0.7.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 diff --git a/go.sum b/go.sum index 5c6f5e73f98..3642ca104a0 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,7 @@ -antrea.io/libOpenflow v0.10.1/go.mod h1:drWN5iISj7G2J6MnclrFmgy0jHU1Z684WW0DxcrjNP0= -antrea.io/libOpenflow v0.10.2 h1:HsUHwFX//FsfCxHDf2R+IdmVf7NxVWO7nXYABDkszd4= -antrea.io/libOpenflow v0.10.2/go.mod h1:drWN5iISj7G2J6MnclrFmgy0jHU1Z684WW0DxcrjNP0= -antrea.io/ofnet v0.7.1 h1:9FgPTkxuf/DoJADYXLulwZztS+FYgUx3e4qI9hApx68= -antrea.io/ofnet v0.7.1/go.mod h1:DcRieON1uDeaFiSCZyD1f3Mi7q3nvycyJrt8xZAPP6s= +antrea.io/libOpenflow v0.10.3 h1:ZLqpwss8wqzLzRPXFV3/A2hDMpcfIPRCQKWebZ6oWRI= +antrea.io/libOpenflow v0.10.3/go.mod h1:drWN5iISj7G2J6MnclrFmgy0jHU1Z684WW0DxcrjNP0= +antrea.io/ofnet v0.7.3 h1:Ng0rqX2YW8Qp1x12PSwpIvpEA/WUBLB5sW48fJK3nfo= +antrea.io/ofnet v0.7.3/go.mod h1:HfBzG4jn8foWPRPuCk574qutPisf5EqAwYhvd4HrwF0= bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= 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= diff --git a/pkg/agent/openflow/client_test.go b/pkg/agent/openflow/client_test.go index d90a8158d9e..cd498d7ddae 100644 --- a/pkg/agent/openflow/client_test.go +++ b/pkg/agent/openflow/client_test.go @@ -454,7 +454,7 @@ func newFakeClient(mockOFEntryOperations *oftest.MockOFEntryOperations, client.generatePipelines() client.realizePipelines() binding.TableNameCache = getTableNameCache() - client.bridge.(*binding.OFBridge).SetOFSwitch(ofctrl.NewSwitch(&util.MessageStream{}, GlobalVirtualMAC, nil, make(chan int), 32776)) + client.bridge.(*binding.OFBridge).SetOFSwitch(ofctrl.NewSwitch(&util.MessageStream{}, GlobalVirtualMAC, client.bridge.(ofctrl.AppInterface), make(chan int), 32776)) client.bridge.(*binding.OFBridge).Initialize() return client } diff --git a/pkg/ovs/openflow/ofctrl_bridge.go b/pkg/ovs/openflow/ofctrl_bridge.go index a12a49cb7ec..354977e9c30 100644 --- a/pkg/ovs/openflow/ofctrl_bridge.go +++ b/pkg/ovs/openflow/ofctrl_bridge.go @@ -355,6 +355,14 @@ func (b *OFBridge) SwitchConnected(sw *ofctrl.OFSwitch) { }() } +func (b *OFBridge) FlowGraphEnabledOnSwitch() bool { + return true +} + +func (b *OFBridge) TLVMapEnabledOnSwitch() bool { + return true +} + func (b *OFBridge) SetOFSwitch(sw *ofctrl.OFSwitch) { b.ofSwitchMutex.Lock() defer b.ofSwitchMutex.Unlock()