NETOBSERV-2009: stringify network event

Author: jotak

cmd/flow_capture_test.go

@@ -140,9 +140,9 @@ func TestFlowTableAdvancedDisplay(t *testing.T) {
 	// set display without enrichment
 	rows := getRows(allOptions, []string{pktDropFeature, dnsFeature, rttFeature, networkEventsDisplay}, noOptions, []string{})
 	assert.Equal(t, 4, len(rows))
-	assert.Equal(t, `End Time         Src IP       Src Port    Dst IP       Dst Port    Interfaces       Interface Dirs  Dropped Bytes  Dropped Packets  Drop State         Drop Cause                            Drop Flags  DNS Id  DNS Latency  DNS RCode  DNS Error  Flow RTT  Network Events   `, rows[0])
-	assert.Equal(t, `17:25:28.703000  10.128.0.29  1234        10.129.0.26  5678        f18b970c2ce8fdd  Egress          32B            1                TCP_INVALID_STATE  SKB_DROP_REASON_TCP_INVALID_SEQUENCE  16          31319   1ms          NoError    0          10µs      hello            `, rows[1])
-	assert.Equal(t, `---------------  ----------   ----------  ----------   ----------  ----------       ----------      -----          -----            ----------         ----------                            ----------  -----   -----        -----      -----      -----     ---------------  `, rows[2])
+	assert.Equal(t, `End Time         Src IP       Src Port    Dst IP       Dst Port    Interfaces       Interface Dirs  Dropped Bytes  Dropped Packets  Drop State         Drop Cause                            Drop Flags  DNS Id  DNS Latency  DNS RCode  DNS Error  Flow RTT  Network Events                                                      `, rows[0])
+	assert.Equal(t, `17:25:28.703000  10.128.0.29  1234        10.129.0.26  5678        f18b970c2ce8fdd  Egress          32B            1                TCP_INVALID_STATE  SKB_DROP_REASON_TCP_INVALID_SEQUENCE  16          31319   1ms          NoError    0          10µs      Allowed by default allow from local node policy, direction Ingress  `, rows[1])
+	assert.Equal(t, `---------------  ----------   ----------  ----------   ----------  ----------       ----------      -----          -----            ----------         ----------                            ----------  -----   -----        -----      -----      -----     ---------------                                                     `, rows[2])
 	assert.Empty(t, rows[3])
 
 	// set display to standard
@@ -184,8 +184,8 @@ func TestFlowTableAdvancedDisplay(t *testing.T) {
 	// set display to NetworkEvents
 	rows = getRows("Network events", []string{networkEventsDisplay}, noOptions, []string{})
 	assert.Equal(t, 4, len(rows))
-	assert.Equal(t, `End Time         Src IP       Src Port    Dst IP       Dst Port    Interfaces       Interface Dirs  Network Events   `, rows[0])
-	assert.Equal(t, `17:25:28.703000  10.128.0.29  1234        10.129.0.26  5678        f18b970c2ce8fdd  Egress          hello            `, rows[1])
-	assert.Equal(t, `---------------  ----------   ----------  ----------   ----------  ----------       ----------      ---------------  `, rows[2])
+	assert.Equal(t, `End Time         Src IP       Src Port    Dst IP       Dst Port    Interfaces       Interface Dirs  Network Events                                                      `, rows[0])
+	assert.Equal(t, `17:25:28.703000  10.128.0.29  1234        10.129.0.26  5678        f18b970c2ce8fdd  Egress          Allowed by default allow from local node policy, direction Ingress  `, rows[1])
+	assert.Equal(t, `---------------  ----------   ----------  ----------   ----------  ----------       ----------      ---------------                                                     `, rows[2])
 	assert.Empty(t, rows[3])
 }

cmd/map_format.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/jpillora/sizestr"
 	"github.com/netobserv/flowlogs-pipeline/pkg/config"
+	ovnutils "github.com/netobserv/netobserv-ebpf-agent/pkg/utils"
 )
 
 const (
@@ -512,6 +513,9 @@ func ToTableRow(genericMap config.GenericMap, colIDs []string) []interface{} {
 			row = append(row, toDuration(genericMap, fieldName, time.Millisecond))
 		case "TimeFlowRttMs":
 			row = append(row, toDuration(genericMap, fieldName, time.Nanosecond))
+		case "NetworkEvents":
+			events := ovnutils.NetworkEventsToStrings(genericMap)
+			row = append(row, strings.Join(events, ", "))
 		default:
 			// else simply pick field value as text from column name
 			row = append(row, toValue(genericMap, fieldName))

cmd/root_test.go

@@ -44,7 +44,7 @@ const (
 		"PktDropLatestFlags":16,
 		"PktDropLatestState":"TCP_INVALID_STATE",
 		"PktDropPackets":1,
-        "NetworkEvents":["hello"],
+		"NetworkEvents":[{"Feature":"acl","Type":"NetpolNode","Action":"allow","Direction":"Ingress"}],
 		"Proto":6,
 		"SrcAddr":"10.128.0.29",
 		"SrcK8S_HostIP":"10.0.1.1",