Do not use AddRecordV3

Signed-off-by: Antonin Bas <antonin.bas@broadcom.com>
antrea-io · Jan 2, 2025 · 0984369 · 0984369
1 parent 23e9bd0
commit 0984369
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pkg/flowaggregator/exporter/ipfix.go b/pkg/flowaggregator/exporter/ipfix.go
@@ -168,7 +168,7 @@ func (e *IPFIXExporter) sendRecord(record ipfixentities.Record, isRecordIPv6 boo
 	if err := e.set.PrepareSet(ipfixentities.Data, templateID); err != nil {
 		return err
 	}
-	if err := e.set.AddRecordV3(record); err != nil {
+	if err := e.set.AddRecordV2(record.GetOrderedElementList(), templateID); err != nil {
 		return err
 	}
 	sentBytes, err := e.exportingProcess.SendSet(e.set)

diff --git a/pkg/flowaggregator/exporter/ipfix_test.go b/pkg/flowaggregator/exporter/ipfix_test.go
@@ -132,7 +132,8 @@ func TestIPFIXExporter_UpdateOptions(t *testing.T) {
 	setCount := 0
 	mockSet.EXPECT().ResetSet().Times(2)
 	mockSet.EXPECT().PrepareSet(gomock.Any(), testTemplateID).Return(nil).Times(2)
-	mockSet.EXPECT().AddRecordV3(mockRecord).Return(nil).Times(2)
+	mockRecord.EXPECT().GetOrderedElementList().Return(nil).Times(2)
+	mockSet.EXPECT().AddRecordV2(gomock.Any(), testTemplateID).Return(nil).Times(2)
 	mockIPFIXExpProc.EXPECT().SendSet(mockSet).Do(func(set interface{}) {
 		setCount += 1
 	}).Return(0, nil).Times(2)
@@ -165,7 +166,7 @@ func TestIPFIXExporter_UpdateOptions(t *testing.T) {
 	assert.Equal(t, 2, setCount, "Invalid number of flow sets sent by exporter")
 }
 
-func TestIPFIXExporter_AddRecord(t *testing.T) {
+func TestIPFIXExporter_AddRecordV2(t *testing.T) {
 	ctrl := gomock.NewController(t)
 
 	mockIPFIXExpProc := ipfixtesting.NewMockIPFIXExportingProcess(ctrl)
@@ -193,7 +194,8 @@ func TestIPFIXExporter_AddRecord(t *testing.T) {
 
 	mockSet.EXPECT().ResetSet()
 	mockSet.EXPECT().PrepareSet(gomock.Any(), testTemplateID).Return(nil)
-	mockSet.EXPECT().AddRecordV3(mockRecord).Return(nil)
+	mockRecord.EXPECT().GetOrderedElementList().Return(nil)
+	mockSet.EXPECT().AddRecordV2(gomock.Any(), testTemplateID).Return(nil)
 	mockIPFIXExpProc.EXPECT().SendSet(mockSet).Return(0, nil)
 
 	assert.NoError(t, ipfixExporter.AddRecord(mockRecord, false))
@@ -242,7 +244,8 @@ func TestIPFIXExporter_sendRecord_Error(t *testing.T) {
 
 	mockSet.EXPECT().ResetSet()
 	mockSet.EXPECT().PrepareSet(gomock.Any(), testTemplateID).Return(nil)
-	mockSet.EXPECT().AddRecordV3(mockRecord).Return(nil)
+	mockRecord.EXPECT().GetOrderedElementList().Return(nil)
+	mockSet.EXPECT().AddRecordV2(gomock.Any(), testTemplateID).Return(nil)
 	mockIPFIXExpProc.EXPECT().SendSet(mockSet).Return(0, fmt.Errorf("send error"))
 	mockIPFIXExpProc.EXPECT().CloseConnToCollector()