From 2ad394e28c3261117ae030ff30ffd05b9112dc9f Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Thu, 16 Oct 2025 09:31:05 -0400 Subject: [PATCH 01/17] make example single dc ansible native --- .../example-single-dc-l3ls/converge.yml | 3 ++ .../example-single-dc-l3ls/destroy.yml | 17 -------- .../example-single-dc-l3ls/molecule.yml | 42 ++++++++----------- 3 files changed, 21 insertions(+), 41 deletions(-) create mode 100644 ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/converge.yml delete mode 100644 ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/destroy.yml diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/converge.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/converge.yml new file mode 100644 index 00000000000..dd8f45922cf --- /dev/null +++ b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/converge.yml @@ -0,0 +1,3 @@ +--- +- name: Converge + ansible.builtin.import_playbook: '../../../examples/single-dc-l3ls/build.yml' diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/destroy.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/destroy.yml deleted file mode 100644 index 39bc023a7ae..00000000000 --- a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/destroy.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- name: Remove output folders - hosts: all - gather_facts: false - connection: local - tasks: - - name: Delete local folders - delegate_to: 127.0.0.1 - run_once: true - ansible.builtin.file: - path: "{{ root_dir }}/{{ item }}" - state: absent - with_items: - - documentation - - intended - - config_backup - - reports diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml index e6c4e2f4df4..30493eedb6d 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml @@ -1,31 +1,25 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=../../../examples/single-dc-l3ls/inventory.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + duplicate_dict_key: error + +dependency: + name: galaxy + enabled: false + scenario: - converge_sequence: - - converge test_sequence: - converge - idempotence - cleanup_sequence: - - destroy -dependency: - name: galaxy - enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - duplicate_dict_key: error - playbooks: - converge: '../../../examples/single-dc-l3ls/build.yml' - ansible_args: - - --inventory - - ${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/single-dc-l3ls/inventory.yml + verifier: name: ansible From 59fcd6f8e17ea856919bcf56570d75892d0012e8 Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Thu, 16 Oct 2025 11:15:28 -0400 Subject: [PATCH 02/17] fix ansible_only --- .../molecule/ansible_only/molecule.yml | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/ansible_collections/arista/avd/extensions/molecule/ansible_only/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/ansible_only/molecule.yml index 57d046f9cb6..78659235611 100644 --- a/ansible_collections/arista/avd/extensions/molecule/ansible_only/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/ansible_only/molecule.yml @@ -1,4 +1,17 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/ + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + duplicate_dict_key: error + scenario: converge_sequence: - syntax @@ -12,25 +25,10 @@ scenario: - verify cleanup_sequence: - destroy + dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: "jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n" - gathering: explicit - inventory: - links: - hosts: "inventory/hosts.yml" - group_vars: "inventory/group_vars/" - host_vars: "inventory/host_vars/" + verifier: name: ansible From 8ed507b5b6a284a836cff54aa624541d1de57766 Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Thu, 16 Oct 2025 11:20:30 -0400 Subject: [PATCH 03/17] fix anta_runner --- .../molecule/anta_runner/molecule.yml | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/ansible_collections/arista/avd/extensions/molecule/anta_runner/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/anta_runner/molecule.yml index 023a7c56299..0572a05415f 100644 --- a/ansible_collections/arista/avd/extensions/molecule/anta_runner/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/anta_runner/molecule.yml @@ -1,4 +1,17 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/ + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + duplicate_dict_key: error + scenario: converge_sequence: - converge @@ -8,26 +21,10 @@ scenario: - idempotence cleanup_sequence: - destroy + dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - duplicate_dict_key: error - gathering: explicit - inventory: - links: - hosts: inventory/hosts.yml - group_vars: inventory/group_vars/ - host_vars: inventory/host_vars/ + verifier: name: ansible From cb506de45494c21ca779443c022b30104092ef4f Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Thu, 16 Oct 2025 11:26:24 -0400 Subject: [PATCH 04/17] fix cv_deploy --- .../molecule/cv_deploy/molecule.yml | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml index d869ea71ddc..5d79a6a6ea2 100644 --- a/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml @@ -1,4 +1,17 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/ + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + duplicate_dict_key: error + scenario: converge_sequence: - syntax @@ -11,25 +24,10 @@ scenario: - cleanup cleanup_sequence: - destroy + dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n' - gathering: explicit - playbooks: - converge: converge.yml - ansible_args: - - --inventory - - ${MOLECULE_SCENARIO_DIRECTORY}/inventory/inventory.yml + verifier: name: ansible From c7521b08f2f64d11b0ab47b687af5d67f9cd23d7 Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Thu, 16 Oct 2025 11:46:13 -0400 Subject: [PATCH 05/17] modify default molecule and fix example single-dc-ipv6 --- .../extensions/molecule/default/molecule.yml | 34 ++++++++++ .../{destroy.yml => cleanup.yml} | 2 +- .../example-single-dc-l3ls-ipv6/converge.yml | 3 + .../example-single-dc-l3ls-ipv6/molecule.yml | 66 ++++++++++--------- 4 files changed, 74 insertions(+), 31 deletions(-) rename ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/{destroy.yml => cleanup.yml} (81%) create mode 100644 ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/converge.yml diff --git a/ansible_collections/arista/avd/extensions/molecule/default/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/default/molecule.yml index e69de29bb2d..78659235611 100644 --- a/ansible_collections/arista/avd/extensions/molecule/default/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/default/molecule.yml @@ -0,0 +1,34 @@ +--- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/ + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + duplicate_dict_key: error + +scenario: + converge_sequence: + - syntax + - converge + - verify + test_sequence: + - syntax + - create + - converge + - idempotence + - verify + cleanup_sequence: + - destroy + +dependency: + name: galaxy + enabled: false + +verifier: + name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/destroy.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/cleanup.yml similarity index 81% rename from ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/destroy.yml rename to ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/cleanup.yml index 34c83cd2ac0..72c63489485 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/destroy.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/cleanup.yml @@ -4,7 +4,7 @@ gather_facts: false connection: local vars: - root_dir: "${MOLECULE_SCENARIO_DIRECTORY}/../../examples/single-dc-l3ls-ipv6/" + root_dir: "${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/single-dc-l3ls-ipv6/" tasks: - name: Delete local folders delegate_to: 127.0.0.1 diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/converge.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/converge.yml new file mode 100644 index 00000000000..f337fe56fed --- /dev/null +++ b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/converge.yml @@ -0,0 +1,3 @@ +--- +- name: Converge + ansible.builtin.import_playbook: '../../../examples/single-dc-l3ls-ipv6/build.yml' diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml index cc8e6de2ff4..4c98bad5b1c 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml @@ -1,31 +1,37 @@ --- -scenario: - converge_sequence: - - converge - test_sequence: - - converge - - idempotence - cleanup_sequence: - - destroy -dependency: - name: galaxy - enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - duplicate_dict_key: error - playbooks: - converge: '../../../examples/single-dc-l3ls-ipv6/build.yml' - ansible_args: - - --inventory - - ${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/single-dc-l3ls-ipv6/inventory.yml -verifier: - name: ansible +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=../../../examples/single-dc-l3ls/inventory.yml +# scenario: +# converge_sequence: +# - converge +# test_sequence: +# - converge +# - idempotence +# cleanup_sequence: +# - destroy +# dependency: +# name: galaxy +# enabled: false +# driver: +# name: default +# options: +# managed: false +# platforms: +# - name: dummy +# provisioner: +# name: ansible +# config_options: +# defaults: +# jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n +# duplicate_dict_key: error +# playbooks: +# converge: '../../../examples/single-dc-l3ls-ipv6/build.yml' +# ansible_args: +# - --inventory +# - ${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/single-dc-l3ls-ipv6/inventory.yml +# verifier: +# name: ansible From bd5afd7e4276af401b4bf042860679b01aed82e2 Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Thu, 16 Oct 2025 12:27:09 -0400 Subject: [PATCH 06/17] remove duplicate_dict_key: error --- .../example-single-dc-l3ls-ipv6/molecule.yml | 52 ++++++++----------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml index 4c98bad5b1c..5d287fc142f 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml @@ -4,34 +4,24 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=../../../examples/single-dc-l3ls/inventory.yml -# scenario: -# converge_sequence: -# - converge -# test_sequence: -# - converge -# - idempotence -# cleanup_sequence: -# - destroy -# dependency: -# name: galaxy -# enabled: false -# driver: -# name: default -# options: -# managed: false -# platforms: -# - name: dummy -# provisioner: -# name: ansible -# config_options: -# defaults: -# jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n -# duplicate_dict_key: error -# playbooks: -# converge: '../../../examples/single-dc-l3ls-ipv6/build.yml' -# ansible_args: -# - --inventory -# - ${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/single-dc-l3ls-ipv6/inventory.yml -# verifier: -# name: ansible + - --inventory=../../../examples/single-dc-l3ls-ipv6/inventory.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + duplicate_dict_key: error + +dependency: + name: galaxy + enabled: false + +scenario: + test_sequence: + - converge + - idempotence + cleanup_sequence: + - cleanup + +verifier: + name: ansible From 2f9341d03987500eabf9b63a18b06ede59efee61 Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Thu, 16 Oct 2025 12:27:11 -0400 Subject: [PATCH 07/17] remove duplicate_dict_key: error --- .../arista/avd/extensions/molecule/ansible_only/molecule.yml | 1 - .../arista/avd/extensions/molecule/anta_runner/molecule.yml | 1 - .../arista/avd/extensions/molecule/cv_deploy/molecule.yml | 1 - .../arista/avd/extensions/molecule/default/molecule.yml | 1 - .../avd/extensions/molecule/example-campus-fabric/molecule.yml | 1 - .../avd/extensions/molecule/example-cv-pathfinder/molecule.yml | 1 - .../avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml | 1 - .../avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml | 1 - .../avd/extensions/molecule/example-l2ls-fabric/molecule.yml | 1 - .../extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml | 1 - .../avd/extensions/molecule/example-single-dc-l3ls/molecule.yml | 1 - 11 files changed, 11 deletions(-) diff --git a/ansible_collections/arista/avd/extensions/molecule/ansible_only/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/ansible_only/molecule.yml index 78659235611..d1a337836f4 100644 --- a/ansible_collections/arista/avd/extensions/molecule/ansible_only/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/ansible_only/molecule.yml @@ -10,7 +10,6 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - duplicate_dict_key: error scenario: converge_sequence: diff --git a/ansible_collections/arista/avd/extensions/molecule/anta_runner/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/anta_runner/molecule.yml index 0572a05415f..21f34d024cb 100644 --- a/ansible_collections/arista/avd/extensions/molecule/anta_runner/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/anta_runner/molecule.yml @@ -10,7 +10,6 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - duplicate_dict_key: error scenario: converge_sequence: diff --git a/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml index 5d79a6a6ea2..a43a1bdcec3 100644 --- a/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml @@ -10,7 +10,6 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - duplicate_dict_key: error scenario: converge_sequence: diff --git a/ansible_collections/arista/avd/extensions/molecule/default/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/default/molecule.yml index 78659235611..d1a337836f4 100644 --- a/ansible_collections/arista/avd/extensions/molecule/default/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/default/molecule.yml @@ -10,7 +10,6 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - duplicate_dict_key: error scenario: converge_sequence: diff --git a/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml index 3c5582a96b1..33ba6e51aa0 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml @@ -21,7 +21,6 @@ provisioner: config_options: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - duplicate_dict_key: error playbooks: converge: '../../../examples/campus-fabric/build.yml' ansible_args: diff --git a/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml index 7613a4a0498..5eccc6c4e65 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml @@ -21,7 +21,6 @@ provisioner: config_options: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - duplicate_dict_key: error playbooks: converge: '../../../examples/cv-pathfinder/build.yml' ansible_args: diff --git a/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml index c058764da1a..892b97c628d 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml @@ -21,7 +21,6 @@ provisioner: config_options: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - duplicate_dict_key: error playbooks: converge: '../../../examples/dual-dc-l3ls/build.yml' ansible_args: diff --git a/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml index e01099aa7d7..48280d4f119 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml @@ -21,7 +21,6 @@ provisioner: config_options: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - duplicate_dict_key: error playbooks: converge: '../../../examples/isis-ldp-ipvpn/build.yml' ansible_args: diff --git a/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml index ccab7a8000a..d03af8eaf0f 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml @@ -21,7 +21,6 @@ provisioner: config_options: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - duplicate_dict_key: error playbooks: converge: '../../../examples/l2ls-fabric/build.yml' ansible_args: diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml index 5d287fc142f..68bc3befa35 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml @@ -10,7 +10,6 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - duplicate_dict_key: error dependency: name: galaxy diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml index 30493eedb6d..b9245f71224 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml @@ -10,7 +10,6 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - duplicate_dict_key: error dependency: name: galaxy From a546adc26d056ba518d14c7ed89816404b9a01d1 Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Fri, 17 Oct 2025 10:43:23 -0400 Subject: [PATCH 08/17] fix molecule file --- .../molecule/cv_deploy/molecule.yml | 2 +- .../molecule/cv_workflow/molecule.yml | 31 +++++++--------- .../molecule/digital_twin/molecule.yml | 31 +++++++--------- .../molecule/eos_cli_config_gen/molecule.yml | 32 ++++++++-------- .../molecule.yml | 31 +++++++--------- .../molecule.yml | 31 +++++++--------- .../molecule/eos_designs-l2ls/molecule.yml | 29 ++++++--------- .../eos_designs_deprecated_vars/molecule.yml | 37 ++++++++----------- .../molecule.yml | 33 ++++++----------- .../eos_designs_unit_tests/molecule.yml | 36 ++++++++---------- 10 files changed, 127 insertions(+), 166 deletions(-) diff --git a/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml index a43a1bdcec3..074b4848882 100644 --- a/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml @@ -4,7 +4,7 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=inventory/ + - --inventory=inventory/inventory.yml env: ANSIBLE_FORCE_COLOR: true cfg: diff --git a/ansible_collections/arista/avd/extensions/molecule/cv_workflow/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/cv_workflow/molecule.yml index d869ea71ddc..074b4848882 100644 --- a/ansible_collections/arista/avd/extensions/molecule/cv_workflow/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/cv_workflow/molecule.yml @@ -1,4 +1,16 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/inventory.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + scenario: converge_sequence: - syntax @@ -11,25 +23,10 @@ scenario: - cleanup cleanup_sequence: - destroy + dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n' - gathering: explicit - playbooks: - converge: converge.yml - ansible_args: - - --inventory - - ${MOLECULE_SCENARIO_DIRECTORY}/inventory/inventory.yml + verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/digital_twin/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/digital_twin/molecule.yml index 57d046f9cb6..a644552e87a 100644 --- a/ansible_collections/arista/avd/extensions/molecule/digital_twin/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/digital_twin/molecule.yml @@ -1,4 +1,16 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/hosts.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + scenario: converge_sequence: - syntax @@ -12,25 +24,10 @@ scenario: - verify cleanup_sequence: - destroy + dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: "jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n" - gathering: explicit - inventory: - links: - hosts: "inventory/hosts.yml" - group_vars: "inventory/group_vars/" - host_vars: "inventory/host_vars/" + verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/molecule.yml index 2a54eb2580c..a644552e87a 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/molecule.yml @@ -1,35 +1,33 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/hosts.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + scenario: converge_sequence: - syntax - converge + - verify test_sequence: - syntax - create - converge - idempotence + - verify cleanup_sequence: - destroy + dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n' - gathering: explicit - inventory: - links: - hosts: 'inventory/hosts.yml' - host_vars: 'inventory/host_vars/' - group_vars: 'inventory/group_vars/' verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/molecule.yml index 16804cbcd18..edcd681f676 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/molecule.yml @@ -1,4 +1,16 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/hosts.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + scenario: converge_sequence: - syntax @@ -10,25 +22,10 @@ scenario: - idempotence cleanup_sequence: - destroy + dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n' - gathering: explicit - inventory: - links: - hosts: 'inventory/hosts.yml' - host_vars: 'inventory/host_vars/' - group_vars: 'inventory/group_vars/' + verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_negative_unit_tests/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_negative_unit_tests/molecule.yml index 7f1c43cf601..c7ba1a9bd34 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_negative_unit_tests/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_negative_unit_tests/molecule.yml @@ -1,4 +1,16 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/ + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + scenario: converge_sequence: - syntax @@ -10,25 +22,10 @@ scenario: - idempotence cleanup_sequence: - destroy + dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n' - gathering: explicit - inventory: - links: - hosts: 'inventory/hosts.yml' - group_vars: 'inventory/group_vars/' - host_vars: 'inventory/host_vars/' + verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_designs-l2ls/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_designs-l2ls/molecule.yml index bf37bccc225..7a470dfdd48 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_designs-l2ls/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_designs-l2ls/molecule.yml @@ -1,4 +1,16 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/hosts.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit scenario: converge_sequence: - syntax @@ -15,22 +27,5 @@ scenario: dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n' - gathering: explicit - inventory: - links: - hosts: 'inventory/hosts.yml' - group_vars: 'inventory/group_vars/' - host_vars: 'inventory/host_vars/' verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_designs_deprecated_vars/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_designs_deprecated_vars/molecule.yml index 81be3f6c92b..a4acbb567a1 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_designs_deprecated_vars/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_designs_deprecated_vars/molecule.yml @@ -1,4 +1,20 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/ + env: + ANSIBLE_FORCE_COLOR: true + # Custom pythonpath to allow loading custom ip_addressing and descriptions modules. + # See CUSTOM_PYTHON_MODULES_TESTS group vars for details. + PYTHONPATH: ${PYTHONPATH}:${MOLECULE_SCENARIO_DIRECTORY}/custom_modules + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit + scenario: converge_sequence: - syntax @@ -15,26 +31,5 @@ scenario: dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n' - gathering: explicit - inventory: - links: - hosts: 'inventory/hosts.yml' - group_vars: 'inventory/group_vars/' - host_vars: 'inventory/host_vars/' - env: - # Custom pythonpath to allow loading custom ip_addressing and descriptions modules. - # See CUSTOM_PYTHON_MODULES_TESTS group vars for details. - PYTHONPATH: ${PYTHONPATH}:${MOLECULE_SCENARIO_DIRECTORY}/custom_modules verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml index 81be3f6c92b..613d2858fa2 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml @@ -1,4 +1,16 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/hosts.yml + env: + ANSIBLE_FORCE_COLOR: true + PYTHONPATH: ${PYTHONPATH}:${MOLECULE_SCENARIO_DIRECTORY}/custom_modules + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n scenario: converge_sequence: - syntax @@ -15,26 +27,5 @@ scenario: dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n' - gathering: explicit - inventory: - links: - hosts: 'inventory/hosts.yml' - group_vars: 'inventory/group_vars/' - host_vars: 'inventory/host_vars/' - env: - # Custom pythonpath to allow loading custom ip_addressing and descriptions modules. - # See CUSTOM_PYTHON_MODULES_TESTS group vars for details. - PYTHONPATH: ${PYTHONPATH}:${MOLECULE_SCENARIO_DIRECTORY}/custom_modules verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/molecule.yml index d01fa302ccb..116c880ee7f 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/molecule.yml @@ -1,4 +1,17 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/hosts.yml + env: + ANSIBLE_FORCE_COLOR: true + PYTHONPATH: ${PYTHONPATH}:${MOLECULE_SCENARIO_DIRECTORY}/custom_modules + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit scenario: converge_sequence: - syntax @@ -12,29 +25,10 @@ scenario: - verify cleanup_sequence: - destroy + dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: "jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n" - gathering: explicit - inventory: - links: - hosts: "inventory/hosts.yml" - group_vars: "inventory/group_vars/" - host_vars: "inventory/host_vars/" - env: - # Custom pythonpath to allow loading custom ip_addressing and descriptions modules. - # See CUSTOM_PYTHON_MODULES_TESTS group vars for details. - PYTHONPATH: ${PYTHONPATH}:${MOLECULE_SCENARIO_DIRECTORY}/custom_modules + verifier: name: ansible From 2233dc2fe79f2c50efc4a10d92db3283dde0c918 Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Fri, 17 Oct 2025 11:29:41 -0400 Subject: [PATCH 09/17] fix all molecule files --- .../eos_designs-mpls-isis-sr-ldp/molecule.yml | 29 ++++++++---------- .../molecule.yml | 29 ++++++++---------- .../molecule.yml | 29 ++++++++---------- .../molecule.yml | 29 ++++++++---------- .../molecule.yml | 29 ++++++++---------- .../molecule.yml | 29 ++++++++---------- .../example-campus-fabric/converge.yml | 3 ++ .../example-campus-fabric/molecule.yml | 27 +++++++---------- .../example-cv-pathfinder/converge.yml | 3 ++ .../example-cv-pathfinder/molecule.yml | 30 ++++++++----------- .../example-dual-dc-l3ls/converge.yml | 3 ++ .../example-dual-dc-l3ls/molecule.yml | 27 +++++++---------- .../example-isis-ldp-ipvpn/converge.yml | 3 ++ .../example-isis-ldp-ipvpn/molecule.yml | 27 +++++++---------- .../molecule/example-l2ls-fabric/converge.yml | 3 ++ .../molecule/example-l2ls-fabric/molecule.yml | 27 +++++++---------- .../example-single-dc-l3ls/destroy.yml | 17 +++++++++++ .../example-single-dc-l3ls/molecule.yml | 2 ++ 18 files changed, 162 insertions(+), 184 deletions(-) create mode 100644 ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/converge.yml create mode 100644 ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/converge.yml create mode 100644 ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/converge.yml create mode 100644 ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/converge.yml create mode 100644 ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/converge.yml create mode 100644 ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/destroy.yml diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/molecule.yml index bf37bccc225..7a470dfdd48 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/molecule.yml @@ -1,4 +1,16 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/hosts.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit scenario: converge_sequence: - syntax @@ -15,22 +27,5 @@ scenario: dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n' - gathering: explicit - inventory: - links: - hosts: 'inventory/hosts.yml' - group_vars: 'inventory/group_vars/' - host_vars: 'inventory/host_vars/' verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_designs-twodc-5stage-clos/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_designs-twodc-5stage-clos/molecule.yml index bf37bccc225..7a470dfdd48 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_designs-twodc-5stage-clos/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_designs-twodc-5stage-clos/molecule.yml @@ -1,4 +1,16 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/hosts.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit scenario: converge_sequence: - syntax @@ -15,22 +27,5 @@ scenario: dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n' - gathering: explicit - inventory: - links: - hosts: 'inventory/hosts.yml' - group_vars: 'inventory/group_vars/' - host_vars: 'inventory/host_vars/' verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ebgp_overlay_ebgp/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ebgp_overlay_ebgp/molecule.yml index bf37bccc225..7a470dfdd48 100644 --- a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ebgp_overlay_ebgp/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ebgp_overlay_ebgp/molecule.yml @@ -1,4 +1,16 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/hosts.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit scenario: converge_sequence: - syntax @@ -15,22 +27,5 @@ scenario: dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n' - gathering: explicit - inventory: - links: - hosts: 'inventory/hosts.yml' - group_vars: 'inventory/group_vars/' - host_vars: 'inventory/host_vars/' verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_isis_overlay_ibgp/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_isis_overlay_ibgp/molecule.yml index bf37bccc225..7a470dfdd48 100644 --- a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_isis_overlay_ibgp/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_isis_overlay_ibgp/molecule.yml @@ -1,4 +1,16 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/hosts.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit scenario: converge_sequence: - syntax @@ -15,22 +27,5 @@ scenario: dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n' - gathering: explicit - inventory: - links: - hosts: 'inventory/hosts.yml' - group_vars: 'inventory/group_vars/' - host_vars: 'inventory/host_vars/' verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ospf_overlay_ebgp/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ospf_overlay_ebgp/molecule.yml index bf37bccc225..7a470dfdd48 100644 --- a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ospf_overlay_ebgp/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ospf_overlay_ebgp/molecule.yml @@ -1,4 +1,16 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/hosts.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit scenario: converge_sequence: - syntax @@ -15,22 +27,5 @@ scenario: dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n' - gathering: explicit - inventory: - links: - hosts: 'inventory/hosts.yml' - group_vars: 'inventory/group_vars/' - host_vars: 'inventory/host_vars/' verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_rfc5549_overlay_ebgp/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_rfc5549_overlay_ebgp/molecule.yml index bf37bccc225..7a470dfdd48 100644 --- a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_rfc5549_overlay_ebgp/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_rfc5549_overlay_ebgp/molecule.yml @@ -1,4 +1,16 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=inventory/hosts.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit scenario: converge_sequence: - syntax @@ -15,22 +27,5 @@ scenario: dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: 'jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n' - gathering: explicit - inventory: - links: - hosts: 'inventory/hosts.yml' - group_vars: 'inventory/group_vars/' - host_vars: 'inventory/host_vars/' verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/converge.yml b/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/converge.yml new file mode 100644 index 00000000000..52761008681 --- /dev/null +++ b/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/converge.yml @@ -0,0 +1,3 @@ +--- +- name: Converge + ansible.builtin.import_playbook: '../../../examples/campus-fabric/build.yml' diff --git a/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml index 33ba6e51aa0..a6664377967 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml @@ -1,4 +1,15 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=../../../examples/campus-fabric/inventory.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n scenario: converge_sequence: - converge @@ -10,21 +21,5 @@ scenario: dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - playbooks: - converge: '../../../examples/campus-fabric/build.yml' - ansible_args: - - --inventory - - ${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/campus-fabric/inventory.yml verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/converge.yml b/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/converge.yml new file mode 100644 index 00000000000..262941ab652 --- /dev/null +++ b/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/converge.yml @@ -0,0 +1,3 @@ +--- +- name: Converge + ansible.builtin.import_playbook: '../../../examples/cv-pathfinder/build.yml' diff --git a/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml index 5eccc6c4e65..5c07264d9d8 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml @@ -1,4 +1,16 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=../../../examples/cv-pathfinder/inventory.yml + - --vault-password-file=../../../examples/cv-pathfinder/.vault + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n scenario: converge_sequence: - converge @@ -10,23 +22,5 @@ scenario: dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - playbooks: - converge: '../../../examples/cv-pathfinder/build.yml' - ansible_args: - - --inventory - - ${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/cv-pathfinder/inventory.yml - - --vault-password-file - - ${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/cv-pathfinder/.vault verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/converge.yml b/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/converge.yml new file mode 100644 index 00000000000..ae7facc4c01 --- /dev/null +++ b/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/converge.yml @@ -0,0 +1,3 @@ +--- +- name: Converge + ansible.builtin.import_playbook: '../../../examples/dual-dc-l3ls/build.yml' diff --git a/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml index 892b97c628d..7f123bf6dcb 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml @@ -1,4 +1,15 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=../../../examples/dual-dc-l3ls/inventory.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n scenario: converge_sequence: - converge @@ -10,21 +21,5 @@ scenario: dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - playbooks: - converge: '../../../examples/dual-dc-l3ls/build.yml' - ansible_args: - - --inventory - - ${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/dual-dc-l3ls/inventory.yml verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/converge.yml b/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/converge.yml new file mode 100644 index 00000000000..ecb7eb99ea3 --- /dev/null +++ b/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/converge.yml @@ -0,0 +1,3 @@ +--- +- name: Converge + ansible.builtin.import_playbook: '../../../examples/isis-ldp-ipvpn/build.yml' diff --git a/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml index 48280d4f119..bbe410dddd7 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml @@ -1,4 +1,15 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=../../../examples/isis-ldp-ipvpn/inventory.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n scenario: converge_sequence: - converge @@ -10,21 +21,5 @@ scenario: dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - playbooks: - converge: '../../../examples/isis-ldp-ipvpn/build.yml' - ansible_args: - - --inventory - - ${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/isis-ldp-ipvpn/inventory.yml verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/converge.yml b/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/converge.yml new file mode 100644 index 00000000000..1718c15c805 --- /dev/null +++ b/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/converge.yml @@ -0,0 +1,3 @@ +--- +- name: Converge + ansible.builtin.import_playbook: '../../../examples/l2ls-fabric/build.yml' diff --git a/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml index d03af8eaf0f..55024b6ba60 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml @@ -1,4 +1,15 @@ --- +ansible: + executor: + backend: ansible-playbook + args: + ansible_playbook: + - --inventory=../../../examples/l2ls-fabric/inventory.yml + env: + ANSIBLE_FORCE_COLOR: true + cfg: + defaults: + jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n scenario: converge_sequence: - converge @@ -10,21 +21,5 @@ scenario: dependency: name: galaxy enabled: false -driver: - name: default - options: - managed: false -platforms: - - name: dummy -provisioner: - name: ansible - config_options: - defaults: - jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - playbooks: - converge: '../../../examples/l2ls-fabric/build.yml' - ansible_args: - - --inventory - - ${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/l2ls-fabric/inventory.yml verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/destroy.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/destroy.yml new file mode 100644 index 00000000000..39bc023a7ae --- /dev/null +++ b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/destroy.yml @@ -0,0 +1,17 @@ +--- +- name: Remove output folders + hosts: all + gather_facts: false + connection: local + tasks: + - name: Delete local folders + delegate_to: 127.0.0.1 + run_once: true + ansible.builtin.file: + path: "{{ root_dir }}/{{ item }}" + state: absent + with_items: + - documentation + - intended + - config_backup + - reports diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml index b9245f71224..86dbe2789a4 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml @@ -19,6 +19,8 @@ scenario: test_sequence: - converge - idempotence + cleanup_sequence: + - cleanup verifier: name: ansible From 9f1058f1aa50e3e2775dfe4c026725be947aa282 Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Mon, 27 Oct 2025 09:30:25 -0400 Subject: [PATCH 10/17] change cv_deploy to not include filename in path --- .../molecule/cv_deploy/inventory/hosts.yml | 28 +++++++++++ .../cv_deploy/inventory/inventory.yml | 26 ----------- .../molecule/cv_deploy/molecule.yml | 2 +- .../cv_workflow/inventory/inventory.yml | 46 ++++++++++--------- .../eos_cli_config_gen/inventory/hosts.yml | 22 +++++---- .../inventory/hosts.yml | 6 ++- 6 files changed, 69 insertions(+), 61 deletions(-) create mode 100644 ansible_collections/arista/avd/extensions/molecule/cv_deploy/inventory/hosts.yml delete mode 100644 ansible_collections/arista/avd/extensions/molecule/cv_deploy/inventory/inventory.yml diff --git a/ansible_collections/arista/avd/extensions/molecule/cv_deploy/inventory/hosts.yml b/ansible_collections/arista/avd/extensions/molecule/cv_deploy/inventory/hosts.yml new file mode 100644 index 00000000000..fc25ddcc8d9 --- /dev/null +++ b/ansible_collections/arista/avd/extensions/molecule/cv_deploy/inventory/hosts.yml @@ -0,0 +1,28 @@ +--- +all: + children: + SITE1: + children: + CVP: + hosts: + cvp: + SITE1_FABRIC: + children: + SITE1_SPINES: + hosts: + avd-ci-spine1: + avd-ci-spine2: + SITE1_LEAFS: + hosts: + avd-ci-leaf1: + avd-ci-leaf2: + avd-ci-leaf3: + avd-ci-leaf4: + SITE1_FABRIC_SERVICES: + children: + SITE1_SPINES: + SITE1_LEAFS: + SITE1_FABRIC_PORTS: + children: + SITE1_SPINES: + SITE1_LEAFS: diff --git a/ansible_collections/arista/avd/extensions/molecule/cv_deploy/inventory/inventory.yml b/ansible_collections/arista/avd/extensions/molecule/cv_deploy/inventory/inventory.yml deleted file mode 100644 index 15da13b3050..00000000000 --- a/ansible_collections/arista/avd/extensions/molecule/cv_deploy/inventory/inventory.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -SITE1: - children: - CVP: - hosts: - cvp: - SITE1_FABRIC: - children: - SITE1_SPINES: - hosts: - avd-ci-spine1: - avd-ci-spine2: - SITE1_LEAFS: - hosts: - avd-ci-leaf1: - avd-ci-leaf2: - avd-ci-leaf3: - avd-ci-leaf4: - SITE1_FABRIC_SERVICES: - children: - SITE1_SPINES: - SITE1_LEAFS: - SITE1_FABRIC_PORTS: - children: - SITE1_SPINES: - SITE1_LEAFS: diff --git a/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml index 074b4848882..a43a1bdcec3 100644 --- a/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml @@ -4,7 +4,7 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=inventory/inventory.yml + - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true cfg: diff --git a/ansible_collections/arista/avd/extensions/molecule/cv_workflow/inventory/inventory.yml b/ansible_collections/arista/avd/extensions/molecule/cv_workflow/inventory/inventory.yml index 461ecc59b65..ec63596cbe4 100644 --- a/ansible_collections/arista/avd/extensions/molecule/cv_workflow/inventory/inventory.yml +++ b/ansible_collections/arista/avd/extensions/molecule/cv_workflow/inventory/inventory.yml @@ -1,26 +1,28 @@ --- -SITE1: +all: children: - CVP: - hosts: - cvp: - SITE1_FABRIC: + SITE1: children: - SITE1_SPINES: + CVP: hosts: - s1-spine1: - s1-spine2: - SITE1_LEAFS: - hosts: - s1-leaf1: - s1-leaf2: - s1-leaf3: - s1-leaf4: - SITE1_FABRIC_SERVICES: - children: - SITE1_SPINES: - SITE1_LEAFS: - SITE1_FABRIC_PORTS: - children: - SITE1_SPINES: - SITE1_LEAFS: + cvp: + SITE1_FABRIC: + children: + SITE1_SPINES: + hosts: + s1-spine1: + s1-spine2: + SITE1_LEAFS: + hosts: + s1-leaf1: + s1-leaf2: + s1-leaf3: + s1-leaf4: + SITE1_FABRIC_SERVICES: + children: + SITE1_SPINES: + SITE1_LEAFS: + SITE1_FABRIC_PORTS: + children: + SITE1_SPINES: + SITE1_LEAFS: diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/hosts.yml b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/hosts.yml index fdf1f65d62c..3da6759d1c8 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/hosts.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/hosts.yml @@ -1,14 +1,16 @@ --- -test_hosts: +all: children: - IGNORE_IN_PYTEST: + test_hosts: + children: + IGNORE_IN_PYTEST: + hosts: + host_inline_jinja: hosts: host_inline_jinja: - hosts: - host_inline_jinja: - host1: - host2: - host3: - host4: - host5: - host6: + host1: + host2: + host3: + host4: + host5: + host6: diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/inventory/hosts.yml b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/inventory/hosts.yml index 77e6893f15b..2938d2228fe 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/inventory/hosts.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/inventory/hosts.yml @@ -1,3 +1,5 @@ --- -test_hosts: - hosts: +all: + children: + test_hosts: + hosts: From d900a171935542f1c0a0956db55eeadd1876b844 Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Mon, 27 Oct 2025 09:44:44 -0400 Subject: [PATCH 11/17] remove unused playbooks --- .../arista/avd/extensions/molecule/cv_deploy/molecule.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml index a43a1bdcec3..bd30cecd2ce 100644 --- a/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml @@ -17,9 +17,7 @@ scenario: - converge test_sequence: - syntax - - create - converge - - verify - cleanup cleanup_sequence: - destroy From eeeeb76f2980729ca4ae3032d8c8a6f3c1240488 Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Mon, 27 Oct 2025 11:31:58 -0400 Subject: [PATCH 12/17] remove warnings from eos_cli_config_gen --- .../{inventory => files}/TCAM_TRAFFIC_POLICY.conf | 0 .../inventory/host_vars/host_inline_jinja/tcam-profile.yml | 2 +- .../avd/extensions/molecule/eos_cli_config_gen/molecule.yml | 4 +--- 3 files changed, 2 insertions(+), 4 deletions(-) rename ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/{inventory => files}/TCAM_TRAFFIC_POLICY.conf (100%) diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/TCAM_TRAFFIC_POLICY.conf b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/files/TCAM_TRAFFIC_POLICY.conf similarity index 100% rename from ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/TCAM_TRAFFIC_POLICY.conf rename to ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/files/TCAM_TRAFFIC_POLICY.conf diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/host_vars/host_inline_jinja/tcam-profile.yml b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/host_vars/host_inline_jinja/tcam-profile.yml index 961a9196024..1c0623681a1 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/host_vars/host_inline_jinja/tcam-profile.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/host_vars/host_inline_jinja/tcam-profile.yml @@ -3,4 +3,4 @@ tcam_profile: system: traffic_policy profiles: - name: traffic_policy - config: "{{ lookup('file', '{{ root_dir }}/inventory/TCAM_TRAFFIC_POLICY.conf') }}" + config: "{{ lookup('file', '{{ root_dir }}/files/TCAM_TRAFFIC_POLICY.conf') }}" diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/molecule.yml index a644552e87a..c7ba1a9bd34 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/molecule.yml @@ -4,7 +4,7 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=inventory/hosts.yml + - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true cfg: @@ -15,13 +15,11 @@ scenario: converge_sequence: - syntax - converge - - verify test_sequence: - syntax - create - converge - idempotence - - verify cleanup_sequence: - destroy From 582a2de1869e63b939a45a1627fc70b29e1b50ee Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Mon, 27 Oct 2025 11:59:08 -0400 Subject: [PATCH 13/17] fix examples with recommandations --- .../molecule/example-campus-fabric/converge.yml | 3 --- .../molecule/example-campus-fabric/molecule.yml | 4 +++- .../molecule/example-cv-pathfinder/converge.yml | 3 --- .../molecule/example-cv-pathfinder/molecule.yml | 6 ++++-- .../molecule/example-dual-dc-l3ls/converge.yml | 3 --- .../molecule/example-dual-dc-l3ls/molecule.yml | 4 +++- .../molecule/example-isis-ldp-ipvpn/converge.yml | 3 --- .../molecule/example-isis-ldp-ipvpn/molecule.yml | 4 +++- .../extensions/molecule/example-l2ls-fabric/converge.yml | 3 --- .../extensions/molecule/example-l2ls-fabric/molecule.yml | 4 +++- .../molecule/example-single-dc-l3ls-ipv6/converge.yml | 3 --- .../{cleanup.yml => destroy.yml} | 0 .../molecule/example-single-dc-l3ls-ipv6/molecule.yml | 9 ++++----- .../molecule/example-single-dc-l3ls/converge.yml | 3 --- .../molecule/example-single-dc-l3ls/molecule.yml | 7 +++---- 15 files changed, 23 insertions(+), 36 deletions(-) delete mode 100644 ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/converge.yml delete mode 100644 ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/converge.yml delete mode 100644 ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/converge.yml delete mode 100644 ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/converge.yml delete mode 100644 ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/converge.yml delete mode 100644 ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/converge.yml rename ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/{cleanup.yml => destroy.yml} (100%) delete mode 100644 ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/converge.yml diff --git a/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/converge.yml b/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/converge.yml deleted file mode 100644 index 52761008681..00000000000 --- a/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/converge.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Converge - ansible.builtin.import_playbook: '../../../examples/campus-fabric/build.yml' diff --git a/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml index a6664377967..d590fc80628 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml @@ -4,12 +4,14 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=../../../examples/campus-fabric/inventory.yml + - --inventory=${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/campus-fabric/inventory.yml env: ANSIBLE_FORCE_COLOR: true cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + playbooks: + converge: '${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/campus-fabric/build.yml' scenario: converge_sequence: - converge diff --git a/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/converge.yml b/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/converge.yml deleted file mode 100644 index 262941ab652..00000000000 --- a/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/converge.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Converge - ansible.builtin.import_playbook: '../../../examples/cv-pathfinder/build.yml' diff --git a/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml index 5c07264d9d8..2a4bc79bc1b 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml @@ -4,13 +4,15 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=../../../examples/cv-pathfinder/inventory.yml - - --vault-password-file=../../../examples/cv-pathfinder/.vault + - --inventory=${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/cv-pathfinder/inventory.yml env: ANSIBLE_FORCE_COLOR: true cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + vault_password_file: "${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/cv-pathfinder/.vault" + playbooks: + converge: '../../../examples/cv-pathfinder/build.yml' scenario: converge_sequence: - converge diff --git a/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/converge.yml b/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/converge.yml deleted file mode 100644 index ae7facc4c01..00000000000 --- a/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/converge.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Converge - ansible.builtin.import_playbook: '../../../examples/dual-dc-l3ls/build.yml' diff --git a/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml index 7f123bf6dcb..d258390508e 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml @@ -4,12 +4,14 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=../../../examples/dual-dc-l3ls/inventory.yml + - --inventory=${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/dual-dc-l3ls/inventory.yml env: ANSIBLE_FORCE_COLOR: true cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + playbooks: + converge: '${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/dual-dc-l3ls/build.yml' scenario: converge_sequence: - converge diff --git a/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/converge.yml b/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/converge.yml deleted file mode 100644 index ecb7eb99ea3..00000000000 --- a/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/converge.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Converge - ansible.builtin.import_playbook: '../../../examples/isis-ldp-ipvpn/build.yml' diff --git a/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml index bbe410dddd7..6920ff51bdc 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml @@ -4,12 +4,14 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=../../../examples/isis-ldp-ipvpn/inventory.yml + - --inventory=${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/isis-ldp-ipvpn/inventory.yml env: ANSIBLE_FORCE_COLOR: true cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + playbooks: + converge: '${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/isis-ldp-ipvpn/build.yml' scenario: converge_sequence: - converge diff --git a/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/converge.yml b/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/converge.yml deleted file mode 100644 index 1718c15c805..00000000000 --- a/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/converge.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Converge - ansible.builtin.import_playbook: '../../../examples/l2ls-fabric/build.yml' diff --git a/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml index 55024b6ba60..f661e6324e1 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml @@ -4,12 +4,14 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=../../../examples/l2ls-fabric/inventory.yml + - --inventory=${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/l2ls-fabric/inventory.yml env: ANSIBLE_FORCE_COLOR: true cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + playbooks: + converge: '${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/l2ls-fabric/build.yml' scenario: converge_sequence: - converge diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/converge.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/converge.yml deleted file mode 100644 index f337fe56fed..00000000000 --- a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/converge.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Converge - ansible.builtin.import_playbook: '../../../examples/single-dc-l3ls-ipv6/build.yml' diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/cleanup.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/destroy.yml similarity index 100% rename from ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/cleanup.yml rename to ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/destroy.yml diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml index 68bc3befa35..576392e4a3f 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml @@ -4,23 +4,22 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=../../../examples/single-dc-l3ls-ipv6/inventory.yml + - --inventory=${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/single-dc-l3ls-ipv6/inventory.yml env: ANSIBLE_FORCE_COLOR: true cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - + playbooks: + converge: '${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/single-dc-l3ls-ipv6/build.yml' dependency: name: galaxy enabled: false - scenario: test_sequence: - converge - idempotence cleanup_sequence: - - cleanup - + - destroy verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/converge.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/converge.yml deleted file mode 100644 index dd8f45922cf..00000000000 --- a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/converge.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: Converge - ansible.builtin.import_playbook: '../../../examples/single-dc-l3ls/build.yml' diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml index 86dbe2789a4..fd90ef5c752 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml @@ -4,23 +4,22 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=../../../examples/single-dc-l3ls/inventory.yml + - --inventory=${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/single-dc-l3ls/inventory.yml env: ANSIBLE_FORCE_COLOR: true cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - + playbooks: + converge: '${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/single-dc-l3ls/build.yml' dependency: name: galaxy enabled: false - scenario: test_sequence: - converge - idempotence cleanup_sequence: - cleanup - verifier: name: ansible From a03b89bc86a3c792812cad2cdb6f86b4379a0694 Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Mon, 27 Oct 2025 12:07:21 -0400 Subject: [PATCH 14/17] add gathering: explicit to ansible defaults --- .../arista/avd/extensions/molecule/ansible_only/molecule.yml | 4 +--- .../arista/avd/extensions/molecule/anta_runner/molecule.yml | 4 +--- .../arista/avd/extensions/molecule/cv_deploy/molecule.yml | 4 +--- .../arista/avd/extensions/molecule/cv_workflow/molecule.yml | 4 +--- .../arista/avd/extensions/molecule/default/molecule.yml | 2 +- .../arista/avd/extensions/molecule/digital_twin/molecule.yml | 4 +--- .../{files => inventory}/TCAM_TRAFFIC_POLICY.conf | 0 .../inventory/host_vars/host_inline_jinja/tcam-profile.yml | 2 +- .../avd/extensions/molecule/eos_cli_config_gen/molecule.yml | 4 +--- .../molecule/eos_cli_config_gen_deprecated_vars/molecule.yml | 4 +--- .../eos_cli_config_gen_negative_unit_tests/molecule.yml | 4 +--- .../molecule/eos_designs_deprecated_vars/molecule.yml | 1 - .../molecule/eos_designs_negative_unit_tests/molecule.yml | 1 + .../molecule/evpn_underlay_isis_overlay_ibgp/molecule.yml | 2 +- .../molecule/evpn_underlay_ospf_overlay_ebgp/molecule.yml | 2 +- .../molecule/evpn_underlay_rfc5549_overlay_ebgp/molecule.yml | 2 +- .../extensions/molecule/example-campus-fabric/molecule.yml | 1 + .../extensions/molecule/example-cv-pathfinder/molecule.yml | 1 + .../avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml | 1 + .../extensions/molecule/example-isis-ldp-ipvpn/molecule.yml | 1 + .../avd/extensions/molecule/example-l2ls-fabric/molecule.yml | 1 + .../molecule/example-single-dc-l3ls-ipv6/molecule.yml | 1 + .../extensions/molecule/example-single-dc-l3ls/molecule.yml | 1 + 23 files changed, 21 insertions(+), 30 deletions(-) rename ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/{files => inventory}/TCAM_TRAFFIC_POLICY.conf (100%) diff --git a/ansible_collections/arista/avd/extensions/molecule/ansible_only/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/ansible_only/molecule.yml index d1a337836f4..e865cca8431 100644 --- a/ansible_collections/arista/avd/extensions/molecule/ansible_only/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/ansible_only/molecule.yml @@ -10,7 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - + gathering: explicit scenario: converge_sequence: - syntax @@ -24,10 +24,8 @@ scenario: - verify cleanup_sequence: - destroy - dependency: name: galaxy enabled: false - verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/anta_runner/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/anta_runner/molecule.yml index 21f34d024cb..c7b6a111639 100644 --- a/ansible_collections/arista/avd/extensions/molecule/anta_runner/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/anta_runner/molecule.yml @@ -10,7 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - + gathering: explicit scenario: converge_sequence: - converge @@ -20,10 +20,8 @@ scenario: - idempotence cleanup_sequence: - destroy - dependency: name: galaxy enabled: false - verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml index bd30cecd2ce..fe2b319bacd 100644 --- a/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/cv_deploy/molecule.yml @@ -10,7 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - + gathering: explicit scenario: converge_sequence: - syntax @@ -21,10 +21,8 @@ scenario: - cleanup cleanup_sequence: - destroy - dependency: name: galaxy enabled: false - verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/cv_workflow/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/cv_workflow/molecule.yml index 074b4848882..3193daf0189 100644 --- a/ansible_collections/arista/avd/extensions/molecule/cv_workflow/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/cv_workflow/molecule.yml @@ -10,7 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - + gathering: explicit scenario: converge_sequence: - syntax @@ -23,10 +23,8 @@ scenario: - cleanup cleanup_sequence: - destroy - dependency: name: galaxy enabled: false - verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/default/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/default/molecule.yml index d1a337836f4..aba0f8c4818 100644 --- a/ansible_collections/arista/avd/extensions/molecule/default/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/default/molecule.yml @@ -10,7 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - + gathering: explicit scenario: converge_sequence: - syntax diff --git a/ansible_collections/arista/avd/extensions/molecule/digital_twin/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/digital_twin/molecule.yml index a644552e87a..7a470dfdd48 100644 --- a/ansible_collections/arista/avd/extensions/molecule/digital_twin/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/digital_twin/molecule.yml @@ -10,7 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - + gathering: explicit scenario: converge_sequence: - syntax @@ -24,10 +24,8 @@ scenario: - verify cleanup_sequence: - destroy - dependency: name: galaxy enabled: false - verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/files/TCAM_TRAFFIC_POLICY.conf b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/TCAM_TRAFFIC_POLICY.conf similarity index 100% rename from ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/files/TCAM_TRAFFIC_POLICY.conf rename to ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/TCAM_TRAFFIC_POLICY.conf diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/host_vars/host_inline_jinja/tcam-profile.yml b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/host_vars/host_inline_jinja/tcam-profile.yml index 1c0623681a1..961a9196024 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/host_vars/host_inline_jinja/tcam-profile.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/host_vars/host_inline_jinja/tcam-profile.yml @@ -3,4 +3,4 @@ tcam_profile: system: traffic_policy profiles: - name: traffic_policy - config: "{{ lookup('file', '{{ root_dir }}/files/TCAM_TRAFFIC_POLICY.conf') }}" + config: "{{ lookup('file', '{{ root_dir }}/inventory/TCAM_TRAFFIC_POLICY.conf') }}" diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/molecule.yml index c7ba1a9bd34..8059590d3a5 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/molecule.yml @@ -10,7 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - + gathering: explicit scenario: converge_sequence: - syntax @@ -22,10 +22,8 @@ scenario: - idempotence cleanup_sequence: - destroy - dependency: name: galaxy enabled: false - verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/molecule.yml index edcd681f676..4861afee01b 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/molecule.yml @@ -10,7 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - + gathering: explicit scenario: converge_sequence: - syntax @@ -22,10 +22,8 @@ scenario: - idempotence cleanup_sequence: - destroy - dependency: name: galaxy enabled: false - verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_negative_unit_tests/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_negative_unit_tests/molecule.yml index c7ba1a9bd34..8059590d3a5 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_negative_unit_tests/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_negative_unit_tests/molecule.yml @@ -10,7 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n - + gathering: explicit scenario: converge_sequence: - syntax @@ -22,10 +22,8 @@ scenario: - idempotence cleanup_sequence: - destroy - dependency: name: galaxy enabled: false - verifier: name: ansible diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_designs_deprecated_vars/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_designs_deprecated_vars/molecule.yml index a4acbb567a1..db5d41549ed 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_designs_deprecated_vars/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_designs_deprecated_vars/molecule.yml @@ -14,7 +14,6 @@ ansible: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n gathering: explicit - scenario: converge_sequence: - syntax diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml index 613d2858fa2..2a68edfdbd8 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml @@ -11,6 +11,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit scenario: converge_sequence: - syntax diff --git a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_isis_overlay_ibgp/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_isis_overlay_ibgp/molecule.yml index 7a470dfdd48..e865cca8431 100644 --- a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_isis_overlay_ibgp/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_isis_overlay_ibgp/molecule.yml @@ -4,7 +4,7 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=inventory/hosts.yml + - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true cfg: diff --git a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ospf_overlay_ebgp/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ospf_overlay_ebgp/molecule.yml index 7a470dfdd48..e865cca8431 100644 --- a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ospf_overlay_ebgp/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ospf_overlay_ebgp/molecule.yml @@ -4,7 +4,7 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=inventory/hosts.yml + - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true cfg: diff --git a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_rfc5549_overlay_ebgp/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_rfc5549_overlay_ebgp/molecule.yml index 7a470dfdd48..e865cca8431 100644 --- a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_rfc5549_overlay_ebgp/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_rfc5549_overlay_ebgp/molecule.yml @@ -4,7 +4,7 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=inventory/hosts.yml + - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true cfg: diff --git a/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml index d590fc80628..4958ce2174b 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-campus-fabric/molecule.yml @@ -10,6 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit playbooks: converge: '${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/campus-fabric/build.yml' scenario: diff --git a/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml index 2a4bc79bc1b..3d55c45df44 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-cv-pathfinder/molecule.yml @@ -10,6 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit vault_password_file: "${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/cv-pathfinder/.vault" playbooks: converge: '../../../examples/cv-pathfinder/build.yml' diff --git a/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml index d258390508e..8d1b751ef50 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-dual-dc-l3ls/molecule.yml @@ -10,6 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit playbooks: converge: '${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/dual-dc-l3ls/build.yml' scenario: diff --git a/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml index 6920ff51bdc..16e471d54de 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-isis-ldp-ipvpn/molecule.yml @@ -10,6 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit playbooks: converge: '${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/isis-ldp-ipvpn/build.yml' scenario: diff --git a/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml index f661e6324e1..a18290b33de 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-l2ls-fabric/molecule.yml @@ -10,6 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit playbooks: converge: '${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/l2ls-fabric/build.yml' scenario: diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml index 576392e4a3f..c2d7e578244 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls-ipv6/molecule.yml @@ -10,6 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit playbooks: converge: '${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/single-dc-l3ls-ipv6/build.yml' dependency: diff --git a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml index fd90ef5c752..c6834865d0f 100644 --- a/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/example-single-dc-l3ls/molecule.yml @@ -10,6 +10,7 @@ ansible: cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n + gathering: explicit playbooks: converge: '${MOLECULE_SCENARIO_DIRECTORY}/../../../examples/single-dc-l3ls/build.yml' dependency: From 465711fc6252f7f39664d4afa6e2d1029f16ef8c Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Mon, 27 Oct 2025 14:19:30 -0400 Subject: [PATCH 15/17] standardize inventory path --- .../arista/avd/extensions/molecule/cv_workflow/molecule.yml | 2 +- .../arista/avd/extensions/molecule/digital_twin/molecule.yml | 2 +- .../molecule/eos_cli_config_gen_deprecated_vars/molecule.yml | 2 +- .../avd/extensions/molecule/eos_designs-l2ls/molecule.yml | 2 +- .../molecule/eos_designs-mpls-isis-sr-ldp/molecule.yml | 2 +- .../molecule/eos_designs-twodc-5stage-clos/molecule.yml | 2 +- .../molecule/eos_designs_negative_unit_tests/molecule.yml | 2 +- .../avd/extensions/molecule/eos_designs_unit_tests/molecule.yml | 2 +- .../molecule/evpn_underlay_ebgp_overlay_ebgp/molecule.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ansible_collections/arista/avd/extensions/molecule/cv_workflow/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/cv_workflow/molecule.yml index 3193daf0189..573606b51c6 100644 --- a/ansible_collections/arista/avd/extensions/molecule/cv_workflow/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/cv_workflow/molecule.yml @@ -4,7 +4,7 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=inventory/inventory.yml + - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true cfg: diff --git a/ansible_collections/arista/avd/extensions/molecule/digital_twin/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/digital_twin/molecule.yml index 7a470dfdd48..e865cca8431 100644 --- a/ansible_collections/arista/avd/extensions/molecule/digital_twin/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/digital_twin/molecule.yml @@ -4,7 +4,7 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=inventory/hosts.yml + - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true cfg: diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/molecule.yml index 4861afee01b..8059590d3a5 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen_deprecated_vars/molecule.yml @@ -4,7 +4,7 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=inventory/hosts.yml + - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true cfg: diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_designs-l2ls/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_designs-l2ls/molecule.yml index 7a470dfdd48..e865cca8431 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_designs-l2ls/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_designs-l2ls/molecule.yml @@ -4,7 +4,7 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=inventory/hosts.yml + - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true cfg: diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/molecule.yml index 7a470dfdd48..e865cca8431 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_designs-mpls-isis-sr-ldp/molecule.yml @@ -4,7 +4,7 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=inventory/hosts.yml + - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true cfg: diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_designs-twodc-5stage-clos/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_designs-twodc-5stage-clos/molecule.yml index 7a470dfdd48..e865cca8431 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_designs-twodc-5stage-clos/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_designs-twodc-5stage-clos/molecule.yml @@ -4,7 +4,7 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=inventory/hosts.yml + - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true cfg: diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml index 2a68edfdbd8..7bfe8ba6b3c 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml @@ -4,7 +4,7 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=inventory/hosts.yml + - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true PYTHONPATH: ${PYTHONPATH}:${MOLECULE_SCENARIO_DIRECTORY}/custom_modules diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/molecule.yml index 116c880ee7f..7a7326eada2 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/molecule.yml @@ -4,7 +4,7 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=inventory/hosts.yml + - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true PYTHONPATH: ${PYTHONPATH}:${MOLECULE_SCENARIO_DIRECTORY}/custom_modules diff --git a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ebgp_overlay_ebgp/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ebgp_overlay_ebgp/molecule.yml index 7a470dfdd48..e865cca8431 100644 --- a/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ebgp_overlay_ebgp/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/evpn_underlay_ebgp_overlay_ebgp/molecule.yml @@ -4,7 +4,7 @@ ansible: backend: ansible-playbook args: ansible_playbook: - - --inventory=inventory/hosts.yml + - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true cfg: From fe8972f7c02c16a37fd8d74d218aab411abea0bf Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Mon, 27 Oct 2025 14:22:07 -0400 Subject: [PATCH 16/17] remove PYTHONPATH --- .../molecule/eos_designs_deprecated_vars/molecule.yml | 3 --- .../molecule/eos_designs_negative_unit_tests/molecule.yml | 1 - 2 files changed, 4 deletions(-) diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_designs_deprecated_vars/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_designs_deprecated_vars/molecule.yml index db5d41549ed..e865cca8431 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_designs_deprecated_vars/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_designs_deprecated_vars/molecule.yml @@ -7,9 +7,6 @@ ansible: - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true - # Custom pythonpath to allow loading custom ip_addressing and descriptions modules. - # See CUSTOM_PYTHON_MODULES_TESTS group vars for details. - PYTHONPATH: ${PYTHONPATH}:${MOLECULE_SCENARIO_DIRECTORY}/custom_modules cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n diff --git a/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml b/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml index 7bfe8ba6b3c..e865cca8431 100644 --- a/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml +++ b/ansible_collections/arista/avd/extensions/molecule/eos_designs_negative_unit_tests/molecule.yml @@ -7,7 +7,6 @@ ansible: - --inventory=inventory/ env: ANSIBLE_FORCE_COLOR: true - PYTHONPATH: ${PYTHONPATH}:${MOLECULE_SCENARIO_DIRECTORY}/custom_modules cfg: defaults: jinja2_extensions: jinja2.ext.loopcontrols,jinja2.ext.do,jinja2.ext.i18n From 35e91bbe9efe876ec8a5ee30a11095f1d65c7f76 Mon Sep 17 00:00:00 2001 From: Joel Breton Date: Tue, 28 Oct 2025 09:08:43 -0400 Subject: [PATCH 17/17] rename to hosts.yml from invenotry,yml --- .../molecule/cv_workflow/inventory/{inventory.yml => hosts.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ansible_collections/arista/avd/extensions/molecule/cv_workflow/inventory/{inventory.yml => hosts.yml} (100%) diff --git a/ansible_collections/arista/avd/extensions/molecule/cv_workflow/inventory/inventory.yml b/ansible_collections/arista/avd/extensions/molecule/cv_workflow/inventory/hosts.yml similarity index 100% rename from ansible_collections/arista/avd/extensions/molecule/cv_workflow/inventory/inventory.yml rename to ansible_collections/arista/avd/extensions/molecule/cv_workflow/inventory/hosts.yml