Merge pull request #760 from kernelkit/update-dhcp-tests

test: update dhcp test topologies

test/case/infix_dhcp/dhcp_basic/Readme.adoc

@@ -2,7 +2,7 @@
 ==== Description
 This is a very basic DHCP test that requests an IPv4 lease
 from a DHCP server and checks that the lease is set on the
- interface.
+interface.
 
 ==== Topology
 ifdef::topdoc[]

test/case/infix_dhcp/dhcp_basic/test.py

@@ -1,15 +1,12 @@
 #!/usr/bin/env python3
-# This is a very basic DHCP test that requests an IPv4 lease
-# from a DHCP server and checks that the lease is set on the
-# interface.
 """
 DHCP Basic
 
 This is a very basic DHCP test that requests an IPv4 lease
 from a DHCP server and checks that the lease is set on the
- interface.
+interface.
 """
-import time
+
 import infamy, infamy.dhcp
 import infamy.iface as iface
 from infamy.util import until

test/case/infix_dhcp/dhcp_basic/topology.dot

@@ -1,13 +1,13 @@
 graph "1x2" {
 	layout="neato";
 	overlap="false";
-	esep="+80";
+	esep="+100";
 
         node [shape=record, fontname="DejaVu Sans Mono, Book"];
 	edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"];
 
 	host [
-	    label="host \n(10.0.0.1) | { <tgt> tgt | <data> data }",
+	    label="host | { <mgmt> mgmt | <data> data }",
 	    pos="0,20!",
 	    kind="controller",
 	];
@@ -18,6 +18,6 @@ graph "1x2" {
 	    kind="infix",
 	];
 
-	host:tgt -- client:mgmt [kind=mgmt, color=black, taillabel="10.0.0.42/24"]
-	host:data -- client:data
+	host:mgmt -- client:mgmt [kind=mgmt, color=lightgrey]
+	host:data -- client:data [color=black, taillabel="10.0.0.1/24", headlabel="10.0.0.42/24"]
 }

test/case/infix_dhcp/dhcp_router/test.py

@@ -1,14 +1,12 @@
 #!/usr/bin/env python3
-# Verify DHCP option 3 (router)
 """
 DHCP router
 
 Verify that the DHCP client receives default gateway (DHCP option 3, router)
 and that route exists in operational datastore.
 """
-import time
+
 import infamy, infamy.dhcp
-import infamy.iface as iface
 import infamy.route as route
 from infamy.util import until
 

test/case/infix_dhcp/dhcp_router/topology.dot

@@ -1,13 +1,13 @@
 graph "1x2" {
 	layout="neato";
 	overlap="false";
-	esep="+80";
+	esep="+100";
 
         node [shape=record, fontname="DejaVu Sans Mono, Book"];
 	edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"];
 
 	host [
-	    label="host \n(192.168.0.1) | { <tgt> tgt | <data> data }",
+	    label="host | { <mgmt> mgmt | <data> data }",
 	    pos="0,20!",
 	    kind="controller",
 	];
@@ -18,6 +18,6 @@ graph "1x2" {
 	    kind="infix",
 	];
 
-	host:tgt -- client:mgmt [kind=mgmt, color=black, taillabel="192.168.0.254/24"]
-	host:data -- client:data
+	host:mgmt -- client:mgmt [kind=mgmt, color=lightgrey]
+	host:data -- client:data [color=black, taillabel="192.168.0.1/24"]
 }

test/case/infix_dhcp/dhcp_routes/Readme.adoc

@@ -4,8 +4,8 @@ Verify DHCP option 121 (static routes) is used over option 3 and that the
 routes exist in the operational datastore.
 
 Installing unrelated routes from a DHCP server should not affect already
-existing routes.  To verify this a canary route is set up in the client
-before initiating DHCP.  This canary route does not need to be reachable
+existing routes. To verify this, a canary route is set up in the client
+before initiating DHCP. This canary route does not need to be reachable
 before a DHCP lease has been acquired.
 
 ==== Topology

test/case/infix_dhcp/dhcp_routes/test.py

@@ -6,10 +6,11 @@
 routes exist in the operational datastore.
 
 Installing unrelated routes from a DHCP server should not affect already
-existing routes.  To verify this a canary route is set up in the client
+existing routes.  To verify this, a canary route is set up in the client
 before initiating DHCP.  This canary route does not need to be reachable
 before a DHCP lease has been acquired.
 """
+
 import infamy
 import infamy.dhcp
 import infamy.route as route

test/case/infix_dhcp/dhcp_routes/topology.dot

@@ -7,7 +7,7 @@ graph "1x2" {
 	edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"];
 
 	host [
-	    label="host \n(10.0.0.0/24) | { <tgt> tgt | <data> data }",
+	    label="host | { <mgmt> mgmt | <data> data }",
 	    pos="0,20!",
 	    kind="controller",
 	];
@@ -18,6 +18,6 @@ graph "1x2" {
 	    kind="infix",
 	];
 
-	host:tgt -- client:mgmt [kind=mgmt, color=black, taillabel="192.168.0.254/24"]
-	host:data -- client:data
+	host:mgmt -- client:mgmt [kind=mgmt, color=lightgrey]
+	host:data -- client:data [color=black, taillabel="192.168.0.1/24"]
 }

test/spec/Readme.adoc

@@ -0,0 +1,44 @@
+:topdoc:
+
+= Test specification
+Infix v24.10.1-23-g8fc0ab9b-dirty
+:title-page:
+:toc:
+:toclevels: 2
+:sectnums:
+:sectnumlevels: 2
+
+<<<
+include::../case/misc/Readme.adoc[]
+
+<<<
+
+include::../case/ietf_system/Readme.adoc[]
+
+<<<
+
+include::../case/ietf_syslog/Readme.adoc[]
+
+<<<
+
+include::../case/ietf_interfaces/Readme.adoc[]
+
+<<<
+
+include::../case/ietf_routing/Readme.adoc[]
+
+<<<
+
+include::../case/infix_containers/Readme.adoc[]
+
+<<<
+
+include::../case/infix_dhcp/Readme.adoc[]
+
+<<<
+
+include::../case/ietf_hardware/Readme.adoc[]
+
+<<<
+
+include::../case/infix_services/Readme.adoc[]