@@ -27,7 +27,7 @@ def _set_flow_rule(cfg, chan):
27
27
28
28
29
29
def test_zcrx (cfg ) -> None :
30
- cfg .require_v6 ( )
30
+ cfg .require_ipver ( '6' )
31
31
32
32
combined_chans = _get_combined_channels (cfg )
33
33
if combined_chans < 2 :
@@ -40,7 +40,7 @@ def test_zcrx(cfg) -> None:
40
40
flow_rule_id = _set_flow_rule (cfg , combined_chans - 1 )
41
41
42
42
rx_cmd = f"{ cfg .bin_remote } -s -p 9999 -i { cfg .ifname } -q { combined_chans - 1 } "
43
- tx_cmd = f"{ cfg .bin_local } -c -h { cfg .remote_v6 } -p 9999 -l 12840"
43
+ tx_cmd = f"{ cfg .bin_local } -c -h { cfg .remote_addr_v [ '6' ] } -p 9999 -l 12840"
44
44
with bkg (rx_cmd , host = cfg .remote , exit_wait = True ):
45
45
wait_port_listen (9999 , proto = "tcp" , host = cfg .remote )
46
46
cmd (tx_cmd )
@@ -51,7 +51,7 @@ def test_zcrx(cfg) -> None:
51
51
52
52
53
53
def test_zcrx_oneshot (cfg ) -> None :
54
- cfg .require_v6 ( )
54
+ cfg .require_ipver ( '6' )
55
55
56
56
combined_chans = _get_combined_channels (cfg )
57
57
if combined_chans < 2 :
@@ -64,7 +64,7 @@ def test_zcrx_oneshot(cfg) -> None:
64
64
flow_rule_id = _set_flow_rule (cfg , combined_chans - 1 )
65
65
66
66
rx_cmd = f"{ cfg .bin_remote } -s -p 9999 -i { cfg .ifname } -q { combined_chans - 1 } -o 4"
67
- tx_cmd = f"{ cfg .bin_local } -c -h { cfg .remote_v6 } -p 9999 -l 4096 -z 16384"
67
+ tx_cmd = f"{ cfg .bin_local } -c -h { cfg .remote_addr_v [ '6' ] } -p 9999 -l 4096 -z 16384"
68
68
with bkg (rx_cmd , host = cfg .remote , exit_wait = True ):
69
69
wait_port_listen (9999 , proto = "tcp" , host = cfg .remote )
70
70
cmd (tx_cmd )
0 commit comments