зеркало из https://github.com/microsoft/Tx.git
Added ability to expose OctetString value for an OID as byte array.
This commit is contained in:
Sergey Baranchenkov
Родитель
67a5fef25e
Коммит
7b2d716edd
|
|
@ -5,5 +5,5 @@ using System.Reflection;
|
|||
[assembly: AssemblyCompany("Microsoft")]
|
||||
[assembly: AssemblyProduct("Tx (LINQ to Logs and Traces)")]
|
||||
[assembly: AssemblyCopyright("Copyright © Microsoft. All Rights Reserved")]
|
||||
[assembly: AssemblyVersion("1.0.61007.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.61007.0")]
|
||||
[assembly: AssemblyVersion("1.0.61014.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.61014.0")]
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ namespace Tx.Network.Snmp.Dynamic
|
|||
using System.Net;
|
||||
using System.Reactive;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
|
||||
/// <summary>
|
||||
/// TypeMap implementation for SNMP attributed classes.
|
||||
|
|
@ -130,9 +131,19 @@ namespace Tx.Network.Snmp.Dynamic
|
|||
{
|
||||
convertedValue = Expression.Convert(convertedValue, typeof(int));
|
||||
}
|
||||
else if (p.PropertyType == typeof(byte[]))
|
||||
{
|
||||
convertedValue = Expression.Call(
|
||||
Expression.Property(null, typeof(Encoding).GetProperties().Single(n => n.Name.Equals("UTF8", StringComparison.Ordinal))),
|
||||
typeof(Encoding).GetMethod("GetBytes", new[] { typeof(string) }),
|
||||
Expression.Convert(convertedValue, typeof(string)));
|
||||
}
|
||||
|
||||
var conditional = Expression.Condition(foundValue, Expression.Convert(convertedValue, p.PropertyType),
|
||||
var conditional = Expression.Condition(
|
||||
foundValue,
|
||||
Expression.Convert(convertedValue, p.PropertyType),
|
||||
Expression.Default(p.PropertyType));
|
||||
|
||||
var b = Expression.Bind(p, conditional);
|
||||
bindings.Add(b);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,194 +1,250 @@
|
|||
|
||||
namespace Tests.Tx.Network
|
||||
{
|
||||
using System;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.NetworkInformation;
|
||||
using System.Net.Sockets;
|
||||
|
||||
using global::Tx.Network;
|
||||
using global::Tx.Network.Snmp;
|
||||
using global::Tx.Network.Snmp.Dynamic;
|
||||
|
||||
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||
|
||||
[TestClass]
|
||||
public class TrapTypeMapTests
|
||||
{
|
||||
private UdpDatagram fakeTrapUdp;
|
||||
|
||||
[TestInitialize]
|
||||
public void TestInitialize()
|
||||
{
|
||||
var integerVarBind = new VarBind(
|
||||
new ObjectIdentifier("1.3.6.1.4.1.1.1.1"),
|
||||
5L,
|
||||
new Asn1TagInfo(Asn1Tag.Integer, ConstructType.Primitive, Asn1Class.Universal));
|
||||
|
||||
var sysUpTime = new VarBind(new ObjectIdentifier("1.3.6.1.2.1.1.3.0"),
|
||||
506009u,
|
||||
new Asn1TagInfo(Asn1SnmpTag.TimeTicks));
|
||||
|
||||
var trapVb = new VarBind(new ObjectIdentifier("1.3.6.1.6.3.1.1.4.1.0"),
|
||||
new ObjectIdentifier("1.3.6.1.4.1.500.12"),
|
||||
new Asn1TagInfo(Asn1Tag.ObjectIdentifier, ConstructType.Primitive, Asn1Class.Universal));
|
||||
|
||||
var extraneousVb = new VarBind(new ObjectIdentifier("1.3.6.1.6.3.1.1.42.42.42.0"),
|
||||
8938ul,
|
||||
new Asn1TagInfo(Asn1SnmpTag.Counter64));
|
||||
|
||||
var packet = new SnmpDatagram(
|
||||
PduType.SNMPv2Trap,
|
||||
SnmpVersion.V2C,
|
||||
"Community",
|
||||
50000,
|
||||
SnmpErrorStatus.NoError,
|
||||
0,
|
||||
new[] { sysUpTime, trapVb, integerVarBind, extraneousVb });
|
||||
|
||||
var encoded = packet.ToSnmpEncodedByteArray();
|
||||
|
||||
var ipPacket = new IpPacket(
|
||||
NetworkInterfaceComponent.IPv4,
|
||||
Byte.MaxValue,
|
||||
Byte.MaxValue,
|
||||
Byte.MaxValue,
|
||||
UInt16.MaxValue,
|
||||
UInt16.MaxValue,
|
||||
Byte.MaxValue,
|
||||
UInt16.MaxValue,
|
||||
Byte.MaxValue,
|
||||
ProtocolType.Udp,
|
||||
IPAddress.Parse("1.1.1.1"),
|
||||
IPAddress.Parse("2.2.2.2"),
|
||||
new byte[0],
|
||||
new byte[0]);
|
||||
|
||||
this.fakeTrapUdp = new UdpDatagram(ipPacket, 10, 10, (ushort)(encoded.Length + 8), encoded);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void TestUnattributedClassReturnsDefaultKey()
|
||||
{
|
||||
var typeMap = new TrapTypeMap();
|
||||
var key = typeMap.GetTypeKey(typeof(UnmarkedTrap));
|
||||
|
||||
Assert.IsNotNull(key);
|
||||
Assert.AreEqual(default(ObjectIdentifier), key);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void TestUnattributedClassReturnsNullTransform()
|
||||
{
|
||||
var typeMap = new TrapTypeMap();
|
||||
var transform = typeMap.GetTransform(typeof(UnmarkedTrap));
|
||||
|
||||
Assert.IsNull(transform);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void TestFakeTrapTransform()
|
||||
{
|
||||
var typeMap = new TrapTypeMap();
|
||||
|
||||
var transform = typeMap.GetTransform(typeof(FakeTrap));
|
||||
|
||||
Assert.IsNotNull(transform);
|
||||
|
||||
var receivedTime = DateTimeOffset.UtcNow;
|
||||
this.fakeTrapUdp.ReceivedTime = receivedTime;
|
||||
var transformedOutput = transform(this.fakeTrapUdp) as FakeTrap;
|
||||
|
||||
Assert.IsNotNull(transformedOutput);
|
||||
Assert.AreEqual(506009u, transformedOutput.SysUpTime);
|
||||
Assert.AreEqual(5L, transformedOutput.Integer);
|
||||
Assert.IsNotNull(transformedOutput.Objects);
|
||||
Assert.AreEqual(4, transformedOutput.Objects.Count);
|
||||
Assert.AreEqual(IPAddress.Parse("1.1.1.1"), transformedOutput.SourceAddress);
|
||||
Assert.AreEqual(receivedTime, transformedOutput.ReceivedTime);
|
||||
|
||||
var varbinds = transformedOutput.Objects;
|
||||
var extraneous = varbinds.FirstOrDefault(vb => vb.Oid.Equals(new ObjectIdentifier("1.3.6.1.6.3.1.1.42.42.42.0")));
|
||||
|
||||
Assert.IsNotNull(extraneous);
|
||||
Assert.AreNotEqual(default(VarBind), extraneous);
|
||||
Assert.AreEqual(8938ul, extraneous.Value);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void TestNullTrap()
|
||||
{
|
||||
var typeMap = new TrapTypeMap();
|
||||
|
||||
var transform = typeMap.GetTransform(typeof(FakeTrap));
|
||||
|
||||
Assert.IsNotNull(transform);
|
||||
|
||||
var transformedOutput = transform(null) as FakeTrap;
|
||||
|
||||
Assert.IsNull(transformedOutput);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void TestFakeTrapStringIpTransform()
|
||||
{
|
||||
var typeMap = new TrapTypeMap();
|
||||
|
||||
var transform = typeMap.GetTransform(typeof(FakeTrapStringIp));
|
||||
|
||||
Assert.IsNotNull(transform);
|
||||
|
||||
var transformedOutput = transform(this.fakeTrapUdp) as FakeTrapStringIp;
|
||||
|
||||
Assert.IsNotNull(transformedOutput);
|
||||
Assert.AreEqual("1.1.1.1", transformedOutput.SourceAddress);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void TestFakeTrapInputKey()
|
||||
{
|
||||
var typeMap = new TrapTypeMap();
|
||||
var inputKey = typeMap.GetInputKey(this.fakeTrapUdp);
|
||||
|
||||
Assert.AreEqual(new ObjectIdentifier("1.3.6.1.4.1.500.12"), inputKey);
|
||||
|
||||
var typeKey = typeMap.GetTypeKey(typeof(FakeTrap));
|
||||
|
||||
Assert.AreEqual(inputKey, typeKey);
|
||||
}
|
||||
|
||||
[SnmpTrap("1.3.6.1.4.1.500.12")]
|
||||
internal class FakeTrap
|
||||
{
|
||||
[SnmpOid("1.3.6.1.2.1.1.3.0")]
|
||||
public uint SysUpTime { get; set; }
|
||||
|
||||
[SnmpOid("1.3.6.1.4.1.1.1.1")]
|
||||
public long Integer { get; set; }
|
||||
|
||||
[IpAddress]
|
||||
public IPAddress SourceAddress { get; set; }
|
||||
|
||||
[NotificationObjects]
|
||||
|
||||
namespace Tests.Tx.Network
|
||||
{
|
||||
using System;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Net.NetworkInformation;
|
||||
using System.Net.Sockets;
|
||||
using System.Text;
|
||||
|
||||
using global::Tx.Network;
|
||||
using global::Tx.Network.Snmp;
|
||||
using global::Tx.Network.Snmp.Dynamic;
|
||||
|
||||
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||
|
||||
[TestClass]
|
||||
public class TrapTypeMapTests
|
||||
{
|
||||
private UdpDatagram fakeTrapUdp;
|
||||
|
||||
private IpPacket fakeIpPacket;
|
||||
|
||||
[TestInitialize]
|
||||
public void TestInitialize()
|
||||
{
|
||||
var integerVarBind = new VarBind(
|
||||
new ObjectIdentifier("1.3.6.1.4.1.1.1.1"),
|
||||
5L,
|
||||
new Asn1TagInfo(Asn1Tag.Integer, ConstructType.Primitive, Asn1Class.Universal));
|
||||
|
||||
var sysUpTime = new VarBind(new ObjectIdentifier("1.3.6.1.2.1.1.3.0"),
|
||||
506009u,
|
||||
new Asn1TagInfo(Asn1SnmpTag.TimeTicks));
|
||||
|
||||
var trapVb = new VarBind(new ObjectIdentifier("1.3.6.1.6.3.1.1.4.1.0"),
|
||||
new ObjectIdentifier("1.3.6.1.4.1.500.12"),
|
||||
new Asn1TagInfo(Asn1Tag.ObjectIdentifier, ConstructType.Primitive, Asn1Class.Universal));
|
||||
|
||||
var extraneousVb = new VarBind(new ObjectIdentifier("1.3.6.1.6.3.1.1.42.42.42.0"),
|
||||
8938ul,
|
||||
new Asn1TagInfo(Asn1SnmpTag.Counter64));
|
||||
|
||||
var packet = new SnmpDatagram(
|
||||
PduType.SNMPv2Trap,
|
||||
SnmpVersion.V2C,
|
||||
"Community",
|
||||
50000,
|
||||
SnmpErrorStatus.NoError,
|
||||
0,
|
||||
new[] { sysUpTime, trapVb, integerVarBind, extraneousVb });
|
||||
|
||||
var encoded = packet.ToSnmpEncodedByteArray();
|
||||
|
||||
this.fakeIpPacket = new IpPacket(
|
||||
NetworkInterfaceComponent.IPv4,
|
||||
Byte.MaxValue,
|
||||
Byte.MaxValue,
|
||||
Byte.MaxValue,
|
||||
UInt16.MaxValue,
|
||||
UInt16.MaxValue,
|
||||
Byte.MaxValue,
|
||||
UInt16.MaxValue,
|
||||
Byte.MaxValue,
|
||||
ProtocolType.Udp,
|
||||
IPAddress.Parse("1.1.1.1"),
|
||||
IPAddress.Parse("2.2.2.2"),
|
||||
new byte[0],
|
||||
new byte[0]);
|
||||
|
||||
this.fakeTrapUdp = new UdpDatagram(this.fakeIpPacket, 10, 10, (ushort)(encoded.Length + 8), encoded);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void TestUnattributedClassReturnsDefaultKey()
|
||||
{
|
||||
var typeMap = new TrapTypeMap();
|
||||
var key = typeMap.GetTypeKey(typeof(UnmarkedTrap));
|
||||
|
||||
Assert.IsNotNull(key);
|
||||
Assert.AreEqual(default(ObjectIdentifier), key);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void TestUnattributedClassReturnsNullTransform()
|
||||
{
|
||||
var typeMap = new TrapTypeMap();
|
||||
var transform = typeMap.GetTransform(typeof(UnmarkedTrap));
|
||||
|
||||
Assert.IsNull(transform);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void TestFakeTrapTransform()
|
||||
{
|
||||
var typeMap = new TrapTypeMap();
|
||||
|
||||
var transform = typeMap.GetTransform(typeof(FakeTrap));
|
||||
|
||||
Assert.IsNotNull(transform);
|
||||
|
||||
var receivedTime = DateTimeOffset.UtcNow;
|
||||
this.fakeTrapUdp.ReceivedTime = receivedTime;
|
||||
var transformedOutput = transform(this.fakeTrapUdp) as FakeTrap;
|
||||
|
||||
Assert.IsNotNull(transformedOutput);
|
||||
Assert.AreEqual(506009u, transformedOutput.SysUpTime);
|
||||
Assert.AreEqual(5L, transformedOutput.Integer);
|
||||
Assert.IsNotNull(transformedOutput.Objects);
|
||||
Assert.AreEqual(4, transformedOutput.Objects.Count);
|
||||
Assert.AreEqual(IPAddress.Parse("1.1.1.1"), transformedOutput.SourceAddress);
|
||||
Assert.AreEqual(receivedTime, transformedOutput.ReceivedTime);
|
||||
|
||||
var varbinds = transformedOutput.Objects;
|
||||
var extraneous = varbinds.FirstOrDefault(vb => vb.Oid.Equals(new ObjectIdentifier("1.3.6.1.6.3.1.1.42.42.42.0")));
|
||||
|
||||
Assert.IsNotNull(extraneous);
|
||||
Assert.AreNotEqual(default(VarBind), extraneous);
|
||||
Assert.AreEqual(8938ul, extraneous.Value);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void TestNullTrap()
|
||||
{
|
||||
var typeMap = new TrapTypeMap();
|
||||
|
||||
var transform = typeMap.GetTransform(typeof(FakeTrap));
|
||||
|
||||
Assert.IsNotNull(transform);
|
||||
|
||||
var transformedOutput = transform(null) as FakeTrap;
|
||||
|
||||
Assert.IsNull(transformedOutput);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void TestFakeTrapStringIpTransform()
|
||||
{
|
||||
var typeMap = new TrapTypeMap();
|
||||
|
||||
var transform = typeMap.GetTransform(typeof(FakeTrapStringIp));
|
||||
|
||||
Assert.IsNotNull(transform);
|
||||
|
||||
var transformedOutput = transform(this.fakeTrapUdp) as FakeTrapStringIp;
|
||||
|
||||
Assert.IsNotNull(transformedOutput);
|
||||
Assert.AreEqual("1.1.1.1", transformedOutput.SourceAddress);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void TestFakeTrapInputKey()
|
||||
{
|
||||
var typeMap = new TrapTypeMap();
|
||||
var inputKey = typeMap.GetInputKey(this.fakeTrapUdp);
|
||||
|
||||
Assert.AreEqual(new ObjectIdentifier("1.3.6.1.4.1.500.12"), inputKey);
|
||||
|
||||
var typeKey = typeMap.GetTypeKey(typeof(FakeTrap));
|
||||
|
||||
Assert.AreEqual(inputKey, typeKey);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void Test_OctetStringAsByteArray()
|
||||
{
|
||||
var typeMap = new TrapTypeMap();
|
||||
|
||||
var transform = typeMap.GetTransform(typeof(FakeTrap2));
|
||||
|
||||
Assert.IsNotNull(transform);
|
||||
|
||||
var octetStringVarBind = new VarBind(
|
||||
new ObjectIdentifier("1.3.6.1.4.1.562.29.6.2.2"),
|
||||
"Hello",
|
||||
new Asn1TagInfo(Asn1Tag.OctetString, ConstructType.Primitive, Asn1Class.Universal));
|
||||
|
||||
var sysUpTime = new VarBind(new ObjectIdentifier("1.3.6.1.2.1.1.3.0"),
|
||||
506009u,
|
||||
new Asn1TagInfo(Asn1SnmpTag.TimeTicks));
|
||||
|
||||
var trapVb = new VarBind(new ObjectIdentifier("1.3.6.1.6.3.1.1.4.1.0"),
|
||||
new ObjectIdentifier("1.3.6.1.4.1.500.12"),
|
||||
new Asn1TagInfo(Asn1Tag.ObjectIdentifier, ConstructType.Primitive, Asn1Class.Universal));
|
||||
|
||||
var packet = new SnmpDatagram(
|
||||
PduType.SNMPv2Trap,
|
||||
SnmpVersion.V2C,
|
||||
"Community",
|
||||
50000,
|
||||
SnmpErrorStatus.NoError,
|
||||
0,
|
||||
new[] { sysUpTime, trapVb, octetStringVarBind });
|
||||
|
||||
var encoded = packet.ToSnmpEncodedByteArray();
|
||||
|
||||
var udpDatagram = new UdpDatagram(this.fakeIpPacket, 10, 10, (ushort)(encoded.Length + 8), encoded);
|
||||
|
||||
var transformedOutput = transform(udpDatagram) as FakeTrap2;
|
||||
|
||||
Assert.IsNotNull(transformedOutput);
|
||||
Assert.IsNotNull(transformedOutput.Property);
|
||||
Assert.AreEqual("Hello", Encoding.UTF8.GetString(transformedOutput.Property));
|
||||
Assert.AreEqual("Hello", transformedOutput.StringProperty);
|
||||
}
|
||||
|
||||
[SnmpTrap("1.3.6.1.4.1.500.12")]
|
||||
internal class FakeTrap2
|
||||
{
|
||||
[SnmpOid("1.3.6.1.4.1.562.29.6.2.2")]
|
||||
public byte[] Property { get; set; }
|
||||
|
||||
[SnmpOid("1.3.6.1.4.1.562.29.6.2.2")]
|
||||
public string StringProperty { get; set; }
|
||||
}
|
||||
|
||||
[SnmpTrap("1.3.6.1.4.1.500.12")]
|
||||
internal class FakeTrap
|
||||
{
|
||||
[SnmpOid("1.3.6.1.2.1.1.3.0")]
|
||||
public uint SysUpTime { get; set; }
|
||||
|
||||
[SnmpOid("1.3.6.1.4.1.1.1.1")]
|
||||
public long Integer { get; set; }
|
||||
|
||||
[IpAddress]
|
||||
public IPAddress SourceAddress { get; set; }
|
||||
|
||||
[NotificationObjects]
|
||||
public ReadOnlyCollection<VarBind> Objects { get; set; }
|
||||
|
||||
[Timestamp]
|
||||
public DateTimeOffset ReceivedTime { get; set; }
|
||||
}
|
||||
|
||||
[SnmpTrap("1.3.6.1.4.1.500.12")]
|
||||
internal class FakeTrapStringIp
|
||||
{
|
||||
[IpAddress]
|
||||
public string SourceAddress { get; set; }
|
||||
}
|
||||
|
||||
internal class UnmarkedTrap
|
||||
{
|
||||
[SnmpOid("1.3.6.1.2.1.1.3.0")]
|
||||
public uint SysUpTime { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
||||
public DateTimeOffset ReceivedTime { get; set; }
|
||||
}
|
||||
|
||||
[SnmpTrap("1.3.6.1.4.1.500.12")]
|
||||
internal class FakeTrapStringIp
|
||||
{
|
||||
[IpAddress]
|
||||
public string SourceAddress { get; set; }
|
||||
}
|
||||
|
||||
internal class UnmarkedTrap
|
||||
{
|
||||
[SnmpOid("1.3.6.1.2.1.1.3.0")]
|
||||
public uint SysUpTime { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче