Fix rebase errors

netobserv · Feb 20, 2023 · 60245a3 · 60245a3
1 parent 5b5748e
commit 60245a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/pipeline/extract/conntrack/conntrack.go b/pkg/pipeline/extract/conntrack/conntrack.go
@@ -28,7 +28,7 @@ import (
 	"github.com/netobserv/flowlogs-pipeline/pkg/config"
 	"github.com/netobserv/flowlogs-pipeline/pkg/operational"
 	"github.com/netobserv/flowlogs-pipeline/pkg/pipeline/extract"
-	"github.com/netobserv/flowlogs-pipeline/pkg/pipeline/utils"
+	"github.com/netobserv/flowlogs-pipeline/pkg/utils"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/pkg/pipeline/extract/conntrack/conntrack_test.go b/pkg/pipeline/extract/conntrack/conntrack_test.go
@@ -1007,8 +1007,8 @@ func TestDetectEndConnection(t *testing.T) {
 	portB := 9002
 	protocolTCP := 6
 	hashIdTCP := "705baa5149302fa1"
-	flTCP1 := newMockFlowLog(ipA, portA, ipB, portB, protocolTCP, 111, 11)
-	flTCP2 := newMockFlowLog(ipB, portB, ipA, portA, protocolTCP, 222, 22)
+	flTCP1 := newMockFlowLog(ipA, portA, ipB, portB, protocolTCP, 111, 11, false)
+	flTCP2 := newMockFlowLog(ipB, portB, ipA, portA, protocolTCP, 222, 22, false)
 	flTCP2[tcpFlagsFieldName] = FIN_ACK_FLAG
 
 	startTime := clk.Now()
@@ -1078,7 +1078,7 @@ func TestSwapAB(t *testing.T) {
 	portB := 9002
 	protocolTCP := 6
 	hashIdTCP := "705baa5149302fa1"
-	flTCP1 := newMockFlowLog(ipB, portB, ipA, portA, protocolTCP, 111, 11)
+	flTCP1 := newMockFlowLog(ipB, portB, ipA, portA, protocolTCP, 111, 11, false)
 	flTCP1[tcpFlagsFieldName] = SYN_ACK_FLAG
 
 	startTime := clk.Now()