matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feature (contd.): Variable Fields - fixed the code to use 'step' while varying fields which was missed out earlier. Updated the test suite and made sure all test cases pass

Browse Source
This commit is contained in:
Srivats P. 2015-05-31 18:02:06 +05:30
parent 4093e52d48
commit 77f5b124e7
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/abstractprotocol.cpp
View File

@ -1061,9 +1061,8 @@ quint64 AbstractProtocol::lcm(quint64 u, quint64 v)
void AbstractProtocol::varyProtocolFrameValue(QByteArray &buf, int frameIndex, void AbstractProtocol::varyProtocolFrameValue(QByteArray &buf, int frameIndex,
const OstProto::VariableField &varField) const const OstProto::VariableField &varField) const
{ {
int x = frameIndex % varField.count(); int x = (frameIndex % varField.count()) * varField.step();
// FIXME: use vf.step()!!!!
// FIXME: use templates for duplicating code for quint8, quint16, quint32 // FIXME: use templates for duplicating code for quint8, quint16, quint32
switch (varField.type()) { switch (varField.type()) {
case OstProto::VariableField::kCounter8: { case OstProto::VariableField::kCounter8: {

19
test/vftest.py
View File

@ -210,6 +210,7 @@ try:
vf.value = 0x60 vf.value = 0x60
vf.mode = ost_pb.VariableField.kIncrement vf.mode = ost_pb.VariableField.kIncrement
vf.count = 8 vf.count = 8
vf.step = 0x10 # step by 1 and repeat each value twice!!!!!
s.protocol.add().protocol_id.id = ost_pb.Protocol.kEth2FieldNumber s.protocol.add().protocol_id.id = ost_pb.Protocol.kEth2FieldNumber
s.protocol.add().protocol_id.id = ost_pb.Protocol.kIp4FieldNumber s.protocol.add().protocol_id.id = ost_pb.Protocol.kIp4FieldNumber
@ -243,7 +244,7 @@ try:
'-o', fmt.replace('XXX', 'vlan.priority')]) '-o', fmt.replace('XXX', 'vlan.priority')])
print(cap_pkts) print(cap_pkts)
result = extract_column(cap_pkts, fmt_col) result = extract_column(cap_pkts, fmt_col)
expected = [] #FIXME expected = ['Excellent', 'Excellent', 'Controlled', 'Controlled', 'Video,', 'Video,', 'Voice,', 'Voice,', 'Excellent', 'Excellent']
log.info('result : %s' % result) log.info('result : %s' % result)
log.info('expected: %s' % expected) log.info('expected: %s' % expected)
if result == expected: if result == expected:
@ -332,12 +333,14 @@ try:
p = s.protocol.add() p = s.protocol.add()
p.protocol_id.id = ost_pb.Protocol.kMacFieldNumber p.protocol_id.id = ost_pb.Protocol.kMacFieldNumber
p.Extensions[mac].dst_mac = 0x001122334455 p.Extensions[mac].dst_mac = 0x001122334455
p.Extensions[mac].src_mac = 0x00aabbccddee p.Extensions[mac].src_mac = 0xffffffffffff
s.protocol.add().protocol_id.id = ost_pb.Protocol.kEth2FieldNumber s.protocol.add().protocol_id.id = ost_pb.Protocol.kEth2FieldNumber
p = s.protocol.add() p = s.protocol.add()
p.protocol_id.id = ost_pb.Protocol.kArpFieldNumber p.protocol_id.id = ost_pb.Protocol.kArpFieldNumber
p.Extensions[arp].sender_hw_addr = 0x001122334455
p.Extensions[arp].sender_proto_addr = 0x01020304
p.Extensions[arp].target_proto_addr = 0x0a0b0c01 p.Extensions[arp].target_proto_addr = 0x0a0b0c01
vf = p.variable_fields.add() vf = p.variable_fields.add()
vf.type = ost_pb.VariableField.kCounter32 vf.type = ost_pb.VariableField.kCounter32
@ -346,7 +349,7 @@ try:
vf.value = 0x00006400 vf.value = 0x00006400
vf.mode = ost_pb.VariableField.kDecrement vf.mode = ost_pb.VariableField.kDecrement
vf.count = 7 vf.count = 7
vf.step = 3 vf.step = 0x00000300
log.info('configuring tx_stream %d' % stream_id.stream_id[0].id) log.info('configuring tx_stream %d' % stream_id.stream_id[0].id)
drone.modifyStream(stream_cfg) drone.modifyStream(stream_cfg)
@ -372,10 +375,13 @@ try:
log.info('dumping Rx capture buffer') log.info('dumping Rx capture buffer')
cap_pkts = subprocess.check_output([tshark, '-n', '-r', 'capture.pcap', cap_pkts = subprocess.check_output([tshark, '-n', '-r', 'capture.pcap',
'-R', 'arp && frame.len==124', '-R', 'arp && frame.len==124',
'-o', fmt.replace('XXX', 'arp.dst_proto_ipv4')]) '-o', fmt.replace('XXX', 'arp.dst.proto_ipv4')
.replace('un', 'uh')])
print(cap_pkts) print(cap_pkts)
result = extract_column(cap_pkts, fmt_col) result = extract_column(cap_pkts, fmt_col)
expected = [] # FIXME expected = ['10.11.100.1', '10.11.97.1', '10.11.94.1', '10.11.91.1',
'10.11.88.1', '10.11.85.1', '10.11.82.1', '10.11.100.1',
'10.11.97.1', '10.11.94.1']
log.info('result : %s' % result) log.info('result : %s' % result)
log.info('expected: %s' % expected) log.info('expected: %s' % expected)
if result == expected: if result == expected:
@ -550,7 +556,7 @@ try:
vf.value = 0x00ab0000 vf.value = 0x00ab0000
vf.mode = ost_pb.VariableField.kIncrement vf.mode = ost_pb.VariableField.kIncrement
vf.count = 3 vf.count = 3
vf.step = 2 vf.step = 0x00020000
s.protocol.add().protocol_id.id = ost_pb.Protocol.kUdpFieldNumber s.protocol.add().protocol_id.id = ost_pb.Protocol.kUdpFieldNumber
s.protocol.add().protocol_id.id = ost_pb.Protocol.kPayloadFieldNumber s.protocol.add().protocol_id.id = ost_pb.Protocol.kPayloadFieldNumber
@ -940,6 +946,7 @@ try:
vf.value = 0x00000100 vf.value = 0x00000100
vf.mode = ost_pb.VariableField.kIncrement vf.mode = ost_pb.VariableField.kIncrement
vf.count = 10 vf.count = 10
vf.step = 0x00000100
p = s.protocol.add() p = s.protocol.add()
p.protocol_id.id = ost_pb.Protocol.kTcpFieldNumber p.protocol_id.id = ost_pb.Protocol.kTcpFieldNumber