Bump version v1.1.5-1

debian/changelog

@@ -1,3 +1,13 @@
+govpp-snmp-agentx (1.1.5-1) bookworm; urgency=medium
+
+  * Implement automatic interface deletion handling in IF-MIB
+  * Simplify interface event processing by removing separate delete callbacks
+  * Remove unused functions and clean up codebase (RemoveInterface, rebuildMIB)
+  * Improve interface state synchronization between VPP and SNMP MIB
+  * Automatically detect and remove deleted interfaces during updates
+
+ -- Pim van Pelt <pim@ipng.ch>  Wed, 02 Jul 2025 00:00:00 +0000
+
 govpp-snmp-agentx (1.1.4-1) bookworm; urgency=medium
 
   * Major VPP module refactoring with improved separation of concerns

src/ifmib/ifmib.go

@@ -184,7 +184,7 @@ func (m *InterfaceMIB) UpdateStats(interfaceStats *api.InterfaceStats) {
 	}
 	if m.ifXTableSession != nil {
 		m.ifXTableSession.Handler = m.handler
-		logger.Printf("Updated session handlers with new IF-MIB data")
+		logger.Printf("Updated session handlers with new IF-MIB data for %d interfaces", len(m.stats))
 	}
 
 	logger.Debugf("IF-MIB now contains %d interfaces", len(m.stats))

src/main.go

@@ -16,7 +16,7 @@ import (
 	"govpp-snmp-agentx/vpp"
 )
 
-const Version = "1.1.4-1"
+const Version = "1.1.5-1"
 
 func main() {
 	debug := flag.Bool("debug", false, "Enable debug logging")
@@ -48,7 +48,7 @@ func main() {
 	// Create VPP client and managers
 	vppClient := vpp.NewVPPClient()
 	interfaceManager := vpp.NewInterfaceManager(vppClient)
-	statsManager := vpp.NewStatsManager(vppClient, interfaceManager)
+	statsManager := vpp.NewStatsManager(vppClient)
 
 	// Set up interface event callback to update interface details
 	interfaceManager.SetEventCallback(interfaceMIB.UpdateInterfaceDetails)
@@ -59,6 +59,9 @@ func main() {
 	// Start VPP stats routine
 	statsManager.StartStatsRoutine()
 
+	// Start interface event monitoring (handles reconnections automatically)
+	interfaceManager.StartEventMonitoring()
+
 	// Set up signal handling for graceful shutdown
 	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
@@ -67,8 +70,9 @@ func main() {
 	<-sigChan
 	logger.Printf("Shutting down...")
 
-	// Stop stats routine and disconnect
+	// Stop stats routine and interface monitoring, then disconnect
 	statsManager.StopStatsRoutine()
+	interfaceManager.StopEventMonitoring()
 	vppClient.Disconnect()
 
 	// Flush any buffered log entries

src/vpp/vpp_iface.go

@@ -4,6 +4,7 @@ package vpp
 
 import (
 	"os"
+	"time"
 
 	"go.fd.io/govpp/api"
 	interfaces "go.fd.io/govpp/binapi/interface"
@@ -28,8 +29,10 @@ type InterfaceEventCallback func(details []InterfaceDetails)
 
 // InterfaceManager handles interface-related VPP operations
 type InterfaceManager struct {
-	client        *VPPClient
+	client         *VPPClient
-	eventCallback InterfaceEventCallback
+	eventCallback  InterfaceEventCallback
+	running        bool
+	watchingEvents bool
 }
 
 // NewInterfaceManager creates a new interface manager
@@ -44,6 +47,82 @@ func (im *InterfaceManager) SetEventCallback(callback InterfaceEventCallback) {
 	im.eventCallback = callback
 }
 
+// InitializeEventWatching starts event watching and retrieves initial interface details
+func (im *InterfaceManager) InitializeEventWatching() error {
+	if !im.client.IsConnected() {
+		return &VPPError{Message: "VPP client not connected"}
+	}
+
+	// Start watching interface events
+	if err := im.StartEventWatcher(); err != nil {
+		logger.Debugf("Failed to start interface event watching: %v", err)
+		return err
+	}
+
+	logger.Debugf("Interface event watching started")
+
+	// Get initial interface details
+	if details, err := im.GetAllInterfaceDetails(); err != nil {
+		logger.Debugf("Failed to get initial interface details: %v", err)
+		return err
+	} else {
+		logger.Debugf("Retrieved initial interface details for %d interfaces", len(details))
+		if im.eventCallback != nil {
+			im.eventCallback(details)
+		}
+	}
+
+	im.watchingEvents = true
+	return nil
+}
+
+// StartEventMonitoring starts continuous monitoring for VPP connection and restarts event watching as needed
+func (im *InterfaceManager) StartEventMonitoring() {
+	if im.running {
+		logger.Debugf("Interface event monitoring already running")
+		return
+	}
+
+	im.running = true
+	go im.eventMonitoringRoutine()
+}
+
+// StopEventMonitoring stops the event monitoring routine
+func (im *InterfaceManager) StopEventMonitoring() {
+	im.running = false
+}
+
+// eventMonitoringRoutine continuously monitors VPP connection and manages event watching
+func (im *InterfaceManager) eventMonitoringRoutine() {
+	logger.Debugf("Starting interface event monitoring routine")
+
+	for {
+		if !im.running {
+			logger.Debugf("Interface event monitoring routine stopping")
+			break
+		}
+
+		if im.client.IsConnected() {
+			if !im.watchingEvents {
+				if err := im.InitializeEventWatching(); err != nil {
+					logger.Printf("Failed to initialize interface event watching: %v", err)
+				} else {
+					logger.Printf("Interface event watching started")
+				}
+			}
+		} else {
+			if im.watchingEvents {
+				logger.Printf("VPP connection lost, interface event watching will restart on reconnection")
+				im.watchingEvents = false
+			}
+		}
+
+		time.Sleep(time.Second)
+	}
+
+	logger.Debugf("Interface event monitoring routine ended")
+}
+
 // GetAllInterfaceDetails retrieves detailed information for all interfaces
 func (im *InterfaceManager) GetAllInterfaceDetails() ([]InterfaceDetails, error) {
 	if !im.client.IsConnected() {
@@ -185,7 +264,7 @@ func watchInterfaceEvents(ch api.Channel, callback func()) error {
 		logger.Debugf("Interface event listener waiting for events...")
 		for notif := range notifChan {
 			e := notif.(*interfaces.SwInterfaceEvent)
-			logger.Debugf("interface event: SwIfIndex=%d, Flags=%d, Deleted=%t",
+			logger.Printf("interface event: SwIfIndex=%d, Flags=%d, Deleted=%t",
 				e.SwIfIndex, e.Flags, e.Deleted)
 
 			// When an interface event occurs, call the callback

src/vpp/vpp_iface_test.go

@@ -3,8 +3,10 @@
 package vpp
 
 import (
-	"go.fd.io/govpp/binapi/interface_types"
 	"testing"
+	"time"
+
+	"go.fd.io/govpp/binapi/interface_types"
 )
 
 func TestNewInterfaceManager(t *testing.T) {
@@ -22,6 +24,15 @@ func TestNewInterfaceManager(t *testing.T) {
 	if manager.eventCallback != nil {
 		t.Error("InterfaceManager should have nil callback initially")
 	}
+
+	if manager.running {
+		t.Error("InterfaceManager should not be running initially")
+	}
+
+	if manager.watchingEvents {
+		t.Error("InterfaceManager should not be watching events initially")
+	}
+
 }
 
 func TestInterfaceManagerSetEventCallback(t *testing.T) {
@@ -116,6 +127,25 @@ func TestInterfaceManagerHandleInterfaceEventWithoutCallback(t *testing.T) {
 	manager.handleInterfaceEvent()
 }
 
+func TestInterfaceManagerInitializeEventWatchingWithoutConnection(t *testing.T) {
+	client := NewVPPClient()
+	manager := NewInterfaceManager(client)
+
+	err := manager.InitializeEventWatching()
+	if err == nil {
+		t.Error("InitializeEventWatching() should return error when not connected")
+	}
+
+	vppErr, ok := err.(*VPPError)
+	if !ok {
+		t.Errorf("Expected VPPError, got %T", err)
+	}
+
+	if vppErr.Message != "VPP client not connected" {
+		t.Errorf("Expected specific error message, got: %s", vppErr.Message)
+	}
+}
+
 func TestInterfaceDetails(t *testing.T) {
 	details := InterfaceDetails{
 		SwIfIndex:     interface_types.InterfaceIndex(42),
@@ -188,3 +218,68 @@ func TestInterfaceEventCallback(t *testing.T) {
 		t.Errorf("Expected second interface 'test2', got %q", callbackDetails[1].InterfaceName)
 	}
 }
+
+func TestInterfaceManagerStartStopEventMonitoring(t *testing.T) {
+	client := NewVPPClient()
+	manager := NewInterfaceManager(client)
+
+	if manager.running {
+		t.Error("InterfaceManager should not be running initially")
+	}
+
+	manager.StartEventMonitoring()
+
+	if !manager.running {
+		t.Error("InterfaceManager should be running after StartEventMonitoring()")
+	}
+
+	// Test starting again (should be safe)
+	manager.StartEventMonitoring()
+
+	if !manager.running {
+		t.Error("InterfaceManager should still be running after second StartEventMonitoring()")
+	}
+
+	manager.StopEventMonitoring()
+
+	if manager.running {
+		t.Error("InterfaceManager should not be running after StopEventMonitoring()")
+	}
+}
+
+func TestInterfaceManagerEventMonitoringWithConnectionChanges(t *testing.T) {
+	client := NewVPPClient()
+	manager := NewInterfaceManager(client)
+
+	// Set a callback to track calls
+	var callbackCount int
+	manager.SetEventCallback(func(details []InterfaceDetails) {
+		callbackCount++
+	})
+
+	manager.StartEventMonitoring()
+
+	// Let it run briefly
+	time.Sleep(50 * time.Millisecond)
+
+	// Simulate VPP connection and disconnection by checking state changes
+	initialWatchingState := manager.watchingEvents
+
+	// Stop monitoring
+	manager.StopEventMonitoring()
+
+	// Verify it stopped
+	if manager.running {
+		t.Error("Event monitoring should have stopped")
+	}
+
+	// The watching state should reflect the connection state
+	if !client.IsConnected() && manager.watchingEvents {
+		t.Error("Should not be watching events when disconnected")
+	}
+
+	// Initial state should be false since we're not connected to VPP in tests
+	if initialWatchingState {
+		t.Error("Should not be watching events initially when VPP is not connected")
+	}
+}

src/vpp/vpp_stats.go

@@ -15,19 +15,17 @@ type StatsCallback func(*api.InterfaceStats)
 
 // StatsManager handles VPP statistics operations
 type StatsManager struct {
-	client           *VPPClient
+	client        *VPPClient
-	interfaceManager *InterfaceManager
+	statsCallback StatsCallback
-	statsCallback    StatsCallback
+	period        time.Duration
-	period           time.Duration
+	running       bool
-	running          bool
 }
 
 // NewStatsManager creates a new stats manager
-func NewStatsManager(client *VPPClient, interfaceManager *InterfaceManager) *StatsManager {
+func NewStatsManager(client *VPPClient) *StatsManager {
 	return &StatsManager{
-		client:           client,
+		client: client,
-		interfaceManager: interfaceManager,
+		period: time.Duration(*Period) * time.Second,
-		period:           time.Duration(*Period) * time.Second,
 	}
 }
 
@@ -97,36 +95,17 @@ func (sm *StatsManager) statsRoutine() {
 				logger.Printf("VPP connection lost, attempting reconnect...")
 				wasConnected = false
 			} else {
-				logger.Debugf("VPP not connected, attempting connection...")
+				logger.Printf("VPP not connected, attempting connection...")
 			}
 
 			if err := sm.client.Connect(); err != nil {
-				logger.Debugf("Failed to connect to VPP: %v", err)
+				logger.Printf("Failed to connect to VPP: %v", err)
 				time.Sleep(time.Second)
 				continue
 			}
 
 			logger.Printf("VPP connection established")
 			wasConnected = true
-
-			// Initialize interface event watching
-			if sm.interfaceManager != nil {
-				if err := sm.interfaceManager.StartEventWatcher(); err != nil {
-					logger.Debugf("Failed to start interface event watching: %v", err)
-				} else {
-					logger.Debugf("Interface event watching started")
-
-					// Get initial interface details
-					if details, err := sm.interfaceManager.GetAllInterfaceDetails(); err != nil {
-						logger.Debugf("Failed to get initial interface details: %v", err)
-					} else {
-						logger.Debugf("Retrieved initial interface details for %d interfaces", len(details))
-						if sm.interfaceManager.eventCallback != nil {
-							sm.interfaceManager.eventCallback(details)
-						}
-					}
-				}
-			}
 		}
 
 		// Query stats if connected
@@ -160,8 +139,8 @@ func (sm *StatsManager) queryAndReportStats() bool {
 		return false
 	}
 
-	// Always log basic info
+	// Debug log basic info
-	logger.Printf("Retrieved stats for %d interfaces", len(stats.Interfaces))
+	logger.Debugf("Retrieved stats for %d interfaces", len(stats.Interfaces))
 
 	// Debug logging for individual interfaces
 	for _, iface := range stats.Interfaces {

src/vpp/vpp_stats_test.go

@@ -11,8 +11,7 @@ import (
 
 func TestNewStatsManager(t *testing.T) {
 	client := NewVPPClient()
-	interfaceManager := NewInterfaceManager(client)
+	manager := NewStatsManager(client)
-	manager := NewStatsManager(client, interfaceManager)
 
 	if manager == nil {
 		t.Fatal("NewStatsManager() returned nil")
@@ -22,10 +21,6 @@ func TestNewStatsManager(t *testing.T) {
 		t.Error("StatsManager should store the provided client")
 	}
 
-	if manager.interfaceManager != interfaceManager {
-		t.Error("StatsManager should store the provided interface manager")
-	}
-
 	if manager.period != time.Duration(*Period)*time.Second {
 		t.Errorf("Expected period %v, got %v", time.Duration(*Period)*time.Second, manager.period)
 	}
@@ -41,8 +36,7 @@ func TestNewStatsManager(t *testing.T) {
 
 func TestStatsManagerSetStatsCallback(t *testing.T) {
 	client := NewVPPClient()
-	interfaceManager := NewInterfaceManager(client)
+	manager := NewStatsManager(client)
-	manager := NewStatsManager(client, interfaceManager)
 
 	var callbackCalled bool
 	var receivedStats *api.InterfaceStats
@@ -91,8 +85,7 @@ func TestStatsManagerSetStatsCallback(t *testing.T) {
 
 func TestStatsManagerSetPeriod(t *testing.T) {
 	client := NewVPPClient()
-	interfaceManager := NewInterfaceManager(client)
+	manager := NewStatsManager(client)
-	manager := NewStatsManager(client, interfaceManager)
 
 	newPeriod := 5 * time.Second
 	manager.SetPeriod(newPeriod)
@@ -104,8 +97,7 @@ func TestStatsManagerSetPeriod(t *testing.T) {
 
 func TestStatsManagerStartStopStatsRoutine(t *testing.T) {
 	client := NewVPPClient()
-	interfaceManager := NewInterfaceManager(client)
+	manager := NewStatsManager(client)
-	manager := NewStatsManager(client, interfaceManager)
 
 	if manager.running {
 		t.Error("StatsManager should not be running initially")
@@ -133,8 +125,7 @@ func TestStatsManagerStartStopStatsRoutine(t *testing.T) {
 
 func TestStatsManagerGetInterfaceStatsWithoutConnection(t *testing.T) {
 	client := NewVPPClient()
-	interfaceManager := NewInterfaceManager(client)
+	manager := NewStatsManager(client)
-	manager := NewStatsManager(client, interfaceManager)
 
 	_, err := manager.GetInterfaceStats()
 	if err == nil {
@@ -215,8 +206,7 @@ func TestStatsCallback(t *testing.T) {
 
 func TestStatsManagerQueryAndReportStatsWithoutConnection(t *testing.T) {
 	client := NewVPPClient()
-	interfaceManager := NewInterfaceManager(client)
+	manager := NewStatsManager(client)
-	manager := NewStatsManager(client, interfaceManager)
 
 	// Should return false when not connected
 	if manager.queryAndReportStats() {
@@ -226,8 +216,7 @@ func TestStatsManagerQueryAndReportStatsWithoutConnection(t *testing.T) {
 
 func TestStatsManagerWithShortPeriod(t *testing.T) {
 	client := NewVPPClient()
-	interfaceManager := NewInterfaceManager(client)
+	manager := NewStatsManager(client)
-	manager := NewStatsManager(client, interfaceManager)
 
 	// Set a very short period for testing
 	manager.SetPeriod(10 * time.Millisecond)