Expect a string from gosnmp PDUs of type OctetString (#12)

* gosnmp now returns a string for PDU type OctetString

* Updates unit tests to use string type for OctetString PDU types.

metrics/metrics.go

@@ -67,8 +67,7 @@ func mustGetIfaces(client snmp.Client, machine string) map[string]map[string]str
 		oidParts := strings.Split(pdu.Name, ".")
 		iface := oidParts[len(oidParts)-1]
 
-		b := pdu.Value.([]byte)
-		val := strings.TrimSpace(string(b))
+		val := strings.TrimSpace(pdu.Value.(string))
 		if val == machine {
 			ifDescrOid := createOID(ifDescrOidStub, iface)
 			oidMap, err := getOidsString(client, []string{ifDescrOid})
@@ -110,7 +109,7 @@ func getOidsString(client snmp.Client, oids []string) (map[string]string, error)
 	oidMap := make(map[string]string)
 	result, err := client.Get(oids)
 	for _, pdu := range result.Variables {
-		oidMap[pdu.Name] = string(pdu.Value.([]byte))
+		oidMap[pdu.Name] = pdu.Value.(string)
 	}
 	return oidMap, err
 }

metrics/metrics_test.go

@@ -56,7 +56,7 @@ var snmpPacketMachine = gosnmp.SnmpPacket{
 		{
 			Name:  ifDescrMachineOID,
 			Type:  gosnmp.OctetString,
-			Value: []byte("xe-0/0/12"),
+			Value: "xe-0/0/12",
 		},
 	},
 }
@@ -66,7 +66,7 @@ var snmpPacketUplink = gosnmp.SnmpPacket{
 		{
 			Name:  ifDescrUplinkOID,
 			Type:  gosnmp.OctetString,
-			Value: []byte("xe-0/0/45"),
+			Value: "xe-0/0/45",
 		},
 	},
 }
@@ -141,12 +141,12 @@ func (m *mockSwitchClient) BulkWalkAll(rootOid string) (results []gosnmp.SnmpPDU
 		{
 			Name:  ifDescrMachineOID,
 			Type:  gosnmp.OctetString,
-			Value: []byte("mlab2"),
+			Value: "mlab2",
 		},
 		{
 			Name:  ifDescrUplinkOID,
 			Type:  gosnmp.OctetString,
-			Value: []byte("uplink-10g"),
+			Value: "uplink-10g",
 		},
 	}, nil
 }