Split interface configuration tests from router functionality tests

The 'interface configuration' integration tests assumed the device is
a router, causing Linux (and friends) to fail the tests. That
requirement has been removed, so all working implementations should
pass the 'interfaces' integration test.

The original 'interface configuration' test has been moved to 'router'
functionality test, where we check for packet forwarding and RA
origination.

Author: ipspace

tests/integration/initial/01-interfaces.yml

@@ -3,22 +3,30 @@ message:
   This scenario tests basic interface, IPv4, and IPv6 configuration,
   including generation of IPv6 Router Advertisements
 
+defaults.sources.extra: [ ../wait_times.yml ]
+
 addressing:
   loopback:
     ipv6: 2001:db8:0::/48
   lan:
     ipv6: 2001:db8:1::/48
 
+groups:
+  hosts:
+    members: [ h1, h2 ]
+    device: linux
+    provider: clab
+    module: [ routing ]
+    routing.static:
+    - pool: loopback
+      nexthop.node: r
+
 nodes:
   r:
     id: 132
-    role: router
+    loopback: True
   h1:
-    device: linux
-    provider: clab
   h2:
-    device: linux
-    provider: clab
 
 links:
 - r:
@@ -30,21 +38,14 @@ links:
 
 validate:
   ping:
-    description: IPv4 ping H1 => H2
-    wait: 10
+    description: IPv4 ping H1,H2 => R
+    wait: ping
     wait_msg: Wait for IPv4 interfaces to become operational
-    nodes: [ h1 ]
-    plugin: ping('h2')
-  ra:
-    description: Check RA-generated default route
-    wait: 30
-    wait_msg: Waiting for RA message to generate the default route
     nodes: [ h1, h2 ]
-    plugin: default6()
-    stop_on_error: True
+    plugin: ping(nodes.r.loopback.ipv4)
   ping6:
-    description: IPv6 ping H1 => H2
-    wait: 10
+    description: IPv6 ping H1,H2 => R
+    wait: ping
     wait_msg: Wait for IPv6 interfaces to become operational
-    nodes: [ h1 ]
-    plugin: ping(nodes.h2.interfaces[0].ipv6,af='ipv6')
+    nodes: [ h1, h2 ]
+    plugin: ping(nodes.r.loopback.ipv6)

tests/integration/initial/02-loopback.yml

@@ -2,6 +2,8 @@
 message:
   This scenario tests additional loopback interfaces
 
+defaults.sources.extra: [ ../wait_times.yml ]
+
 addressing:
   loopback:
     ipv6: 2001:db8:0::/48
@@ -10,15 +12,23 @@ addressing:
   vrf_loopback:
     ipv6: 2001:db8:cafe::/48
 
+groups:
+  hosts:
+    members: [ h1, h2 ]
+    device: linux
+    provider: clab
+    module: [ routing ]
+    routing.static:
+    - pool: loopback
+      nexthop.node: r
+    - pool: vrf_loopback
+      nexthop.node: r
+
 nodes:
   r:
-    role: router
+    loopback: True
   h1:
-    device: linux
-    provider: clab
   h2:
-    device: linux
-    provider: clab
 
 links:
 - r:
@@ -32,20 +42,13 @@ links:
 validate:
   ping4:
     description: IPv4 ping to device loopback
-    wait: 10
+    wait: ping
     wait_msg: Waiting for IPv4 interfaces to become ready
     nodes: [ h1, h2 ]
     plugin: ping(nodes.r.loopback.ipv4)
-  ra:
-    description: Check RA-generated default route
-    wait: 30
-    wait_msg: Waiting for RA message to generate the default route
-    nodes: [ h1, h2 ]
-    plugin: default6()
-    stop_on_error: True
   ping6:
     description: IPv6 ping to device loopback
-    wait: 10
+    wait: ping
     wait_msg: Waiting for IPv6 interfaces to become ready
     nodes: [ h1, h2 ]
     plugin: ping(nodes.r.loopback.ipv6,af='ipv6')

tests/integration/initial/07-router.yml

@@ -0,0 +1,50 @@
+---
+message:
+  This scenario tests basic interface, IPv4, and IPv6 configuration,
+  including generation of IPv6 Router Advertisements
+
+defaults.sources.extra: [ ../wait_times.yml ]
+
+addressing:
+  loopback:
+    ipv6: 2001:db8:0::/48
+  lan:
+    ipv6: 2001:db8:1::/48
+
+nodes:
+  r:
+    id: 132
+    role: router
+  h1:
+    device: linux
+    provider: clab
+  h2:
+    device: linux
+    provider: clab
+
+links:
+- r:
+  h1:
+- r:
+  h2:
+
+validate:
+  ping:
+    description: IPv4 ping H1 => H2
+    wait: ping
+    wait_msg: Wait for IPv4 interfaces to become operational
+    nodes: [ h1 ]
+    plugin: ping('h2')
+  ra:
+    description: Check RA-generated default route
+    wait: ra_send
+    wait_msg: Waiting for RA message to generate the default route
+    nodes: [ h1, h2 ]
+    plugin: default6()
+    stop_on_error: True
+  ping6:
+    description: IPv6 ping H1 => H2
+    wait: ping
+    wait_msg: Wait for IPv6 interfaces to become operational
+    nodes: [ h1 ]
+    plugin: ping(nodes.h2.interfaces[0].ipv6,af='ipv6')