Fix #2092

antrea-io · Apr 16, 2021 · df057cc · df057cc
1 parent be8ebcb
commit df057cc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 35 deletions.
diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/confluentinc/bincover v0.1.0
 	github.com/containernetworking/cni v0.8.0
 	github.com/containernetworking/plugins v0.8.7
-	github.com/contiv/libOpenflow v0.0.0-20210312221048-1d504242120d
+	github.com/contiv/libOpenflow v0.0.0-20210416161057-27e68f0e5fce
 	github.com/contiv/ofnet v0.0.0-00010101000000-000000000000
 	github.com/coreos/go-iptables v0.4.5
 	github.com/elazarl/goproxy v0.0.0-20190911111923-ecfe977594f1 // indirect

diff --git a/go.sum b/go.sum
@@ -81,6 +81,8 @@ github.com/containernetworking/plugins v0.8.7/go.mod h1:R7lXeZaBzpfqapcAbHRW8/CY
 github.com/contiv/libOpenflow v0.0.0-20201014051314-c1702744526c/go.mod h1:DtsPlJOByJZ+MO9YITEGUlbJ/jfh/ef0qeNyBYaeNR4=
 github.com/contiv/libOpenflow v0.0.0-20210312221048-1d504242120d h1:qHFOB6hTrpBzbYdhOMyQwHdX7XfLGGoqN/NfgDrSEXg=
 github.com/contiv/libOpenflow v0.0.0-20210312221048-1d504242120d/go.mod h1:DtsPlJOByJZ+MO9YITEGUlbJ/jfh/ef0qeNyBYaeNR4=
+github.com/contiv/libOpenflow v0.0.0-20210416161057-27e68f0e5fce h1:pcwRbFTaAKuEUWkLM6Ywm/s75GcWmp4bPUXlXQS1V8s=
+github.com/contiv/libOpenflow v0.0.0-20210416161057-27e68f0e5fce/go.mod h1:DtsPlJOByJZ+MO9YITEGUlbJ/jfh/ef0qeNyBYaeNR4=
 github.com/contiv/libovsdb v0.0.0-20170227191248-d0061a53e358 h1:AiA9SKyNXulsU7aAnyka3UFHYOIH00A9HvdIRnDXlg0=
 github.com/contiv/libovsdb v0.0.0-20170227191248-d0061a53e358/go.mod h1:+qKEHaNVPj+wrn5st7TEFH9wcUWCJq5ZBvVKPQwzAeg=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=

diff --git a/pkg/agent/openflow/client.go b/pkg/agent/openflow/client.go
@@ -435,11 +435,9 @@ func (c *client) InstallServiceGroup(groupID binding.GroupIDType, withSessionAff
 	c.replayMutex.RLock()
 	defer c.replayMutex.RUnlock()
 	groups := c.serviceEndpointGroup(groupID, withSessionAffinity, endpoints...)
-
 	if err := c.bridge.AddOFEntriesInBundle(groups[0:1], nil, nil, groups[1:]); err != nil {
 		return fmt.Errorf("error when installing Service Endpoints Group: %w", err)
 	}
-
 	c.groupCache.Store(groupID, groups)
 	return nil
 }

diff --git a/pkg/agent/openflow/testing/mock_openflow.go b/pkg/agent/openflow/testing/mock_openflow.go
diff --git a/pkg/ovs/openflow/testing/mock_openflow.go b/pkg/ovs/openflow/testing/mock_openflow.go