Skip to content

Commit 95de0bd

Browse files
authored
Fix: Cleanup Dell OS10 readiness check (#3048)
The Dell OS10 readiness check was just a wait followed by SSH check. The wait is now implemented with the 'netlab_start_exec' group var, and the SSH check with the 'netlab_ready' group var
1 parent 1d45013 commit 95de0bd

5 files changed

Lines changed: 18 additions & 7 deletions

File tree

netsim/ansible/tasks/readiness-check/dellos10-clab.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

netsim/devices/dellos10.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ clab:
9090
ansible_ssh_pass: admin
9191
netlab_check_retries: 40
9292
netlab_check_delay: 10
93-
netlab_initial_delay: 30
93+
netlab_start_exec: [ sleep 15 ] # Dell OS10 needs a bit of time to wake from its slumber
94+
netlab_ready: [ ssh ]
9495
libvirt:
9596
image: dell/os10
9697
build: https://netlab.tools/labs/dellos10/

tests/topology/expected/lag-l2.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ nodes:
102102
ipv4: true
103103
box: vrnetlab/vr-ftosv
104104
clab:
105+
exec:
106+
- sleep 15
105107
kind: vr-ftosv
106108
device: dellos10
107109
hostname: clab-input-r1
@@ -249,6 +251,8 @@ nodes:
249251
ipv4: true
250252
box: vrnetlab/vr-ftosv
251253
clab:
254+
exec:
255+
- sleep 15
252256
kind: vr-ftosv
253257
device: dellos10
254258
hostname: clab-input-r2

tests/topology/expected/lag-l3.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ nodes:
7777
ipv4: true
7878
box: vrnetlab/vr-ftosv
7979
clab:
80+
exec:
81+
- sleep 15
8082
kind: vr-ftosv
8183
device: dellos10
8284
gateway:
@@ -194,6 +196,8 @@ nodes:
194196
ipv4: true
195197
box: vrnetlab/vr-ftosv
196198
clab:
199+
exec:
200+
- sleep 15
197201
kind: vr-ftosv
198202
device: dellos10
199203
hostname: clab-input-r2

tests/topology/expected/lag-mlag.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,8 @@ nodes:
630630
ipv4: true
631631
box: vrnetlab/vr-ftosv
632632
clab:
633+
exec:
634+
- sleep 15
633635
kind: vr-ftosv
634636
device: dellos10
635637
hostname: clab-input-s1
@@ -924,6 +926,8 @@ nodes:
924926
ipv4: true
925927
box: vrnetlab/vr-ftosv
926928
clab:
929+
exec:
930+
- sleep 15
927931
kind: vr-ftosv
928932
device: dellos10
929933
hostname: clab-input-s2
@@ -1193,6 +1197,8 @@ nodes:
11931197
ipv4: true
11941198
box: vrnetlab/vr-ftosv
11951199
clab:
1200+
exec:
1201+
- sleep 15
11961202
kind: vr-ftosv
11971203
device: dellos10
11981204
hostname: clab-input-s3
@@ -1279,6 +1285,8 @@ nodes:
12791285
ipv4: true
12801286
box: vrnetlab/vr-ftosv
12811287
clab:
1288+
exec:
1289+
- sleep 15
12821290
kind: vr-ftosv
12831291
device: dellos10
12841292
hostname: clab-input-s4

0 commit comments

Comments
 (0)