Skip to content

Commit 89b8629

Browse files
PlagueCZPlagueCZ
committed
Remove unneeded packet type specifications in pytest
1 parent 0b8d6da commit 89b8629

File tree

11 files changed

+88
-88
lines changed

11 files changed

+88
-88
lines changed

‎test/local/helpers.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ def stop_process(process):
212212

213213

214214
def _send_external_icmp_echo(dst_ipv4, ul_ipv6):
215-
icmp_pkt = (Ether(dst=PF0.mac, src=ipv6_multicast_mac, type=0x86DD) /
216-
IPv6(dst=ul_ipv6, src=router_ul_ipv6, nh=4) /
215+
icmp_pkt = (Ether(dst=PF0.mac, src=ipv6_multicast_mac) /
216+
IPv6(dst=ul_ipv6, src=router_ul_ipv6) /
217217
IP(dst=dst_ipv4, src=public_ip) /
218218
ICMP(type=8, id=0x0040))
219219
delayed_sendp(icmp_pkt, PF0.tap)
@@ -226,9 +226,9 @@ def external_ping(dst_ipv4, ul_ipv6):
226226

227227

228228
def _send_external_icmp_echo6(dst_ipv6, ul_ipv6):
229-
icmp_pkt = (Ether(dst=PF0.mac, src=ipv6_multicast_mac, type=0x86DD) /
230-
IPv6(dst=ul_ipv6, src=router_ul_ipv6, nh=0x29) /
231-
IPv6(dst=dst_ipv6, src=public_ipv6, nh=58) /
229+
icmp_pkt = (Ether(dst=PF0.mac, src=ipv6_multicast_mac) /
230+
IPv6(dst=ul_ipv6, src=router_ul_ipv6) /
231+
IPv6(dst=dst_ipv6, src=public_ipv6) /
232232
ICMPv6EchoRequest())
233233
delayed_sendp(icmp_pkt, PF0.tap)
234234

‎test/local/tcp_tester.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def request_tcp(self, flags, payload=None, syn_style=TCP_SYN_NORMAL):
119119
server_thread = threading.Thread(target=self.reply_tcp, args=(syn_style,))
120120
server_thread.start()
121121

122-
tcp_pkt = (Ether(dst=self.server_mac, src=self.client_mac, type=0x0800) /
122+
tcp_pkt = (Ether(dst=self.server_mac, src=self.client_mac) /
123123
IP(dst=self.server_ip, src=self.client_ip) /
124124
TCP(dport=self.server_port, sport=self.client_port, seq=self.tcp_sender_seq, flags=flags, options=[("NOP", None)]))
125125
if payload != None:
@@ -163,7 +163,7 @@ def request_tcp(self, flags, payload=None, syn_style=TCP_SYN_NORMAL):
163163
return
164164

165165
# send ACK
166-
tcp_pkt = (Ether(dst=self.server_mac, src=self.client_mac, type=0x0800) /
166+
tcp_pkt = (Ether(dst=self.server_mac, src=self.client_mac) /
167167
IP(dst=self.server_ip, src=self.client_ip) /
168168
TCP(dport=self.server_port, sport=self.client_port, flags="A", seq=self.tcp_sender_seq, ack=reply_seq))
169169
delayed_sendp(tcp_pkt, self.client_tap)
@@ -213,7 +213,7 @@ def __init__(self, client_vm, client_port, server_vm, server_port, client_pkt_ch
213213
client_pkt_check=client_pkt_check, server_pkt_check=server_pkt_check)
214214
# VM-VM local communication, stay in IPv4
215215
def get_server_l3_reply(self, pkt):
216-
return (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst, type=0x0800) /
216+
return (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst) /
217217
IP(dst=pkt[IP].src, src=pkt[IP].dst))
218218

219219
class TCPTesterVirtsvc(_TCPTester):
@@ -223,7 +223,7 @@ def __init__(self, client_vm, client_port, pf_spec, server_ip, server_port, clie
223223
client_pkt_check=client_pkt_check, server_pkt_check=server_pkt_check)
224224
# Virtual-service communication, no tunnel, replace header with IPv6
225225
def get_server_l3_reply(self, pkt):
226-
return (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst, type=0x86DD) /
226+
return (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst) /
227227
IPv6(dst=pkt[IPv6].src, src=pkt[IPv6].dst, nh=6))
228228

229229
class TCPTesterPublic(_TCPTester):
@@ -234,6 +234,6 @@ def __init__(self, client_vm, client_port, nat_ul_ipv6, pf_spec, server_ip, serv
234234
self.nat_ul_ipv6 = nat_ul_ipv6
235235
# Underlay communication, use IP-IP tunnel
236236
def get_server_l3_reply(self, pkt):
237-
return (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst, type=0x86DD) /
238-
IPv6(dst=self.nat_ul_ipv6, src=pkt[IPv6].dst, nh=4) /
237+
return (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst) /
238+
IPv6(dst=self.nat_ul_ipv6, src=pkt[IPv6].dst) /
239239
IP(dst=pkt[IP].src, src=pkt[IP].dst))

‎test/local/test_encap.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ def ipv4_in_ipv6_icmp_responder(pf_name, vm_ipv6):
1212
pkt = sniff_packet(pf_name, is_encaped_icmp_pkt)
1313
assert pkt[IPv6].dst == neigh_vni1_ul_ipv6, \
1414
"Invalid destination in encaped request"
15-
reply_pkt = (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst, type=0x86DD) /
16-
IPv6(dst=vm_ipv6, src=pkt[IPv6].dst, nh=4) /
15+
reply_pkt = (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst) /
16+
IPv6(dst=vm_ipv6, src=pkt[IPv6].dst) /
1717
IP(dst=pkt[IP].src, src=pkt[IP].dst) /
1818
ICMP(type=0))
1919
delayed_sendp(reply_pkt, pf_name)
2020

2121
def send_ipv4_icmp(dst_ip, pf_name, responder, vm_ipv6):
2222
threading.Thread(target=responder, args=(pf_name, vm_ipv6)).start()
23-
icmp_echo_pkt = (Ether(dst=PF0.mac, src=VM1.mac, type=0x0800) /
23+
icmp_echo_pkt = (Ether(dst=PF0.mac, src=VM1.mac) /
2424
IP(dst=dst_ip, src=VM1.ip) /
2525
ICMP(type=8))
2626
delayed_sendp(icmp_echo_pkt, VM1.tap)
@@ -38,9 +38,9 @@ def ipv6_in_ipv6_icmp6_responder(pf_name, vm_ul_ipv6):
3838
pkt = sniff_packet(pf_name, is_encaped_icmpv6_pkt)
3939
assert pkt[IPv6].dst == neigh_vni1_ul_ipv6, \
4040
"Invalid destination in encaped request"
41-
reply_pkt = (Ether(dst=pkt.getlayer(Ether).src, src=pkt.getlayer(Ether).dst, type=0x86DD) /
42-
IPv6(dst=vm_ul_ipv6, src=pkt.getlayer(IPv6,1).dst, nh=0x29) /
43-
IPv6(dst=pkt.getlayer(IPv6,2).src, src=pkt.getlayer(IPv6,2).dst, nh=58) /
41+
reply_pkt = (Ether(dst=pkt.getlayer(Ether).src, src=pkt.getlayer(Ether).dst) /
42+
IPv6(dst=vm_ul_ipv6, src=pkt.getlayer(IPv6,1).dst) /
43+
IPv6(dst=pkt.getlayer(IPv6,2).src, src=pkt.getlayer(IPv6,2).dst) /
4444
ICMPv6EchoReply(type=129))
4545
delayed_sendp(reply_pkt, pf_name)
4646

@@ -51,8 +51,8 @@ def test_ipv6_in_ipv6(prepare_ifaces, port_redundancy):
5151

5252
threading.Thread(target=ipv6_in_ipv6_icmp6_responder, args=(PF0.tap, VM1.ul_ipv6)).start()
5353

54-
icmp_echo_pkt = (Ether(dst=PF0.mac, src=VM1.mac, type=0x86DD) /
55-
IPv6(dst=f"{neigh_vni1_ov_ipv6_prefix}::123", src=VM1.ipv6, nh=58) /
54+
icmp_echo_pkt = (Ether(dst=PF0.mac, src=VM1.mac) /
55+
IPv6(dst=f"{neigh_vni1_ov_ipv6_prefix}::123", src=VM1.ipv6) /
5656
ICMPv6EchoRequest())
5757
delayed_sendp(icmp_echo_pkt, VM1.tap)
5858

‎test/local/test_flows.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ def test_nat_table_flush(prepare_ipv4, grpc_client, port_redundancy):
4949

5050

5151
def send_bounce_pkt_to_pf(ipv6_nat):
52-
bounce_pkt = (Ether(dst=ipv6_multicast_mac, src=PF0.mac, type=0x86DD) /
53-
IPv6(dst=ipv6_nat, src=router_ul_ipv6, nh=4) /
52+
bounce_pkt = (Ether(dst=ipv6_multicast_mac, src=PF0.mac) /
53+
IPv6(dst=ipv6_nat, src=router_ul_ipv6) /
5454
IP(dst=nat_vip, src=public_ip) /
5555
TCP(sport=8989, dport=510))
5656
delayed_sendp(bounce_pkt, PF0.tap)

‎test/local/test_lb.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ def router_loopback(dst_ipv6, check_ipv4_src, check_ipv4_dst):
1919
f"Invalid LB->VM destination IP {pkt[IP].dst}"
2020
assert pkt[IP].src == check_ipv4_src, \
2121
f"Bad request (src ip: {pkt[IP].src})"
22-
reply_pkt = (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst, type=0x86DD) /
23-
IPv6(dst=dst_ipv6, src=pkt[IPv6].dst, nh=4) /
22+
reply_pkt = (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst) /
23+
IPv6(dst=dst_ipv6, src=pkt[IPv6].dst) /
2424
IP(src=pkt[IP].src, dst=pkt[IP].dst) /
2525
TCP(dport=pkt[TCP].dport, sport=pkt[TCP].sport))
2626
delayed_sendp(reply_pkt, PF0.tap)
2727

2828
def communicate_vip_lb(vm, lb_ipv6, src_ipv6, src_ipv4, vf_tap, sport):
2929
threading.Thread(target=router_loopback, args=(lb_ipv6, src_ipv4, lb_ip)).start()
3030
# vm(VIP) HTTP request to LB(VM1,VM2) server
31-
vm_pkt = (Ether(dst=PF0.mac, src=vm.mac, type=0x0800) /
31+
vm_pkt = (Ether(dst=PF0.mac, src=vm.mac) /
3232
IP(dst=lb_ip, src=vm.ip) /
3333
TCP(sport=sport, dport=80))
3434
delayed_sendp(vm_pkt, vm.tap)
@@ -41,7 +41,7 @@ def communicate_vip_lb(vm, lb_ipv6, src_ipv6, src_ipv4, vf_tap, sport):
4141

4242
threading.Thread(target=router_loopback, args=(src_ipv6, lb_ip, src_ipv4)).start()
4343
# HTTP response back to VIP(vm)
44-
srv_reply = (Ether(dst=srv_pkt[Ether].src, src=srv_pkt[Ether].dst, type=0x0800) /
44+
srv_reply = (Ether(dst=srv_pkt[Ether].src, src=srv_pkt[Ether].dst) /
4545
IP(dst=srv_pkt[IP].src, src=srv_pkt[IP].dst) /
4646
TCP(sport=srv_pkt[TCP].dport, dport=srv_pkt[TCP].sport))
4747
delayed_sendp(srv_reply, vf_tap)
@@ -78,8 +78,8 @@ def test_nat_to_lb_nat(request, prepare_ipv4, grpc_client, port_redundancy):
7878

7979

8080
def send_bounce_pkt_to_pf(ipv6_lb):
81-
bouce_pkt = (Ether(dst=ipv6_multicast_mac, src=PF0.mac, type=0x86DD) /
82-
IPv6(dst=ipv6_lb, src=local_ul_ipv6, nh=4) /
81+
bouce_pkt = (Ether(dst=ipv6_multicast_mac, src=PF0.mac,) /
82+
IPv6(dst=ipv6_lb, src=local_ul_ipv6) /
8383
IP(dst=lb_ip, src=public_ip) /
8484
TCP(sport=8989, dport=80))
8585
delayed_sendp(bouce_pkt, PF0.tap)
@@ -102,7 +102,7 @@ def test_external_lb_relay(prepare_ipv4, grpc_client):
102102

103103
def send_bounce_icmp_pkt_to_pf(ipv6_lb):
104104
bounce_pkt = (Ether(dst=ipv6_multicast_mac, src=PF0.mac) /
105-
IPv6(dst=ipv6_lb, src=local_ul_ipv6, nh=4) /
105+
IPv6(dst=ipv6_lb, src=local_ul_ipv6) /
106106
IP(dst=lb_ip, src=public_ip) /
107107
ICMP(type=3, code=4) / # Type 3: Destination Unreachable, Code 4: fragmentation needed and DF set
108108
IP(dst=public_ip, src=lb_ip) /
@@ -134,8 +134,8 @@ def test_network_lb_external_icmpv6_echo(prepare_ipv4, grpc_client):
134134

135135

136136
def send_bounce_ipv6_pkt_to_pf(ipv6_lb):
137-
bounce_pkt = (Ether(dst=ipv6_multicast_mac, src=PF0.mac, type=0x86DD) /
138-
IPv6(dst=ipv6_lb, src=local_ul_ipv6, nh=0x29) /
137+
bounce_pkt = (Ether(dst=ipv6_multicast_mac, src=PF0.mac) /
138+
IPv6(dst=ipv6_lb, src=local_ul_ipv6) /
139139
IPv6(dst=lb_ip6, src=public_ipv6) /
140140
TCP(sport=8989, dport=8080))
141141
delayed_sendp(bounce_pkt, PF0.tap)

‎test/local/test_nat.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ def test_network_nat_external_icmp_echo(prepare_ipv4, grpc_client):
5252
grpc_client.delnat(VM1.name)
5353

5454
def send_bounce_pkt_to_pf(ipv6_nat):
55-
bouce_pkt = (Ether(dst=ipv6_multicast_mac, src=PF0.mac, type=0x86DD) /
56-
IPv6(dst=ipv6_nat, src=router_ul_ipv6, nh=4) /
55+
bouce_pkt = (Ether(dst=ipv6_multicast_mac, src=PF0.mac) /
56+
IPv6(dst=ipv6_nat, src=router_ul_ipv6) /
5757
IP(dst=nat_vip, src=public_ip) /
5858
TCP(sport=8989, dport=510))
5959
delayed_sendp(bouce_pkt, PF0.tap)
@@ -102,8 +102,8 @@ def test_network_nat_pkt_relay(prepare_ifaces, grpc_client):
102102

103103

104104
def send_foreign_ip_nat_pkt_to_pf(ipv6_nat):
105-
bouce_pkt = (Ether(dst=ipv6_multicast_mac, src=PF0.mac, type=0x86DD) /
106-
IPv6(dst=ipv6_nat, src=router_ul_ipv6, nh=4) /
105+
bouce_pkt = (Ether(dst=ipv6_multicast_mac, src=PF0.mac) /
106+
IPv6(dst=ipv6_nat, src=router_ul_ipv6) /
107107
IP(dst="1.2.3.4", src=public_ip) /
108108
TCP(sport=8989, dport=510))
109109
delayed_sendp(bouce_pkt, PF0.tap)
@@ -146,8 +146,8 @@ def router_nat_vip(dst_ipv6, check_ipv4):
146146
pkt = sniff_packet(PF0.tap, is_tcp_pkt)
147147
assert pkt[IP].src == check_ipv4, \
148148
f"Bad request (src ip: {pkt[IP].src})"
149-
reply_pkt = (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst, type=0x86DD) /
150-
IPv6(dst=dst_ipv6, src=pkt[IPv6].dst, nh=4) /
149+
reply_pkt = (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst) /
150+
IPv6(dst=dst_ipv6, src=pkt[IPv6].dst) /
151151
IP(src=pkt[IP].src, dst=pkt[IP].dst) /
152152
TCP(dport=pkt[TCP].dport, sport=pkt[TCP].sport))
153153
delayed_sendp(reply_pkt, PF0.tap)
@@ -161,7 +161,7 @@ def test_network_nat_to_vip_on_another_vni(prepare_ipv4, grpc_client, port_redun
161161

162162
threading.Thread(target=router_nat_vip, args=(vip_ul_ipv6, nat_vip)).start()
163163
grpc_client.addfwallrule(VM3.name, "fw0-vm3", proto="tcp", dst_port_min=1024, dst_port_max=1024)
164-
tcp_pkt = (Ether(dst=PF0.mac, src=VM1.mac, type=0x0800) /
164+
tcp_pkt = (Ether(dst=PF0.mac, src=VM1.mac) /
165165
IP(dst=vip_vip, src=VM1.ip) /
166166
TCP(dport=1024))
167167
delayed_sendp(tcp_pkt, VM1.tap)
@@ -172,7 +172,7 @@ def test_network_nat_to_vip_on_another_vni(prepare_ipv4, grpc_client, port_redun
172172

173173
threading.Thread(target=router_nat_vip, args=(nat_ul_ipv6, vip_vip)).start()
174174

175-
reply_pkt = (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst, type=0x0800) /
175+
reply_pkt = (Ether(dst=pkt[Ether].src, src=pkt[Ether].dst) /
176176
IP(dst=pkt[IP].src, src=pkt[IP].dst) /
177177
TCP(sport=pkt[TCP].dport, dport=pkt[TCP].sport))
178178
delayed_sendp(reply_pkt, VM3.tap)

‎test/local/test_pf_to_vf.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
from helpers import *
77

88
def send_lb_pkt_to_pf(lb_ul_ipv6):
9-
lb_pkt = (Ether(dst=ipv6_multicast_mac, src=PF0.mac, type=0x86DD) /
10-
IPv6(dst=lb_ul_ipv6, src=router_ul_ipv6, nh=4) /
9+
lb_pkt = (Ether(dst=ipv6_multicast_mac, src=PF0.mac) /
10+
IPv6(dst=lb_ul_ipv6, src=router_ul_ipv6) /
1111
IP(dst=lb_ip, src=public_ip) /
1212
TCP(sport=1234, dport=80))
1313
delayed_sendp(lb_pkt, PF0.tap)
@@ -34,8 +34,8 @@ def test_pf_to_vf_lb_tcp(prepare_ifaces, grpc_client):
3434
# If TCP RST is implemented down the line, this can be overcome
3535

3636
def send_lb_ipv6_pkt_to_pf(lb_ul_ipv6):
37-
lb_pkt = (Ether(dst=ipv6_multicast_mac, src=PF0.mac, type=0x86DD) /
38-
IPv6(dst=lb_ul_ipv6, src=router_ul_ipv6, nh=0x29) /
37+
lb_pkt = (Ether(dst=ipv6_multicast_mac, src=PF0.mac) /
38+
IPv6(dst=lb_ul_ipv6, src=router_ul_ipv6) /
3939
IPv6(dst=lb_ip6, src=public_ipv6) /
4040
TCP(sport=1234, dport=8080))
4141
delayed_sendp(lb_pkt, PF0.tap)

0 commit comments

Comments
 (0)