From b9ea0bfbd0e2c0749d1c79d79f8a0f944f7f34b6 Mon Sep 17 00:00:00 2001 From: Mohamed Maaloul Date: Wed, 25 Oct 2023 13:47:49 +0200 Subject: [PATCH 01/10] non-breaking implementation --- .../intended/configs/generate-default-config.cfg | 9 ++++++++- .../host_vars/generate-default-config.yml | 3 ++- .../transceiver-qsfp-default-mode-channelized.md | 16 ++++++++++++++++ ...iver_qsfp_default_mode_channelized.schema.yml | 13 +++++++++++++ .../eos/transceiver-qsfp-default-mode.j2 | 2 +- 5 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/transceiver-qsfp-default-mode-channelized.md create mode 100644 ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/generate-default-config.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/generate-default-config.cfg index 8b137891791..8956426177d 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/generate-default-config.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/generate-default-config.cfg @@ -1 +1,8 @@ - +!RANCID-CONTENT-TYPE: arista +! +hostname generate-default-config +! +no enable password +no aaa root +! +end diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml index ea47e2e0495..f470b8118f8 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml @@ -1,3 +1,4 @@ -generate_default_config: false +generate_default_config: true +transceiver_qsfp_default_mode_channelized: false #Override config inherited from all.yml management_interfaces: null diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/transceiver-qsfp-default-mode-channelized.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/transceiver-qsfp-default-mode-channelized.md new file mode 100644 index 00000000000..bc89be06ce0 --- /dev/null +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/transceiver-qsfp-default-mode-channelized.md @@ -0,0 +1,16 @@ + +=== "Table" + + | Variable | Type | Required | Default | Value Restrictions | Description | + | -------- | ---- | -------- | ------- | ------------------ | ----------- | + | [transceiver_qsfp_default_mode_channelized](## "transceiver_qsfp_default_mode_channelized") | Boolean | | | | The `transceiver_qsfp_default_mode_channelized` knob allows to set default qsfp mode to 40G when set to `false`.
If not defined, it defaults to the value of `generate_default_config` | + +=== "YAML" + + ```yaml + transceiver_qsfp_default_mode_channelized: + ``` diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml new file mode 100644 index 00000000000..098203409df --- /dev/null +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml @@ -0,0 +1,13 @@ +# Copyright (c) 2023 Arista Networks, Inc. +# Use of this source code is governed by the Apache License 2.0 +# that can be found in the LICENSE file. +# yaml-language-server: $schema=../../../../plugins/plugin_utils/schema/avd_meta_schema.json +# Line above is used by RedHat's YAML Schema vscode extension +# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. +type: dict +keys: + transceiver_qsfp_default_mode_channelized: + type: bool + description: | + The `transceiver_qsfp_default_mode_channelized` knob allows to set default qsfp mode to 40G when set to `false`. + If not defined, it defaults to the value of `generate_default_config` diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/transceiver-qsfp-default-mode.j2 b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/transceiver-qsfp-default-mode.j2 index 9d5782e17a8..948ca82683e 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/transceiver-qsfp-default-mode.j2 +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/transceiver-qsfp-default-mode.j2 @@ -5,7 +5,7 @@ #} {# eos - transceiver qsfp default mode #} {# cannot be disabled in current EOS releases #} -{% if not generate_default_config is arista.avd.defined(false) %} +{% if transceiver_qsfp_default_mode_channelized | arista.avd.default(generate_default_config, true) %} ! transceiver qsfp default-mode 4x10G {% endif %} From a924691a402827dd7892260f4f9e11eb205deee2 Mon Sep 17 00:00:00 2001 From: Carl Buchmann Date: Fri, 12 Jan 2024 11:49:15 -0500 Subject: [PATCH 02/10] Apply suggestions from code review --- .../transceiver_qsfp_default_mode_channelized.schema.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml index 098203409df..22639d66c90 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml @@ -8,6 +8,6 @@ type: dict keys: transceiver_qsfp_default_mode_channelized: type: bool + default: true description: | - The `transceiver_qsfp_default_mode_channelized` knob allows to set default qsfp mode to 40G when set to `false`. - If not defined, it defaults to the value of `generate_default_config` + On all front panel ports which support this feature, the following global configuration command changes the QSFP mode from 40G to 4x10G (default). When set to false the command reverts the default QSFP mode back to 40G. From 36f7eaed81bbd0484f5cd20bf522d3fc1d228a40 Mon Sep 17 00:00:00 2001 From: Carl Buchmann Date: Fri, 12 Jan 2024 11:54:46 -0500 Subject: [PATCH 03/10] rerun pre-commit --- .../tables/transceiver-qsfp-default-mode-channelized.md | 7 ++++--- .../schemas/eos_cli_config_gen.jsonschema.json | 6 ++++++ .../schemas/eos_cli_config_gen.schema.yml | 6 ++++++ .../transceiver_qsfp_default_mode_channelized.schema.yml | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/transceiver-qsfp-default-mode-channelized.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/transceiver-qsfp-default-mode-channelized.md index bc89be06ce0..c002b7f8c28 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/transceiver-qsfp-default-mode-channelized.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/transceiver-qsfp-default-mode-channelized.md @@ -1,5 +1,5 @@ @@ -7,10 +7,11 @@ | Variable | Type | Required | Default | Value Restrictions | Description | | -------- | ---- | -------- | ------- | ------------------ | ----------- | - | [transceiver_qsfp_default_mode_channelized](## "transceiver_qsfp_default_mode_channelized") | Boolean | | | | The `transceiver_qsfp_default_mode_channelized` knob allows to set default qsfp mode to 40G when set to `false`.
If not defined, it defaults to the value of `generate_default_config` | + | [transceiver_qsfp_default_mode_channelized](## "transceiver_qsfp_default_mode_channelized") | Boolean | | `True` | | On all front panel ports which support this feature, the following global configuration command changes the QSFP mode from 40G to 4x10G (default). When set to false the command reverts the default QSFP mode back to 40G. | === "YAML" ```yaml - transceiver_qsfp_default_mode_channelized: + # On all front panel ports which support this feature, the following global configuration command changes the QSFP mode from 40G to 4x10G (default). When set to false the command reverts the default QSFP mode back to 40G. + transceiver_qsfp_default_mode_channelized: ``` diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json index 69bc6478094..f178a83b279 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json @@ -24231,6 +24231,12 @@ }, "title": "Traffic Policies" }, + "transceiver_qsfp_default_mode_channelized": { + "type": "boolean", + "default": true, + "description": "On all front panel ports which support this feature, the following global configuration command changes the QSFP mode from 40G to 4x10G (default). When set to false the command reverts the default QSFP mode back to 40G.", + "title": "Transceiver Qsfp Default Mode Channelized" + }, "tunnel_interfaces": { "type": "array", "items": { diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml index 4d2b1ce1ded..134c588fda9 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml @@ -14056,6 +14056,12 @@ keys: log: type: bool description: Only supported when action is set to drop + transceiver_qsfp_default_mode_channelized: + type: bool + default: true + description: On all front panel ports which support this feature, the following + global configuration command changes the QSFP mode from 40G to 4x10G (default). + When set to false the command reverts the default QSFP mode back to 40G. tunnel_interfaces: type: list primary_key: name diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml index 22639d66c90..8185ba755ff 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Arista Networks, Inc. +# Copyright (c) 2023-2024 Arista Networks, Inc. # Use of this source code is governed by the Apache License 2.0 # that can be found in the LICENSE file. # yaml-language-server: $schema=../../../../plugins/plugin_utils/schema/avd_meta_schema.json From a07e4e4c23dd67cd62dfc9833dd7d96559a79cea Mon Sep 17 00:00:00 2001 From: Carl Buchmann Date: Fri, 12 Jan 2024 12:06:31 -0500 Subject: [PATCH 04/10] update key name + documentation --- .../inventory/host_vars/generate-default-config.yml | 2 +- .../avd/roles/eos_cli_config_gen/docs/input-variables.md | 6 ++++++ ...channelized.md => transceiver-qsfp-default-mode-4x10.md} | 4 ++-- .../schemas/eos_cli_config_gen.jsonschema.json | 4 ++-- .../schemas/eos_cli_config_gen.schema.yml | 2 +- .../transceiver_qsfp_default_mode_channelized.schema.yml | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) rename ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/{transceiver-qsfp-default-mode-channelized.md => transceiver-qsfp-default-mode-4x10.md} (58%) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml index f470b8118f8..f99a5d1cdb3 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml @@ -1,4 +1,4 @@ generate_default_config: true -transceiver_qsfp_default_mode_channelized: false +transceiver_qsfp_default_mode_4x10: false #Override config inherited from all.yml management_interfaces: null diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/input-variables.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/input-variables.md index 0ab73fbc655..388527b922d 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/input-variables.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/input-variables.md @@ -363,6 +363,12 @@ roles/eos_cli_config_gen/docs/tables/port-channel-interfaces.md roles/eos_cli_config_gen/docs/tables/switchport-default.md --8<-- +### Transceiver QSFP default mode 4x10 + +--8<-- +transceiver-qsfp-default-mode-4x10.md +--8<-- + ### Tunnel interfaces --8<-- diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/transceiver-qsfp-default-mode-channelized.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/transceiver-qsfp-default-mode-4x10.md similarity index 58% rename from ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/transceiver-qsfp-default-mode-channelized.md rename to ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/transceiver-qsfp-default-mode-4x10.md index c002b7f8c28..b073735630a 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/transceiver-qsfp-default-mode-channelized.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/transceiver-qsfp-default-mode-4x10.md @@ -7,11 +7,11 @@ | Variable | Type | Required | Default | Value Restrictions | Description | | -------- | ---- | -------- | ------- | ------------------ | ----------- | - | [transceiver_qsfp_default_mode_channelized](## "transceiver_qsfp_default_mode_channelized") | Boolean | | `True` | | On all front panel ports which support this feature, the following global configuration command changes the QSFP mode from 40G to 4x10G (default). When set to false the command reverts the default QSFP mode back to 40G. | + | [transceiver_qsfp_default_mode_4x10](## "transceiver_qsfp_default_mode_4x10") | Boolean | | `True` | | On all front panel ports which support this feature, the following global configuration command changes the QSFP mode from 40G to 4x10G (default). When set to false the command reverts the default QSFP mode back to 40G. | === "YAML" ```yaml # On all front panel ports which support this feature, the following global configuration command changes the QSFP mode from 40G to 4x10G (default). When set to false the command reverts the default QSFP mode back to 40G. - transceiver_qsfp_default_mode_channelized: + transceiver_qsfp_default_mode_4x10: ``` diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json index f178a83b279..5fda411bc47 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json @@ -24231,11 +24231,11 @@ }, "title": "Traffic Policies" }, - "transceiver_qsfp_default_mode_channelized": { + "transceiver_qsfp_default_mode_4x10": { "type": "boolean", "default": true, "description": "On all front panel ports which support this feature, the following global configuration command changes the QSFP mode from 40G to 4x10G (default). When set to false the command reverts the default QSFP mode back to 40G.", - "title": "Transceiver Qsfp Default Mode Channelized" + "title": "Transceiver Qsfp Default Mode 4X10" }, "tunnel_interfaces": { "type": "array", diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml index 134c588fda9..1185a27c29a 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml @@ -14056,7 +14056,7 @@ keys: log: type: bool description: Only supported when action is set to drop - transceiver_qsfp_default_mode_channelized: + transceiver_qsfp_default_mode_4x10: type: bool default: true description: On all front panel ports which support this feature, the following diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml index 8185ba755ff..fc0fb051c87 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/transceiver_qsfp_default_mode_channelized.schema.yml @@ -6,7 +6,7 @@ # Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters. type: dict keys: - transceiver_qsfp_default_mode_channelized: + transceiver_qsfp_default_mode_4x10: type: bool default: true description: | From d3853ec60732afdc6aa08af98c0674f94b9ae82c Mon Sep 17 00:00:00 2001 From: Carl Buchmann Date: Fri, 12 Jan 2024 13:32:21 -0500 Subject: [PATCH 05/10] update template --- .../templates/eos/transceiver-qsfp-default-mode.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/transceiver-qsfp-default-mode.j2 b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/transceiver-qsfp-default-mode.j2 index 948ca82683e..ed7b354fd4a 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/transceiver-qsfp-default-mode.j2 +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/transceiver-qsfp-default-mode.j2 @@ -5,7 +5,7 @@ #} {# eos - transceiver qsfp default mode #} {# cannot be disabled in current EOS releases #} -{% if transceiver_qsfp_default_mode_channelized | arista.avd.default(generate_default_config, true) %} +{% if transceiver_qsfp_default_mode_4x10 | arista.avd.default(generate_default_config, true) %} ! transceiver qsfp default-mode 4x10G {% endif %} From bfb7bcbbb803bad20da480616e66c9d3e8f8623b Mon Sep 17 00:00:00 2001 From: Carl Buchmann Date: Tue, 16 Jan 2024 08:51:44 -0500 Subject: [PATCH 06/10] update molecule test as per review --- .../transceiver_qsfp_default_mode_4x10.md | 34 +++++++++++++++++++ .../configs/generate-default-config.cfg | 2 ++ .../transceiver_qsfp_default_mode_4x10.cfg | 13 +++++++ .../host_vars/generate-default-config.yml | 1 - .../transceiver_qsfp_default_mode_4x10.yml | 1 + .../eos_cli_config_gen/inventory/hosts.ini | 1 + 6 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10.md create mode 100644 ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/transceiver_qsfp_default_mode_4x10.cfg create mode 100644 ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/transceiver_qsfp_default_mode_4x10.yml diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10.md new file mode 100644 index 00000000000..bbaa37d2fbd --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10.md @@ -0,0 +1,34 @@ +# transceiver_qsfp_default_mode_4x10 + +## Table of Contents + +- [Management](#management) + - [Management Interfaces](#management-interfaces) + +## Management + +### Management Interfaces + +#### Management Interfaces Summary + +##### IPv4 + +| Management Interface | description | Type | VRF | IP Address | Gateway | +| -------------------- | ----------- | ---- | --- | ---------- | ------- | +| Management1 | oob_management | oob | MGMT | 10.73.255.122/24 | 10.73.255.2 | + +##### IPv6 + +| Management Interface | description | Type | VRF | IPv6 Address | IPv6 Gateway | +| -------------------- | ----------- | ---- | --- | ------------ | ------------ | +| Management1 | oob_management | oob | MGMT | - | - | + +#### Management Interfaces Device Configuration + +```eos +! +interface Management1 + description oob_management + vrf MGMT + ip address 10.73.255.122/24 +``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/generate-default-config.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/generate-default-config.cfg index 8956426177d..558e9b71bb0 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/generate-default-config.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/generate-default-config.cfg @@ -1,5 +1,7 @@ !RANCID-CONTENT-TYPE: arista ! +transceiver qsfp default-mode 4x10G +! hostname generate-default-config ! no enable password diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/transceiver_qsfp_default_mode_4x10.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/transceiver_qsfp_default_mode_4x10.cfg new file mode 100644 index 00000000000..4b0ae80c17b --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/transceiver_qsfp_default_mode_4x10.cfg @@ -0,0 +1,13 @@ +!RANCID-CONTENT-TYPE: arista +! +hostname transceiver_qsfp_default_mode_4x10 +! +no enable password +no aaa root +! +interface Management1 + description oob_management + vrf MGMT + ip address 10.73.255.122/24 +! +end diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml index f99a5d1cdb3..5a93dd6c786 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml @@ -1,4 +1,3 @@ generate_default_config: true -transceiver_qsfp_default_mode_4x10: false #Override config inherited from all.yml management_interfaces: null diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/transceiver_qsfp_default_mode_4x10.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/transceiver_qsfp_default_mode_4x10.yml new file mode 100644 index 00000000000..5ff2863cc24 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/transceiver_qsfp_default_mode_4x10.yml @@ -0,0 +1 @@ +transceiver_qsfp_default_mode_4x10: false diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini index c58bd13820e..6042490d317 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini @@ -166,6 +166,7 @@ terminattr-prem terminattr-prem-no-ingestkey terminattr-prem-disableaaa traffic-policies +transceiver_qsfp_default_mode_4x10 tunnel-interfaces unsupported-transceiver vlan-interfaces From 9d78a71f03c5d0d4b870a2e12168e889c6be0b61 Mon Sep 17 00:00:00 2001 From: Carl Buchmann Date: Tue, 16 Jan 2024 08:53:18 -0500 Subject: [PATCH 07/10] update based on review --- .../intended/configs/generate-default-config.cfg | 11 +---------- .../inventory/host_vars/generate-default-config.yml | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/generate-default-config.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/generate-default-config.cfg index 558e9b71bb0..8b137891791 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/generate-default-config.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/generate-default-config.cfg @@ -1,10 +1 @@ -!RANCID-CONTENT-TYPE: arista -! -transceiver qsfp default-mode 4x10G -! -hostname generate-default-config -! -no enable password -no aaa root -! -end + diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml index 5a93dd6c786..ea47e2e0495 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/generate-default-config.yml @@ -1,3 +1,3 @@ -generate_default_config: true +generate_default_config: false #Override config inherited from all.yml management_interfaces: null From 9bb6a812a01d6988fd17fcf4e0ca305566058df2 Mon Sep 17 00:00:00 2001 From: Carl Buchmann Date: Tue, 16 Jan 2024 08:55:26 -0500 Subject: [PATCH 08/10] rename scenario host --- ...mode_4x10.md => transceiver_qsfp_default_mode_4x10_false.md} | 2 +- ...de_4x10.cfg => transceiver_qsfp_default_mode_4x10_false.cfg} | 2 +- ...de_4x10.yml => transceiver_qsfp_default_mode_4x10_false.yml} | 0 .../arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/{transceiver_qsfp_default_mode_4x10.md => transceiver_qsfp_default_mode_4x10_false.md} (94%) rename ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/{transceiver_qsfp_default_mode_4x10.cfg => transceiver_qsfp_default_mode_4x10_false.cfg} (76%) rename ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/{transceiver_qsfp_default_mode_4x10.yml => transceiver_qsfp_default_mode_4x10_false.yml} (100%) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10_false.md similarity index 94% rename from ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10.md rename to ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10_false.md index bbaa37d2fbd..6f2057ec4f5 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10_false.md @@ -1,4 +1,4 @@ -# transceiver_qsfp_default_mode_4x10 +# transceiver_qsfp_default_mode_4x10_false ## Table of Contents diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/transceiver_qsfp_default_mode_4x10.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/transceiver_qsfp_default_mode_4x10_false.cfg similarity index 76% rename from ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/transceiver_qsfp_default_mode_4x10.cfg rename to ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/transceiver_qsfp_default_mode_4x10_false.cfg index 4b0ae80c17b..e0889699b7f 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/transceiver_qsfp_default_mode_4x10.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/transceiver_qsfp_default_mode_4x10_false.cfg @@ -1,6 +1,6 @@ !RANCID-CONTENT-TYPE: arista ! -hostname transceiver_qsfp_default_mode_4x10 +hostname transceiver_qsfp_default_mode_4x10_false ! no enable password no aaa root diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/transceiver_qsfp_default_mode_4x10.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/transceiver_qsfp_default_mode_4x10_false.yml similarity index 100% rename from ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/transceiver_qsfp_default_mode_4x10.yml rename to ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/transceiver_qsfp_default_mode_4x10_false.yml diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini index 6042490d317..3c4587bc07b 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini @@ -166,7 +166,7 @@ terminattr-prem terminattr-prem-no-ingestkey terminattr-prem-disableaaa traffic-policies -transceiver_qsfp_default_mode_4x10 +transceiver_qsfp_default_mode_4x10_false tunnel-interfaces unsupported-transceiver vlan-interfaces From 9339a7436d7b8600f93e7e53fa5a6db325744bb5 Mon Sep 17 00:00:00 2001 From: Claus Holbech Date: Tue, 16 Jan 2024 19:27:28 +0100 Subject: [PATCH 09/10] Update ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10_false.md --- .../devices/transceiver_qsfp_default_mode_4x10_false.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10_false.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10_false.md index 6f2057ec4f5..cf0daafb505 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10_false.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10_false.md @@ -13,7 +13,7 @@ ##### IPv4 -| Management Interface | description | Type | VRF | IP Address | Gateway | +| Management Interface | Description | Type | VRF | IP Address | Gateway | | -------------------- | ----------- | ---- | --- | ---------- | ------- | | Management1 | oob_management | oob | MGMT | 10.73.255.122/24 | 10.73.255.2 | From 395cc5f8d97088939323691ef7c2ed9abe6f31c8 Mon Sep 17 00:00:00 2001 From: Claus Holbech Date: Thu, 18 Jan 2024 18:12:22 +0100 Subject: [PATCH 10/10] Update ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10_false.md --- .../devices/transceiver_qsfp_default_mode_4x10_false.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10_false.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10_false.md index cf0daafb505..0f0d40f4182 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10_false.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/transceiver_qsfp_default_mode_4x10_false.md @@ -19,7 +19,7 @@ ##### IPv6 -| Management Interface | description | Type | VRF | IPv6 Address | IPv6 Gateway | +| Management Interface | Description | Type | VRF | IPv6 Address | IPv6 Gateway | | -------------------- | ----------- | ---- | --- | ------------ | ------------ | | Management1 | oob_management | oob | MGMT | - | - |