lvkm/pyrad3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

somewhat woring evs decoding

Browse Source
This commit is contained in:
Istvan Ruzman
2022-02-21 18:24:43 +01:00
parent 2782b6950c
commit 0af5d95316
5 changed files with 76 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
tests/dictionaries/dict
View File

@@ -81,44 +81,44 @@ ATTRIBUTE VENDOR10-TAGGED-ETHER 116 ether has_tag
END-VENDOR TEST10
BEGIN-VENDOR TEST10 format=RFC-SPACE-TYPE-EVS
ATTRIBUTE VENDOR10-EVS-TYPE-STRING 19.21.1234.1 string
ATTRIBUTE VENDOR10-EVS-TYPE-OCTETS 19.21.1234.2 octets
ATTRIBUTE VENDOR10-EVS-TYPE-DATE 19.21.1234.3 date
ATTRIBUTE VENDOR10-EVS-TYPE-ABINARY 19.21.1234.4 abinary
ATTRIBUTE VENDOR10-EVS-TYPE-BYTE 19.21.1234.5 byte
ATTRIBUTE VENDOR10-EVS-TYPE-SHORT 19.21.1234.6 short
ATTRIBUTE VENDOR10-EVS-TYPE-INTEGER 19.21.1234.7 integer
ATTRIBUTE VENDOR10-EVS-TYPE-SIGNED 19.21.1234.8 signed
ATTRIBUTE VENDOR10-EVS-TYPE-INTEGER64 19.21.1234.9 integer64
ATTRIBUTE VENDOR10-EVS-TYPE-IPADDR 19.21.1234.10 ipaddr
ATTRIBUTE VENDOR10-EVS-TYPE-IPV4PREFIX 19.21.1234.11 ipv4prefix
ATTRIBUTE VENDOR10-EVS-TYPE-IPV6ADDR 19.21.1234.12 ipv6addr
ATTRIBUTE VENDOR10-EVS-TYPE-IPV6PREFIX 19.21.1234.13 ipv6prefix
ATTRIBUTE VENDOR10-EVS-TYPE-COMBOIP 19.21.1234.14 comboip
ATTRIBUTE VENDOR10-EVS-TYPE-IFID 19.21.1234.15 ifid
ATTRIBUTE VENDOR10-EVS-TYPE-ETHER 19.21.1234.16 ether
ATTRIBUTE VENDOR10-EVS-TYPE-TLV 19.21.1234.18 tlv
END-VENDOR
ATTRIBUTE VENDOR10-EVS-TYPE-STRING 1 string
ATTRIBUTE VENDOR10-EVS-TYPE-OCTETS 2 octets
ATTRIBUTE VENDOR10-EVS-TYPE-DATE 3 date
ATTRIBUTE VENDOR10-EVS-TYPE-ABINARY 4 abinary
ATTRIBUTE VENDOR10-EVS-TYPE-BYTE 5 byte
ATTRIBUTE VENDOR10-EVS-TYPE-SHORT 6 short
ATTRIBUTE VENDOR10-EVS-TYPE-INTEGER 7 integer
ATTRIBUTE VENDOR10-EVS-TYPE-SIGNED 8 signed
ATTRIBUTE VENDOR10-EVS-TYPE-INTEGER64 9 integer64
ATTRIBUTE VENDOR10-EVS-TYPE-IPADDR 10 ipaddr
ATTRIBUTE VENDOR10-EVS-TYPE-IPV4PREFIX 11 ipv4prefix
ATTRIBUTE VENDOR10-EVS-TYPE-IPV6ADDR 12 ipv6addr
ATTRIBUTE VENDOR10-EVS-TYPE-IPV6PREFIX 13 ipv6prefix
ATTRIBUTE VENDOR10-EVS-TYPE-COMBOIP 14 comboip
ATTRIBUTE VENDOR10-EVS-TYPE-IFID 15 ifid
ATTRIBUTE VENDOR10-EVS-TYPE-ETHER 16 ether
ATTRIBUTE VENDOR10-EVS-TYPE-TLV 18 tlv
END-VENDOR TEST10
BEGIN-VENDOR TEST10 format=RFC-SPACE-TYPE-EVS
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-STRING 20.21.1234.1 string
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-OCTETS 20.21.1234.2 octets
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-DATE 20.21.1234.3 date
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-ABINARY 20.21.1234.4 abinary
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-BYTE 20.21.1234.5 byte
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-SHORT 20.21.1234.6 short
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-INTEGER 20.21.1234.7 integer
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-SIGNED 20.21.1234.8 signed
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-INTEGER64 20.21.1234.9 integer64
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-IPADDR 20.21.1234.10 ipaddr
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-IPV4PREFIX 20.21.1234.11 ipv4prefix
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-IPV6ADDR 20.21.1234.12 ipv6addr
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-IPV6PREFIX 20.21.1234.13 ipv6prefix
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-COMBOIP 20.21.1234.14 comboip
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-IFID 20.21.1234.15 ifid
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-ETHER 20.21.1234.16 ether
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-TLV 20.21.1234.18 tlv
END-VENDOR
BEGIN-VENDOR TEST10 format=RFC-SPACE-TYPE-LONG-EVS
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-STRING 1 string
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-OCTETS 2 octets
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-DATE 3 date
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-ABINARY 4 abinary
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-BYTE 5 byte
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-SHORT 6 short
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-INTEGER 7 integer
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-SIGNED 8 signed
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-INTEGER64 9 integer64
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-IPADDR 10 ipaddr
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-IPV4PREFIX 11 ipv4prefix
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-IPV6ADDR 12 ipv6addr
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-IPV6PREFIX 13 ipv6prefix
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-COMBOIP 14 comboip
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-IFID 15 ifid
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-ETHER 16 ether
ATTRIBUTE VENDOR10-LONG-EVS-TYPE-TLV 18 tlv
END-VENDOR TEST10
VENDOR TEST11 1235 format=1,1

15
tests/test_dictionary.py
View File

@@ -419,4 +419,17 @@ def test_extended_evs():
"END-VENDOR TEST-VENDOR"
)
dd = Dictionary("", dictionary)
assert dd["VENDOR-ATTRIBUTE"].code == [10, 20, 10]
assert dd["VENDOR-ATTRIBUTE"].code == [10, 20, 1234, 10]
def test_long_extended_evs():
dictionary = StringIO(
"ATTRIBUTE RFC-LONGEXTENDED 10 extended\n"
"ATTRIBUTE RFC-LONGEXTENDED-EVS 10.20 evs\n"
"VENDOR TEST-VENDOR 1234\n"
"BEGIN-VENDOR TEST-VENDOR format=RFC-LONGEXTENDED-EVS\n"
"ATTRIBUTE VENDOR-ATTRIBUTE 10 integer\n"
"END-VENDOR TEST-VENDOR"
)
dd = Dictionary("", dictionary)
assert dd["VENDOR-ATTRIBUTE"].code == [10, 20, 1234, 10]