@@ -35,6 +35,7 @@ import (
3535 "antrea.io/antrea/pkg/agent/util"
3636 "antrea.io/antrea/pkg/ovs/ovsconfig"
3737 ovsconfigtest "antrea.io/antrea/pkg/ovs/ovsconfig/testing"
38+ ovsctltest "antrea.io/antrea/pkg/ovs/ovsctl/testing"
3839 utilip "antrea.io/antrea/pkg/util/ip"
3940)
4041
@@ -58,6 +59,7 @@ type fakeController struct {
5859 ovsClient * ovsconfigtest.MockOVSBridgeClient
5960 routeClient * routetest.MockInterface
6061 interfaceStore interfacestore.InterfaceStore
62+ ovsCtlClient * ovsctltest.MockOVSCtlClient
6163}
6264
6365type fakeIPsecCertificateManager struct {}
@@ -75,7 +77,9 @@ func newController(t *testing.T, networkConfig *config.NetworkConfig) (*fakeCont
7577 routeClient := routetest .NewMockInterface (ctrl )
7678 interfaceStore := interfacestore .NewInterfaceStore ()
7779 ipsecCertificateManager := & fakeIPsecCertificateManager {}
78- c := NewNodeRouteController (clientset , informerFactory , ofClient , ovsClient , routeClient , interfaceStore , networkConfig , & config.NodeConfig {GatewayConfig : & config.GatewayConfig {
80+ ovsCtlClient := ovsctltest .NewMockOVSCtlClient (ctrl )
81+
82+ c := NewNodeRouteController (clientset , informerFactory , ofClient , ovsCtlClient , ovsClient , routeClient , interfaceStore , networkConfig , & config.NodeConfig {GatewayConfig : & config.GatewayConfig {
7983 IPv4 : nil ,
8084 MAC : gatewayMAC ,
8185 }}, nil , false , ipsecCertificateManager )
@@ -86,6 +90,7 @@ func newController(t *testing.T, networkConfig *config.NetworkConfig) (*fakeCont
8690 ofClient : ofClient ,
8791 ovsClient : ovsClient ,
8892 routeClient : routeClient ,
93+ ovsCtlClient : ovsCtlClient ,
8994 interfaceStore : interfaceStore ,
9095 }, ctrl .Finish
9196}
@@ -339,6 +344,7 @@ func TestCreateIPSecTunnelPortPSK(t *testing.T) {
339344
340345 node1PortName := util .GenerateNodeTunnelInterfaceName ("xyz-k8s-0-1" )
341346 node2PortName := util .GenerateNodeTunnelInterfaceName ("xyz-k8s-0-2" )
347+ node3PortName := util .GenerateNodeTunnelInterfaceName ("xyz-k8s-0-3" )
342348 c .ovsClient .EXPECT ().CreateTunnelPortExt (
343349 node1PortName , ovsconfig .TunnelType ("vxlan" ), int32 (0 ),
344350 false , "" , nodeIP1 .String (), "" , "changeme" , nil ,
@@ -348,7 +354,11 @@ func TestCreateIPSecTunnelPortPSK(t *testing.T) {
348354 false , "" , nodeIP2 .String (), "" , "changeme" , nil ,
349355 map [string ]interface {}{ovsExternalIDNodeName : "xyz-k8s-0-2" }).Times (1 )
350356 c .ovsClient .EXPECT ().GetOFPort (node1PortName , false ).Return (int32 (1 ), nil )
357+ c .ovsCtlClient .EXPECT ().SetPortNoFlood (1 )
351358 c .ovsClient .EXPECT ().GetOFPort (node2PortName , false ).Return (int32 (2 ), nil )
359+ c .ovsCtlClient .EXPECT ().SetPortNoFlood (2 )
360+ c .ovsClient .EXPECT ().GetOFPort (node3PortName , false ).Return (int32 (5 ), nil )
361+ c .ovsCtlClient .EXPECT ().SetPortNoFlood (5 )
352362 c .ovsClient .EXPECT ().DeletePort ("123" ).Times (1 )
353363
354364 tests := []struct {
@@ -407,6 +417,7 @@ func TestCreateIPSecTunnelPortCert(t *testing.T) {
407417 false , "" , nodeIP1 .String (), "xyz-k8s-0-1" , "" , nil ,
408418 map [string ]interface {}{ovsExternalIDNodeName : "xyz-k8s-0-1" }).Times (1 )
409419 c .ovsClient .EXPECT ().GetOFPort (node1PortName , false ).Return (int32 (1 ), nil )
420+ c .ovsCtlClient .EXPECT ().SetPortNoFlood (1 )
410421
411422 tests := []struct {
412423 name string
0 commit comments