From c44bf4bcf2e8888545263f054eca7c1f67dab123 Mon Sep 17 00:00:00 2001 From: Laxmikant Chintakindi Date: Wed, 18 Sep 2024 16:44:19 +0530 Subject: [PATCH] Fixing inputs. --- .../devices/router-bgp-ipv4-labeled-unicast.md | 6 +++--- .../intended/configs/router-bgp-ipv4-labeled-unicast.cfg | 2 +- .../inventory/host_vars/router-bgp-ipv4-labeled-unicast.yml | 2 +- .../avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md | 4 ++-- .../pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 | 2 +- .../schema/eos_cli_config_gen.schema.yml | 2 +- .../schema/schema_fragments/router_bgp.schema.yml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-ipv4-labeled-unicast.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-ipv4-labeled-unicast.md index 741e5d88e38..bade1669056 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-ipv4-labeled-unicast.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-ipv4-labeled-unicast.md @@ -17,20 +17,20 @@ | Management Interface | Description | Type | VRF | IP Address | Gateway | | -------------------- | ----------- | ---- | --- | ---------- | ------- | -| Management1 | oob_management | oob | MGMT | 10.73.255.122/24 | 10.73.255.2 | +| 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 | - | - | +| Management1 | OOB_MANAGEMENT | oob | MGMT | - | - | #### Management Interfaces Device Configuration ```eos ! interface Management1 - description oob_management + 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/router-bgp-ipv4-labeled-unicast.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-ipv4-labeled-unicast.cfg index 8faf95ce029..8072b3198a1 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-ipv4-labeled-unicast.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-ipv4-labeled-unicast.cfg @@ -1,6 +1,6 @@ ! interface Management1 - description oob_management + description OOB_MANAGEMENT vrf MGMT ip address 10.73.255.122/24 ! diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-ipv4-labeled-unicast.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-ipv4-labeled-unicast.yml index 72472339a7b..912999844e5 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-ipv4-labeled-unicast.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-ipv4-labeled-unicast.yml @@ -16,7 +16,7 @@ router_bgp: include_community_list: true next_hop_unchanged: true next_hop_resolution_ribs: - - rib_type: "tunnel-rib colored" + - rib_type: "tunnel-rib-colored" - rib_type: "tunnel-rib" rib_name: "test-rib" - rib_type: "system-connected" diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md index 271bf1e675a..d5d99b72918 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md @@ -492,7 +492,7 @@ | [      - ip_address](## "router_bgp.address_family_ipv4_labeled_unicast.next_hops.[].ip_address") | String | Required, Unique | | | | | [        lfib_backup_ip_forwarding](## "router_bgp.address_family_ipv4_labeled_unicast.next_hops.[].lfib_backup_ip_forwarding") | Boolean | | | | | | [    next_hop_resolution_ribs](## "router_bgp.address_family_ipv4_labeled_unicast.next_hop_resolution_ribs") | List, items: Dictionary | | | Min Length: 1
Max Length: 3 | Specify the RIBs used to resolve next-hops. The order of this list determines the order of RIB lookups. | - | [      - rib_type](## "router_bgp.address_family_ipv4_labeled_unicast.next_hop_resolution_ribs.[].rib_type") | String | Required | | Valid Values:
- system-connected
- tunnel-rib colored
- tunnel-rib | Type of RIB. For 'tunnel-rib', use 'rib_name' to specify the name of the Tunnel-RIB to use. | + | [      - rib_type](## "router_bgp.address_family_ipv4_labeled_unicast.next_hop_resolution_ribs.[].rib_type") | String | Required | | Valid Values:
- system-connected
- tunnel-rib-colored
- tunnel-rib | Type of RIB. For 'tunnel-rib', use 'rib_name' to specify the name of the Tunnel-RIB to use. | | [        rib_name](## "router_bgp.address_family_ipv4_labeled_unicast.next_hop_resolution_ribs.[].rib_name") | String | | | | The name of the tunnel-rib to use when using 'tunnel-rib' type. | | [    tunnel_source_protocols](## "router_bgp.address_family_ipv4_labeled_unicast.tunnel_source_protocols") | List, items: Dictionary | | | Min Length: 1
Max Length: 2 | | | [      - protocol](## "router_bgp.address_family_ipv4_labeled_unicast.tunnel_source_protocols.[].protocol") | String | Required, Unique | | Valid Values:
- isis segment-routing
- ldp | | @@ -1978,7 +1978,7 @@ next_hop_resolution_ribs: # 1-3 items # Type of RIB. For 'tunnel-rib', use 'rib_name' to specify the name of the Tunnel-RIB to use. - - rib_type: + - rib_type: # The name of the tunnel-rib to use when using 'tunnel-rib' type. rib_name: diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 index efed723a474..8673c9a7a67 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 @@ -1202,7 +1202,7 @@ router bgp {{ router_bgp.as }} {% if router_bgp.address_family_ipv4_labeled_unicast.next_hop_resolution_ribs is arista.avd.defined %} {% set v4_bgp_lu_resolution_ribs = [] %} {% for rib in router_bgp.address_family_ipv4_labeled_unicast.next_hop_resolution_ribs %} -{% if rib.rib_type is arista.avd.defined("tunnel-rib colored") %} +{% if rib.rib_type is arista.avd.defined("tunnel-rib-colored") %} {% do v4_bgp_lu_resolution_ribs.append("tunnel-rib colored system-colored-tunnel-rib") %} {% elif rib.rib_type is arista.avd.defined("tunnel-rib") and rib.rib_name is arista.avd.defined() %} {% do v4_bgp_lu_resolution_ribs.append("tunnel-rib " ~ rib.rib_name) %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml index b8fa717391c..a3ff942d7b0 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml @@ -13584,7 +13584,7 @@ keys: required: true valid_values: - system-connected - - tunnel-rib colored + - tunnel-rib-colored - tunnel-rib description: Type of RIB. For 'tunnel-rib', use 'rib_name' to specify the name of the Tunnel-RIB to use. diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml index e12880e8804..7bd149b59fd 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml @@ -1788,7 +1788,7 @@ keys: required: true valid_values: - "system-connected" - - "tunnel-rib colored" + - "tunnel-rib-colored" - "tunnel-rib" description: "Type of RIB. For 'tunnel-rib', use 'rib_name' to specify the name of the Tunnel-RIB to use." rib_name: