Skip to content

Commit 29927d3

Browse files
ccie18643ccie18643
committed
code cleanup
1 parent 7cededa commit 29927d3

File tree

29 files changed

+805
-309
lines changed

29 files changed

+805
-309
lines changed

‎net_proto/tests/unit/protocols/arp/test__arp__parser__sanity_checks.py‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -132,23 +132,21 @@
132132
},
133133
{
134134
"_description": "The SPA field is unspecified in ARP Reply.",
135-
"_frame_rx": [
136-
(
137-
# ARP (Ethernet/IPv4)
138-
# Hardware type : 1 (Ethernet)
139-
# Protocol type : 0x0800 (IPv4)
140-
# HLEN / PLEN : 6 / 4
141-
# Operation : 2 (Reply)
142-
# Sender MAC : 02:00:00:00:00:91
143-
# Sender IP : 0.0.0.0
144-
# Target MAC : 02:00:00:00:00:07
145-
# Target IP : 10.0.1.7
146-
#
147-
# Summary : ARP Reply advertising unspecified sender IPv4 address.
148-
b"\x00\x01\x08\x00\x06\x04\x00\x02\x02\x00\x00\x00\x00\x91\x00\x00"
149-
b"\x00\x00\x02\x00\x00\x00\x00\x07\x0a\x00\x01\x07"
150-
),
151-
],
135+
"_frame_rx": (
136+
# ARP (Ethernet/IPv4)
137+
# Hardware type : 1 (Ethernet)
138+
# Protocol type : 0x0800 (IPv4)
139+
# HLEN / PLEN : 6 / 4
140+
# Operation : 2 (Reply)
141+
# Sender MAC : 02:00:00:00:00:91
142+
# Sender IP : 0.0.0.0
143+
# Target MAC : 02:00:00:00:00:07
144+
# Target IP : 10.0.1.7
145+
#
146+
# Summary : ARP Reply advertising unspecified sender IPv4 address.
147+
b"\x00\x01\x08\x00\x06\x04\x00\x02\x02\x00\x00\x00\x00\x91\x00\x00"
148+
b"\x00\x00\x02\x00\x00\x00\x00\x07\x0a\x00\x01\x07"
149+
),
152150
"_results": {
153151
"error_message": "The 'spa' field value 0.0.0.0 must not be a "
154152
"unspecified IPv4 address for an ARP Reply.",

‎net_proto/tests/unit/protocols/icmp4/test__icmp4__message__echo_request__parser.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
[
4646
{
4747
"_description": "ICMPv4 Echo Request message, empty data.",
48-
"_frame_rx": [
48+
"_frame_rx": (
4949
# ICMPv4 Echo Request
5050
# Type : 8 (Echo Request)
5151
# Code : 0 (Default)
@@ -55,8 +55,8 @@
5555
# Data len : 0 bytes
5656
#
5757
# Summary : Ping request ID 12345/seq 54321 with no payload.
58-
b"\x08\x00\xf3\x94\x30\x39\xd4\x31",
59-
],
58+
b"\x08\x00\xf3\x94\x30\x39\xd4\x31"
59+
),
6060
"_results": {
6161
"message": Icmp4MessageEchoRequest(
6262
cksum=62356,
@@ -68,7 +68,7 @@
6868
},
6969
{
7070
"_description": "ICMPv4 Echo Request message, non-empty data.",
71-
"_frame_rx": [
71+
"_frame_rx": (
7272
# ICMPv4 Echo Request
7373
# Type : 8 (Echo Request)
7474
# Code : 0 (Default)
@@ -80,7 +80,7 @@
8080
# Summary : Ping request ID 12345/seq 54321 carrying 16-byte payload.
8181
b"\x08\x00\x24\xbe\x30\x39\xd4\x31\x30\x31\x32\x33\x34\x35\x36\x37"
8282
b"\x38\x39\x41\x42\x43\x44\x45\x46",
83-
],
83+
),
8484
"_results": {
8585
"message": Icmp4MessageEchoRequest(
8686
cksum=9406,
@@ -92,7 +92,7 @@
9292
},
9393
{
9494
"_description": "ICMP4 Echo Request message, maximum length of data.",
95-
"_frame_rx": [
95+
"_frame_rx": (
9696
# ICMPv4 Echo Request
9797
# Type : 8 (Echo Request)
9898
# Code : 0 (Default)
@@ -104,7 +104,7 @@
104104
# Summary : Ping request at maximum payload size (65507 bytes).
105105
b"\x08\x00\x1e\xcb\x2b\x67\x56\xce"
106106
+ b"X" * 65507,
107-
],
107+
),
108108
"_results": {
109109
"message": Icmp4MessageEchoRequest(
110110
cksum=7883,

‎net_proto/tests/unit/protocols/icmp4/test__icmp4__message__echo_request__parser__integrity_checks.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@
4747
"_description": (
4848
"ICMPv4 Echo Request message, the 'ICMP4_HEADER_LEN <= self._ip4_payload_len' condition not met."
4949
),
50-
"_frame_rx": [
50+
"_frame_rx": (
5151
# ICMPv4 Echo Request
5252
# Type : 8 (Echo Request)
5353
# Code : 0 (Default)
5454
# Checksum : 0xfb?? (truncated)
5555
# Frame len: 3 bytes (< 4-byte minimum header)
5656
#
5757
# Summary : Frame shorter than ICMP header length.
58-
b"\x08\x00\xfb",
59-
],
58+
b"\x08\x00\xfb"
59+
),
6060
"_mocked_values": {
6161
"ip4__payload_len": 3,
6262
},
@@ -72,7 +72,7 @@
7272
"_description": (
7373
"ICMPv4 Echo Request message, the 'self._ip4_payload_len <= len(self._frame)' condition not met."
7474
),
75-
"_frame_rx": [
75+
"_frame_rx": (
7676
# ICMPv4 Echo Request
7777
# Type : 8 (Echo Request)
7878
# Code : 0 (Default)
@@ -82,8 +82,8 @@
8282
# Frame len: 7 bytes (< 8-byte minimum header)
8383
#
8484
# Summary : Declared payload exceeds available frame length.
85-
b"\x08\x00\xfb\x94\x30\x39\xd4",
86-
],
85+
b"\x08\x00\xfb\x94\x30\x39\xd4"
86+
),
8787
"_mocked_values": {
8888
"ip4__payload_len": 8,
8989
},
@@ -99,7 +99,7 @@
9999
"_description": (
100100
"ICMPv4 Echo Request message, the 'ICMP4_ECHO_REQUEST_LEN <= self._ip4_payload_len' condition not met."
101101
),
102-
"_frame_rx": [
102+
"_frame_rx": (
103103
# ICMPv4 Echo Request
104104
# Type : 8 (Echo Request)
105105
# Code : 0 (Default)
@@ -109,8 +109,8 @@
109109
# Frame len: 7 bytes (< 8-byte minimum message)
110110
#
111111
# Summary : Payload shorter than Echo Request fixed header.
112-
b"\x08\x00\xfb\x94\x30\x39\xd4",
113-
],
112+
b"\x08\x00\xfb\x94\x30\x39\xd4"
113+
),
114114
"_mocked_values": {
115115
"ip4__payload_len": 7,
116116
},
@@ -124,7 +124,7 @@
124124
},
125125
{
126126
"_description": "ICMPv4 Echo Request message, invalid checksum.",
127-
"_frame_rx": [
127+
"_frame_rx": (
128128
# ICMPv4 Echo Request
129129
# Type : 8 (Echo Request)
130130
# Code : 0 (Default)
@@ -134,8 +134,8 @@
134134
# Data len : 0 bytes
135135
#
136136
# Summary : Header checksum field set to zero (invalid).
137-
b"\x08\x00\x00\x00\x30\x39\xd4\x31",
138-
],
137+
b"\x08\x00\x00\x00\x30\x39\xd4\x31"
138+
),
139139
"_mocked_values": {},
140140
"_results": {
141141
"error_message": "The packet checksum must be valid.",

‎net_proto/tests/unit/protocols/icmp4/test__icmp4__message__unknown__parser.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
[
5252
{
5353
"_description": "ICMPv4 unknown message.",
54-
"_frame_rx": [
54+
"_frame_rx": (
5555
# ICMPv4 Unknown Message
5656
# Type : 255 (Unknown)
5757
# Code : 255 (Unknown)
@@ -60,8 +60,8 @@
6060
#
6161
# Summary : Vendor-specific or unsupported ICMP message with 16-byte payload.
6262
b"\xff\xff\x31\x29\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x41\x42"
63-
b"\x43\x44\x45\x46",
64-
],
63+
b"\x43\x44\x45\x46"
64+
),
6565
"_results": {
6666
"message": Icmp4MessageUnknown(
6767
type=Icmp4Type.from_int(255),

‎net_proto/tests/unit/protocols/icmp4/test__icmp4__message__unknown__parser__integrity_checks.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@
4747
"_description": (
4848
"ICMPv4 Unknown message, " "the 'ICMP4_HEADER_LEN <= self._ip4_payload_len' condition not met."
4949
),
50-
"_frame_rx": [
50+
"_frame_rx": (
5151
# ICMPv4 Unknown Message
5252
# Type : 255 (Unknown)
5353
# Code : 0 (Default)
5454
# Checksum : 0xfb?? (truncated)
5555
# Frame len: 3 bytes (< 4-byte minimum header)
5656
#
5757
# Summary : Frame shorter than ICMP header length.
58-
b"\xff\x00\xfb",
59-
],
58+
b"\xff\x00\xfb"
59+
),
6060
"_mocked_values": {
6161
"ip4__payload_len": 3,
6262
},
@@ -72,7 +72,7 @@
7272
"_description": (
7373
"ICMPv4 unknown message, " "the 'self._ip4_payload_len <= len(self._frame)' condition not met."
7474
),
75-
"_frame_rx": [
75+
"_frame_rx": (
7676
# ICMPv4 Unknown Message
7777
# Type : 255 (Unknown)
7878
# Code : 0 (Default)
@@ -81,8 +81,8 @@
8181
# Frame len: 7 bytes (< 8-byte minimum header)
8282
#
8383
# Summary : Declared payload exceeds available frame length.
84-
b"\xff\x00\xfb\x94\x30\x39\xd4",
85-
],
84+
b"\xff\x00\xfb\x94\x30\x39\xd4"
85+
),
8686
"_mocked_values": {
8787
"ip4__payload_len": 8,
8888
},
@@ -96,7 +96,7 @@
9696
},
9797
{
9898
"_description": "ICMPv4 unknown message, invalid checksum.",
99-
"_frame_rx": [
99+
"_frame_rx": (
100100
# ICMPv4 Unknown Message
101101
# Type : 255 (Unknown)
102102
# Code : 0 (Default)
@@ -105,8 +105,8 @@
105105
# Data len : 0 bytes
106106
#
107107
# Summary : Header checksum field set to zero (invalid).
108-
b"\xff\x00\x00\x00\x30\x39\xd4\x31",
109-
],
108+
b"\xff\x00\x00\x00\x30\x39\xd4\x31"
109+
),
110110
"_mocked_values": {},
111111
"_results": {
112112
"error_message": "The packet checksum must be valid.",

0 commit comments

Comments
 (0)