Fix ingress policy stats miscalculation(#1976)

pkg/agent/openflow/client.go

@@ -590,7 +590,7 @@ func (c *client) InstallGatewayFlows() error {
 func (c *client) InstallDefaultTunnelFlows() error {
 	flows := []binding.Flow{
 		c.tunnelClassifierFlow(config.DefaultTunOFPort, cookie.Default),
-		c.l2ForwardCalcFlow(globalVirtualMAC, config.DefaultTunOFPort, true, cookie.Default),
+		c.l2ForwardCalcFlow(globalVirtualMAC, config.DefaultTunOFPort, false, cookie.Default),
 	}
 	if err := c.ofEntryOperations.AddAll(flows); err != nil {
 		return err

test/e2e/networkpolicy_test.go

@@ -23,6 +23,7 @@ import (
 	"testing"
 	"time"
 
+	v1alpha1 "github.com/vmware-tanzu/antrea/pkg/apis/stats/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -142,12 +143,23 @@ func TestNetworkPolicyStats(t *testing.T) {
 	}
 
 	if err := wait.Poll(5*time.Second, defaultTimeout, func() (bool, error) {
+		var ingressStats *v1alpha1.NetworkPolicyStats
 		for _, np := range []string{"test-networkpolicy-ingress", "test-networkpolicy-egress"} {
 			stats, err := data.crdClient.StatsV1alpha1().NetworkPolicyStats(testNamespace).Get(context.TODO(), np, metav1.GetOptions{})
 			if err != nil {
 				return false, err
 			}
 			t.Logf("Got NetworkPolicy stats: %v", stats)
+			if ingressStats != nil {
+				if stats.TrafficStats.Packets != ingressStats.TrafficStats.Packets {
+					return false, nil
+				}
+				if stats.TrafficStats.Bytes != ingressStats.TrafficStats.Bytes {
+					return false, nil
+				}
+			} else {
+				ingressStats = stats
+			}
 			if stats.TrafficStats.Sessions != int64(totalSessions) {
 				return false, nil
 			}