feat: add support for printing bgp state of connected machines

metal-stack · Nov 25, 2024 · 735f7ad · 735f7ad
1 parent b218311
commit 735f7ad
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/cmd/tableprinters/switch.go b/cmd/tableprinters/switch.go
@@ -210,9 +210,19 @@ func (t *TablePrinter) SwitchWithConnectedMachinesTable(data *SwitchesWithMachin
 			nic := pointer.SafeDeref(conn.Nic)
 			nicname := pointer.SafeDeref(nic.Name)
 			nicstate := pointer.SafeDeref(nic.Actual)
+			bgpstate := pointer.SafeDeref(nic.BgpPortState)
 			if nicstate != "UP" {
 				nicname = fmt.Sprintf("%s (%s)", nicname, color.RedString(nicstate))
 			}
+			if bgpstate.BgpState != nil && wide {
+				switch *bgpstate.BgpState {
+				case "Established":
+					uptime := time.Since(time.Unix(*bgpstate.BgpTimerUpEstablished, 0)).Round(time.Second)
+					nicname = fmt.Sprintf("%s (BGP:%s(%s))", nicname, *bgpstate.BgpState, uptime)
+				default:
+					nicname = fmt.Sprintf("%s (BGP:%s)", nicname, *bgpstate.BgpState)
+				}
+			}
 
 			if wide {
 				emojis, _ := t.getMachineStatusEmojis(m.Liveliness, m.Events, m.State, pointer.SafeDeref(m.Allocation).Vpn)

diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/go-openapi/strfmt v0.23.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0
-	github.com/metal-stack/metal-go v0.39.2
+	github.com/metal-stack/metal-go v0.39.3-0.20241115075449-a32f0b74c86a
 	github.com/metal-stack/metal-lib v0.19.0
 	github.com/metal-stack/updater v1.2.2
 	github.com/metal-stack/v v1.0.3

diff --git a/go.sum b/go.sum
@@ -244,8 +244,8 @@ github.com/mdlayher/sdnotify v1.0.0 h1:Ma9XeLVN/l0qpyx1tNeMSeTjCPH6NtuD6/N9XdTlQ
 github.com/mdlayher/sdnotify v1.0.0/go.mod h1:HQUmpM4XgYkhDLtd+Uad8ZFK1T9D5+pNxnXQjCeJlGE=
 github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos=
 github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ=
-github.com/metal-stack/metal-go v0.39.2 h1:E2iZ8f7Qo/z2ClbtICYu4iKn91zFv0RonFmuPlbC6tk=
-github.com/metal-stack/metal-go v0.39.2/go.mod h1:ltItf/Md/z588c7Dr3X6iemCeOFh3rJ8nDL5Dpb9zFQ=
+github.com/metal-stack/metal-go v0.39.3-0.20241115075449-a32f0b74c86a h1:BJPawlApxl6jQo/7tkh5VTnq2j+bLoOoZaEocBv9yYk=
+github.com/metal-stack/metal-go v0.39.3-0.20241115075449-a32f0b74c86a/go.mod h1:ltItf/Md/z588c7Dr3X6iemCeOFh3rJ8nDL5Dpb9zFQ=
 github.com/metal-stack/metal-lib v0.19.0 h1:4yBnp/jPGgX9KeCje3A4MFL2oDjgjOjgsIK391LltRI=
 github.com/metal-stack/metal-lib v0.19.0/go.mod h1:fCMaWwVGA/xAoGvBk72/nfzqBkHly0iOzrWpc55Fau4=
 github.com/metal-stack/security v0.9.0 h1:FYBXJfNJwUw2E0HBa+jay37XF7b6EikEuf4Mw8u04EY=