From ca13cd9b96628a8d206416577bf0f781985ea824 Mon Sep 17 00:00:00 2001 From: Vladimir Shipilov Date: Tue, 9 May 2023 15:32:05 +0300 Subject: [PATCH] Fix collecting for bfd sessions stucked in Init state (#86) --- parser/bfd.go | 2 +- parser/bfd_test.go | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/parser/bfd.go b/parser/bfd.go index 1342062..0d3dd5e 100644 --- a/parser/bfd.go +++ b/parser/bfd.go @@ -14,7 +14,7 @@ var ( ) func init() { - bfdSessionRegex = regexp.MustCompile(`^([^\s]+)\s+([^\s]+)\s+(Up|Down)\s+(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}|[^\s]+)\s+([0-9\.]+)\s+([0-9\.]+)$`) + bfdSessionRegex = regexp.MustCompile(`^([^\s]+)\s+([^\s]+)\s+(Up|Down|Init)\s+(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}|[^\s]+)\s+([0-9\.]+)\s+([0-9\.]+)$`) } type bfdContext struct { diff --git a/parser/bfd_test.go b/parser/bfd_test.go index 13e1fa0..665a062 100644 --- a/parser/bfd_test.go +++ b/parser/bfd_test.go @@ -17,11 +17,12 @@ func TestParseBFDSessions(t *testing.T) { bfd1: IP address Interface State Since Interval Timeout 192.168.64.9 enp0s2 Up 2022-01-27 09:00:00 0.100 1.000 -192.168.64.10 enp0s2 Down 2022-01-27 08:00:00 0.300 0.000` +192.168.64.10 enp0s2 Down 2022-01-27 08:00:00 0.300 0.000 +192.168.64.12 enp0s2 Init 2022-01-27 08:00:00 0.300 5.000` s := ParseBFDSessions("bfd1", []byte(data)) - assert.Equal(t, 2, len(s), "session count") + assert.Equal(t, 3, len(s), "session count") s1 := protocol.BFDSession{ ProtocolName: "bfd1", @@ -41,5 +42,14 @@ IP address Interface State Since Interval Timeout Interval: 0.3, Timeout: 0, } - assert.Equal(t, []*protocol.BFDSession{&s1, &s2}, s, "sessions") + s3 := protocol.BFDSession{ + ProtocolName: "bfd1", + IP: "192.168.64.12", + Interface: "enp0s2", + Up: false, + Since: 7200, + Interval: 0.3, + Timeout: 5, + } + assert.Equal(t, []*protocol.BFDSession{&s1, &s2, &s3}, s, "sessions") }