Skip to content

Commit 44d3780

Browse files
committed
test/case: use 9pm 'name:' for all test names
To reduce the duplication of effort between 9pm and the Infamy framework this change consolidates the move from local 'infamy: title:' extension to 9pm 'name:'. For the parameterized tunnel tests we leverage the 9pm dynamic test-spec variable, which looks for a correspodning <case>.adoc instead of static Readme.adoc, when generating the test report. Each test documentation should cover all aspects of the test, much like the usage text of a UNIX program. To this end, the tunnel test docs are now more spelled out, including all invariants. Some refactoring of these tests were also necessary, e.g., replacing any reserved Python keywords like 'type', and other PEP-8 fixes. Signed-off-by: Joachim Wiberg <[email protected]>
1 parent eb3e64d commit 44d3780

File tree

39 files changed

+333
-214
lines changed

39 files changed

+333
-214
lines changed

test/case/all.yaml

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,29 @@
1414
infamy:
1515
specification: False
1616

17-
1817
- name: Misc tests
1918
suite: misc/misc.yaml
2019

21-
- name: ietf-system
22-
suite: ietf_system/ietf_system.yaml
23-
2420
# Upgrade may leave wrong boot order
2521
- case: meta/bootorder.py
2622
infamy:
2723
specification: False
2824

29-
- name: ietf-syslog
25+
- name: "IETF System"
26+
suite: ietf_system/ietf_system.yaml
27+
- name: "IETF Syslog"
3028
suite: ietf_syslog/ietf_syslog.yaml
31-
32-
- name: ietf-interfaces
29+
- name: "IETF Interfaces"
3330
suite: ietf_interfaces/ietf_interfaces.yaml
34-
35-
- name: ietf-routing
31+
- name: "IETF Routing"
3632
suite: ietf_routing/ietf_routing.yaml
37-
38-
- name: infix-containers
33+
- name: "Infix Containers"
3934
suite: infix_containers/infix_containers.yaml
40-
41-
- name: infix-dhcp
35+
- name: "Infix DHCP"
4236
suite: infix_dhcp/infix_dhcp.yaml
43-
44-
- name: ietf-hardware
37+
- name: "IETF Hardware"
4538
suite: ietf_hardware/ietf_hardware.yaml
46-
47-
- name: infix-services
39+
- name: "Infix Services"
4840
suite: infix_services/infix_services.yaml
49-
50-
- name: use-cases
41+
- name: "Use Case Tests"
5142
suite: use_case/use_case.yml
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
- name: usb
2+
- name: USB configuration
33
case: usb/test.py
44

5-
- name: usb_two_ports
5+
- name: USB configuration with two USB ports
66
case: usb_two_ports/test.py
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
---
22

3-
- name: bridge_fwd_sgl_dut
3+
- name: Bridge forwarding single DUTs
44
case: bridge_fwd_sgl_dut/test.py
55

6-
- name: bridge_fwd_dual_dut
6+
- name: Bridge forwarding dual DUTs
77
case: bridge_fwd_dual_dut/test.py
88

9-
- name: bridge_stp_basic
9+
- name: Bridge STP Basic
1010
case: bridge_stp_basic/test.py
1111

12-
- name: bridge_vlan_separation
12+
- name: Bridge VLAN separation
1313
case: bridge_vlan_separation/test.py
1414

15-
- name: bridge_basic
15+
- name: Bridge basic
1616
case: bridge_basic/test.py
1717

18-
- name: dual_bridge
18+
- name: Dual bridges on one device
1919
case: dual_bridge/test.py
2020

21-
- name: bridge_veth
21+
- name: Bridge with a physical port and a veth
2222
case: bridge_veth/test.py
2323

24-
- name: bridge_vlan
24+
- name: Bridge VLAN
2525
case: bridge_vlan/test.py
Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
---
2-
- name: vlan_ping
2+
- name: VLAN ping connectivity
33
case: vlan_ping/test.py
44

5-
- name: ipv4_address
5+
- name: Interface with IPv4
66
case: ipv4_address/test.py
77

8-
- name: ipv6_address
8+
- name: Interface IPv6 autoconf for bridges
99
case: ipv6_address/test.py
1010

11-
- name: ifalias
11+
- name: Interface Description (ifAlias)
1212
case: ifalias/test.py
1313

14-
- name: iface_phys_address
14+
- name: Custom MAC address on interface
1515
case: iface_phys_address/test.py
1616

17-
- name: routing_basic
17+
- name: Routing basic
1818
case: routing_basic/test.py
1919

20-
- name: vlan_qos
20+
- name: VLAN Interface Ingress/Egress QoS
2121
case: vlan_qos/test.py
2222

23-
- name: speed_duplex_copper
23+
- name: Interface Speed Duplex (Copper)
2424
case: speed_duplex_copper/test.py
2525

26-
- name: verify_all_interface_types
26+
- name: Verify that all interface types can be created
2727
case: verify_all_interface_types/test.py
2828

29-
- name: iface_enable_disable
29+
- name: Interface status
3030
case: iface_enable_disable/test.py
3131

32-
- name: vlan_iface_termination
32+
- name: VLAN Interface Termination
3333
case: vlan_iface_termination/test.py
3434

35-
- name: veth_delete
35+
- name: Verify that VETH pairs can be deleted
3636
case: veth_delete/test.py
3737

38-
- name: ipv4_autoconf
38+
- name: IPv4 link-local
3939
case: ipv4_autoconf/test.py
4040

41-
- name: bridge
41+
- name: Bridge interface tests
4242
suite: bridge.yaml
4343

44-
- name: link_aggregation
44+
- name: Link aggregation tests
4545
suite: lag.yaml
4646

47-
- name: igmp
47+
- name: Layer-2 multicast filtering tests
4848
suite: igmp.yaml
4949

50-
- name: tunnels
50+
- name: Layer-2/3 tunnel tests
5151
suite: tunnels.yaml
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
- name: igmp_basic
2+
- name: IGMP basic
33
case: igmp_basic/test.py
44

5-
- name: igmp_vlan
5+
- name: IGMP VLAN
66
case: igmp_vlan/test.py
77

8-
- name: static_multicast_filters
8+
- name: Static multicast filters
99
case: static_multicast_filters/test.py

test/case/ietf_interfaces/lag.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: lag_basic
2+
- name: Ling Aggregation Basic
33
case: lag_basic/test.py
4-
- name: lag_failure
4+
- name: LACP Aggregate w/ Degraded Link
55
case: lag_failure/test.py
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
=== GRE point-to-point
2+
3+
ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/tunnel_basic]
4+
5+
==== Description
6+
7+
Set up a tunnel between two DUTs, host connected to the first DUT. Enable
8+
IP forwarding on first DUT's interface to host and the tunnel interface to
9+
the second DUT. On host, add route to IP network of second DUT and verify
10+
connectivity with the second DUT through the tunnel.
11+
12+
- Tunnel types: GRE, GRETAP, and VxLAN
13+
- Connectivity: IPv4 and IPv6
14+
15+
==== Topology
16+
17+
image::topology.svg[GRE point-to-point topology, align=center, scaledwidth=75%]
18+
19+
==== Sequence
20+
21+
. Set up topology and attach to target DUTs
22+
. Configure DUTs with tunnel gre
23+
. Verify connectivity host:data to 10.0.0.2
24+
. Verify connectivity host:data to 2001:db8::c0a8:0a02
25+
26+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
test.py
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
=== GRETAP point-to-point
2+
3+
ifdef::topdoc[:imagesdir: {topdoc}../../test/case/ietf_interfaces/tunnel_basic]
4+
5+
==== Description
6+
7+
Set up a tunnel between two DUTs, host connected to the first DUT. Enable
8+
IP forwarding on first DUT's interface to host and the tunnel interface to
9+
the second DUT. On host, add route to IP network of second DUT and verify
10+
connectivity with the second DUT through the tunnel.
11+
12+
- Tunnel types: GRE, GRETAP, and VxLAN
13+
- Connectivity: IPv4 and IPv6
14+
15+
==== Topology
16+
17+
image::topology.svg[GRETAP point-to-point topology, align=center, scaledwidth=75%]
18+
19+
==== Sequence
20+
21+
. Set up topology and attach to target DUTs
22+
. Configure DUTs with tunnel gretap
23+
. Verify connectivity host:data to 10.0.0.2
24+
. Verify connectivity host:data to 2001:db8::c0a8:0a02
25+
26+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
test.py

0 commit comments

Comments
 (0)