Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix(eos_designs): Incorrect type for ospf.area in network services keys #2998

Merged
merged 8 commits into from Jul 7, 2023
Merged

Fix(eos_designs): Incorrect type for ospf.area in network services keys #2998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4c526f8
Fix(eos_designs): Incorrect type for ospf.area in network services keys
carlbuchmann Jun 21, 2023
b14217a
update CI tests
carlbuchmann Jun 22, 2023
2d1faf1
Update ansible_collections/arista/avd/roles/eos_designs/schemas/schem…
carlbuchmann Jun 23, 2023
d395a0d
update schema
carlbuchmann Jun 23, 2023
1a34246
revert change to default value
carlbuchmann Jun 23, 2023
8e69496
update CI
carlbuchmann Jun 23, 2023
1616aaa
Merge branch 'devel' into fix-2996
carlbuchmann Jul 6, 2023
43f419c
Merge branch 'devel' into fix-2996
carlbuchmann Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...d/roles/eos_designs/docs/tables/network-services-vrfs-l3-interfaces-settings.md
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ospf</samp>](## "&lt;network_services_keys.name&gt;.[].vrfs.[].l3_interfaces.[].ospf") | Dictionary | | | | OSPF interface configuration. |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;enabled</samp>](## "&lt;network_services_keys.name&gt;.[].vrfs.[].l3_interfaces.[].ospf.enabled") | Boolean | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;point_to_point</samp>](## "&lt;network_services_keys.name&gt;.[].vrfs.[].l3_interfaces.[].ospf.point_to_point") | Boolean | | `False` | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;area</samp>](## "&lt;network_services_keys.name&gt;.[].vrfs.[].l3_interfaces.[].ospf.area") | Integer | | `0` | | OSPF area id. |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;area</samp>](## "&lt;network_services_keys.name&gt;.[].vrfs.[].l3_interfaces.[].ospf.area") | String | | `0` | | OSPF area ID. |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;cost</samp>](## "&lt;network_services_keys.name&gt;.[].vrfs.[].l3_interfaces.[].ospf.cost") | Integer | | | | OSPF link cost. |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;authentication</samp>](## "&lt;network_services_keys.name&gt;.[].vrfs.[].l3_interfaces.[].ospf.authentication") | String | | | Valid Values:<br>- simple<br>- message-digest | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;simple_auth_key</samp>](## "&lt;network_services_keys.name&gt;.[].vrfs.[].l3_interfaces.[].ospf.simple_auth_key") | String | | | | Password used with simple authentication. |
Expand Down Expand Up @@ -60,7 +60,7 @@
ospf:
enabled: <bool>
point_to_point: <bool>
area: <int>
area: <str>
cost: <int>
authentication: <str>
simple_auth_key: <str>
Expand Down
2 changes: 1 addition & 1 deletion ...tions/arista/avd/roles/eos_designs/python_modules/network_services/ethernet_interfaces.py
View file
Open in desktop
Expand Up @@ -88,7 +88,7 @@ def ethernet_interfaces(self) -> list | None:
interface["vrf"] = vrf["name"]

if get(l3_interface, "ospf.enabled") is True and get(vrf, "ospf.enabled") is True:
interface["ospf_area"] = l3_interface["ospf"].get("area", 0)
interface["ospf_area"] = l3_interface["ospf"].get("area", "0")
interface["ospf_network_point_to_point"] = l3_interface["ospf"].get("point_to_point", False)
interface["ospf_cost"] = l3_interface["ospf"].get("cost")
ospf_authentication = l3_interface["ospf"].get("authentication")
Expand Down
2 changes: 1 addition & 1 deletion ...llections/arista/avd/roles/eos_designs/python_modules/network_services/vlan_interfaces.py
View file
Open in desktop
Expand Up @@ -151,7 +151,7 @@ def _check_virtual_router_mac_address(vlan_interface_config: dict, variables: li
vlan_interface_config["ip_helpers"] = ip_helpers

if get(svi, "ospf.enabled") is True and get(vrf, "ospf.enabled") is True:
vlan_interface_config["ospf_area"] = svi["ospf"].get("area", 0)
carlbuchmann marked this conversation as resolved.
Show resolved Hide resolved
vlan_interface_config["ospf_area"] = svi["ospf"].get("area", "0")
vlan_interface_config["ospf_network_point_to_point"] = svi["ospf"].get("point_to_point", False)
vlan_interface_config["ospf_cost"] = svi["ospf"].get("cost")
ospf_authentication = svi["ospf"].get("authentication")
Expand Down
8 changes: 4 additions & 4 deletions ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.yml
View file
Open in desktop
Expand Up @@ -4049,11 +4049,11 @@ $defs:
type: bool
default: false
area:
type: int
type: str
convert_types:
- str
description: OSPF area id.
default: 0
- int
description: OSPF area ID.
default: '0'
cost:
type: int
convert_types:
Expand Down
8 changes: 4 additions & 4 deletions ...ns/arista/avd/roles/eos_designs/schemas/schema_fragments/defs_network_services.schema.yml
View file
Open in desktop
Expand Up @@ -556,11 +556,11 @@ $defs:
type: bool
default: false
area:
type: int
type: str
convert_types:
- str
description: OSPF area id.
default: 0
- int
description: OSPF area ID.
default: "0"
cost:
type: int
convert_types:
Expand Down