From 1baabe7cce701489a44b0440b2c651dc96520e14 Mon Sep 17 00:00:00 2001 From: Ivan Pepelnjak Date: Sat, 1 Nov 2025 18:37:52 +0100 Subject: [PATCH] Generalize vjunos/vptx device-specific readiness script This change replaces a device-specific readiness script testing the presence of a specific interface on vjunos-router, vjunos-switch, and vptx, with a generic Junos script testing for the presence of first interface used in netlab topology. --- netsim/ansible/tasks/readiness-check/junos.yml | 10 ++++++++++ netsim/ansible/tasks/readiness-check/vjunos-router.yml | 1 - netsim/ansible/tasks/readiness-check/vjunos-switch.yml | 9 --------- netsim/ansible/tasks/readiness-check/vptx.yml | 9 --------- 4 files changed, 10 insertions(+), 19 deletions(-) create mode 100644 netsim/ansible/tasks/readiness-check/junos.yml delete mode 120000 netsim/ansible/tasks/readiness-check/vjunos-router.yml delete mode 100644 netsim/ansible/tasks/readiness-check/vjunos-switch.yml delete mode 100644 netsim/ansible/tasks/readiness-check/vptx.yml diff --git a/netsim/ansible/tasks/readiness-check/junos.yml b/netsim/ansible/tasks/readiness-check/junos.yml new file mode 100644 index 0000000000..1a12ba94f5 --- /dev/null +++ b/netsim/ansible/tasks/readiness-check/junos.yml @@ -0,0 +1,10 @@ +--- +- name: Wait for first interface ({{ interfaces[0].junos_interface }}) + junos_command: + commands: + - show interfaces terse + wait_for: + - result[0] contains {{ interfaces[0].junos_interface }} + interval: 5 + retries: 60 + when: interfaces diff --git a/netsim/ansible/tasks/readiness-check/vjunos-router.yml b/netsim/ansible/tasks/readiness-check/vjunos-router.yml deleted file mode 120000 index d693399a23..0000000000 --- a/netsim/ansible/tasks/readiness-check/vjunos-router.yml +++ /dev/null @@ -1 +0,0 @@ -vjunos-switch.yml \ No newline at end of file diff --git a/netsim/ansible/tasks/readiness-check/vjunos-switch.yml b/netsim/ansible/tasks/readiness-check/vjunos-switch.yml deleted file mode 100644 index 27c0b9e951..0000000000 --- a/netsim/ansible/tasks/readiness-check/vjunos-switch.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Wait for ge-0/0/0 to appear - junos_command: - commands: - - show interfaces terse - wait_for: - - result[0] contains ge-0/0/0 - interval: 5 - retries: 30 diff --git a/netsim/ansible/tasks/readiness-check/vptx.yml b/netsim/ansible/tasks/readiness-check/vptx.yml deleted file mode 100644 index 0fed6ac1de..0000000000 --- a/netsim/ansible/tasks/readiness-check/vptx.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Wait for et-0/0/0 to appear - junos_command: - commands: - - show interfaces terse - wait_for: - - result[0] contains et-0/0/0 - interval: 5 - retries: 60