Merge pull request #85 from GuessWhoSamFoo/vio-2303

Fallback to non-bulk snmp walk on initial failure

pkg/snmp/core/client.go

@@ -285,6 +285,7 @@ func (d *DeviceConfig) ToMap() (m map[string]interface{}, err error) {
 // SnmpClient is a thin wrapper around gosnmp.
 type SnmpClient struct {
 	DeviceConfig *DeviceConfig
+	SupportBulk  bool
 }
 
 // NewSnmpClient constructs SnmpClient.
@@ -295,6 +296,7 @@ func NewSnmpClient(deviceConfig *DeviceConfig) (*SnmpClient, error) {
 
 	return &SnmpClient{
 		DeviceConfig: deviceConfig,
+		SupportBulk:  true,
 	}, nil
 }
 
@@ -346,9 +348,18 @@ func (client *SnmpClient) Walk(rootOid string) (results []ReadResult, err error)
 		return nil, err
 	}
 
-	resultSet, err := goSnmp.BulkWalkAll(rootOid)
-	if err != nil {
-		return nil, err
+	var resultSet []gosnmp.SnmpPDU
+
+	if client.SupportBulk {
+		resultSet, err = goSnmp.BulkWalkAll(rootOid)
+		if err != nil {
+			client.SupportBulk = false
+		}
+	} else {
+		resultSet, err = goSnmp.WalkAll(rootOid)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	defer func() {

pkg/snmp/servers/snmp_server_factory.go

@@ -2,8 +2,8 @@ package servers
 
 import (
 	"fmt"
-	"strings"
 	log "github.com/sirupsen/logrus"
+	"strings"
 )
 
 // CreateSnmpServer creates a SnmpServer from the configuration data model string.
@@ -39,7 +39,7 @@ func CreateSnmpServer(data map[string]interface{}) (server *SnmpServer, err erro
 	if model == "SU10000RT3UPM" {
 		var trippliteups *TrippliteUps
 		trippliteups, err = NewTrippliteUps(data)
-		log.Debugf("Error is: [%s]", err)
+		log.Errorf("Error is: [%s]", err)
 		if err == nil {
 			server = trippliteups.SnmpServer
 			return