Skip to content

Commit b05c003

Browse files
troglobittroglobit
committed
test: minor, cleanup of specifications
Signed-off-by: Joachim Wiberg <[email protected]>
1 parent 61570d0 commit b05c003

File tree

5 files changed

+33
-50
lines changed

5 files changed

+33
-50
lines changed

‎test/case/ietf_interfaces/igmp_vlan/test.adoc‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,19 @@ ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/igmp_vlan]
44

55
==== Description
66

7-
Test tagged IGMP control traffic and that VLAN separation is respected for multicast
7+
Verify VLAN tagged IGMP control traffic and that VLAN separation is respected for multicast.
88

99
....
10-
VLAN55 VLAN77 VLAN55 VLAN77
11-
10.0.1.1 10.0.2.1 10.0.1.2 10.0.2.2
10+
vlan55 10.0.1.1 vlan77 10.0.2.1 vlan55 10.0.1.2 vlan77 10.0.2.2
1211
\ / \ /
13-
\--------------/ VLAN 1,2 T \---------------/
14-
| DUT1 +---------------------------------+ DUT2 |
15-
| |dut1:link dut2:link| |
16-
+--------------+ +-----+---------+
17-
dut1:data1| |dut1:data2 dut2:data1| |dut2:data2
18-
VLAN55 U | | VLAN77 U VLAN55 U | | VLAN77 U
19-
| | | |
20-
+-------+ | +----------+ +------------+ +--------+
21-
| msend +--+ | mreceive | | mreceive | | msend |
22-
+-------+ +----------+ +------------+ +--------+
23-
10.0.1.11 10.0.2.11 10.0.1.22 10.0.2.22
12+
.--------------. VLAN 1,2 T .---------------.
13+
| DUT1 link +--------------------------------+ link DUT2 |
14+
'-+----------+-' '-+-----------+-'
15+
data1 | 55U 77U | data2 data1 | 55U 77U | data2
16+
.-------' '---. | '-------.
17+
.----+--. .-+--------. .-------+--. .--+----.
18+
| msend | 10.0.1.11 | mreceive | 10.0.2.11 | mreceive | 10.0.1.22 | msend | 10.0.2.22
19+
'-------' '----------' '----------' '-------'
2420
....
2521

2622
==== Topology
@@ -31,8 +27,7 @@ image::topology.svg[IGMP VLAN topology, align=center, scaledwidth=75%]
3127

3228
. Set up topology and attach to target DUT
3329
. Configure device
34-
. Start multicast sender on host:data11, group 224.2.2.2
35-
. Start multicast sender on host:data22, group 224.1.1.1
30+
. Start multicast senders on host:data11, group 224.2.2.2, and host:data22, group 224.1.1.1
3631
. Verify group 224.2.2.2 is flooded to host:data21
3732
. Verify group 224.1.1.1 is flooded to host:data12
3833
. Verify group 224.2.2.2 on host:data11, 224.1.1.1 on host:data21, 224.2.2.2 on host:data12 and 224.1.1.1 on host:data22 is not received

‎test/case/ietf_interfaces/igmp_vlan/test.py‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
11
#!/usr/bin/env python3
2-
r"""
3-
IGMP VLAN
2+
r"""IGMP VLAN
43
5-
Test tagged IGMP control traffic and that VLAN separation is respected for multicast
4+
Verify VLAN tagged IGMP control traffic and that VLAN separation is respected for multicast.
65
76
....
8-
VLAN55 VLAN77 VLAN55 VLAN77
9-
10.0.1.1 10.0.2.1 10.0.1.2 10.0.2.2
7+
vlan55 10.0.1.1 vlan77 10.0.2.1 vlan55 10.0.1.2 vlan77 10.0.2.2
108
\ / \ /
11-
\--------------/ VLAN 1,2 T \---------------/
12-
| DUT1 +---------------------------------+ DUT2 |
13-
| |dut1:link dut2:link| |
14-
+--------------+ +-----+---------+
15-
dut1:data1| |dut1:data2 dut2:data1| |dut2:data2
16-
VLAN55 U | | VLAN77 U VLAN55 U | | VLAN77 U
17-
| | | |
18-
+-------+ | +----------+ +------------+ +--------+
19-
| msend +--+ | mreceive | | mreceive | | msend |
20-
+-------+ +----------+ +------------+ +--------+
21-
10.0.1.11 10.0.2.11 10.0.1.22 10.0.2.22
9+
.--------------. VLAN 1,2 T .---------------.
10+
| DUT1 link +--------------------------------+ link DUT2 |
11+
'-+----------+-' '-+-----------+-'
12+
data1 | 55U 77U | data2 data1 | 55U 77U | data2
13+
.-------' '---. | '-------.
14+
.----+--. .-+--------. .-------+--. .--+----.
15+
| msend | 10.0.1.11 | mreceive | 10.0.2.11 | mreceive | 10.0.1.22 | msend | 10.0.2.22
16+
'-------' '----------' '----------' '-------'
2217
....
23-
2418
"""
2519

2620
import infamy
@@ -262,11 +256,9 @@
262256
d2send_ns.addip("10.0.2.22")
263257
d1send_ns.must_reach("10.0.1.2")
264258
d1receive_ns.must_reach("10.0.2.2")
265-
with test.step("Start multicast sender on host:data11, group 224.2.2.2"):
259+
with test.step("Start multicast senders on host:data11, group 224.2.2.2, and host:data22, group 224.1.1.1"):
266260
vlan55_sender = mcast.MCastSender(d2send_ns, "224.2.2.2")
267-
with test.step("Start multicast sender on host:data22, group 224.1.1.1"):
268-
vlan77_sender= mcast.MCastSender(d1send_ns, "224.1.1.1")
269-
261+
vlan77_sender = mcast.MCastSender(d1send_ns, "224.1.1.1")
270262

271263
with vlan55_sender, vlan77_sender:
272264
with test.step("Verify group 224.2.2.2 is flooded to host:data21"):

‎test/case/infix_containers/container_basic/test.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/usr/bin/env python3
2-
"""
3-
Container basic
2+
"""Container Basic
43
54
Verify that a simple web server container can be configured to run
65
with host networking, on port 80. Operation is verified using a

‎test/case/infix_containers/container_firewall_basic/test.adoc‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ifdef::topdoc[:imagesdir: {topdoc}../../test/case/infix_containers/container_fir
55
==== Description
66

77
Verify that an nftables container can be used for IP masquerading and
8-
port forwarding to another container running a basic web server.
8+
port forwarding to another container.
99

1010
....
1111
<--- Docker containers --->
@@ -24,10 +24,9 @@ network, using a VETH pair, serving HTTP on port 91.
2424
The firewall container sets up a port forward with IP masquerding
2525
to/from `ext0:8080` to 10.0.0.2:91.
2626

27-
Correct operation is verified using HTTP GET requests for internal port
28-
91 and external port 8080, to ensure the web page, with a known key
29-
phrase, is only reachable from the public interface `ext0`, on
30-
192.168.0.1:8080.
27+
Operation is verified using HTTP GET requests for internal port 91 and
28+
external port 8080 to ensure the web page, with a known key phrase, is
29+
only reachable from the public interface `ext0`, on 192.168.0.1:8080.
3130

3231
==== Topology
3332

‎test/case/infix_containers/container_firewall_basic/test.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
r"""Basic Firewall Container
33
44
Verify that an nftables container can be used for IP masquerading and
5-
port forwarding to another container running a basic web server.
5+
port forwarding to another container.
66
77
....
88
<--- Docker containers --->
@@ -21,11 +21,9 @@
2121
The firewall container sets up a port forward with IP masquerding
2222
to/from `ext0:8080` to 10.0.0.2:91.
2323
24-
Correct operation is verified using HTTP GET requests for internal port
25-
91 and external port 8080, to ensure the web page, with a known key
26-
phrase, is only reachable from the public interface `ext0`, on
27-
192.168.0.1:8080.
28-
24+
Operation is verified using HTTP GET requests for internal port 91 and
25+
external port 8080 to ensure the web page, with a known key phrase, is
26+
only reachable from the public interface `ext0`, on 192.168.0.1:8080.
2927
"""
3028
import infamy
3129
from infamy.util import until, to_binary

0 commit comments

Comments
 (0)