Skip to content

Commit

Permalink
Various fixes to address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
ClausHolbechArista committed Nov 13, 2024
1 parent eccd1ed commit 1ae9597
Show file tree
Hide file tree
Showing 22 changed files with 124 additions and 102 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ interface Loopback1
no shutdown
ip address 192.168.254.101/32
!
interface Management1
description OOB_MANAGEMENT
no shutdown
vrf MGMT
ip address 192.168.0.103/24
!
interface Vxlan1
description host1_VTEP
vxlan source-interface Loopback1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@ transceiver_qsfp_default_mode_4x10: true
vrfs:
- name: MGMT
ip_routing: false
management_interfaces:
- name: Management1
description: OOB_MANAGEMENT
shutdown: false
vrf: MGMT
ip_address: 192.168.0.103/24
type: oob
management_api_http:
enable_vrfs:
- name: MGMT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ l3leaf:
nodes:
- name: host1
id: 5
mgmt_ip: 192.168.0.103/24
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ ethernet_interfaces:
peer_type: server
description: Interface description server_OLD_SW-1/2_ENDPOINT_PORT1
shutdown: false
poe: {}
channel_group:
id: 1
mode: active
Expand All @@ -41,7 +40,6 @@ ethernet_interfaces:
peer_type: server
description: Interface description server_OLD_SW-1/2_ENDPOINT_PORT2
shutdown: false
poe: {}
channel_group:
id: 1
mode: active
Expand All @@ -51,7 +49,6 @@ ethernet_interfaces:
peer_type: server
description: SERVER_OLD_SW-1/3_ENDPOINT_PORT
shutdown: false
poe: {}
channel_group:
id: 3
mode: active
Expand All @@ -67,7 +64,6 @@ ethernet_interfaces:
peer_type: server
description: SERVER_OLD_SW-1/5
shutdown: false
poe: {}
channel_group:
id: 5
mode: active
Expand All @@ -76,7 +72,6 @@ ethernet_interfaces:
peer_type: server
description: SERVER_OLD_SW-1/5
shutdown: false
poe: {}
channel_group:
id: 5
mode: active
Expand All @@ -85,7 +80,6 @@ ethernet_interfaces:
peer_type: server
description: PHYSICAL_PORT_DESCRIPTION
shutdown: false
poe: {}
channel_group:
id: 7
mode: active
Expand All @@ -94,7 +88,6 @@ ethernet_interfaces:
peer_type: server
description: PHYSICAL_PORT_DESCRIPTION
shutdown: false
poe: {}
channel_group:
id: 7
mode: active
Expand All @@ -110,7 +103,6 @@ ethernet_interfaces:
peer_type: server
description: PHYSICAL_PORT_DESCRIPTION_1
shutdown: false
poe: {}
channel_group:
id: 10
mode: active
Expand All @@ -119,7 +111,6 @@ ethernet_interfaces:
peer_type: server
description: PHYSICAL_PORT_DESCRIPTION_2
shutdown: false
poe: {}
channel_group:
id: 10
mode: active
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 3 additions & 17 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,26 +1,12 @@
[tool.black]
# Black has been replaced with Ruff.
# This section should be removed later, but kept here to avoid IDE extensions from messing up the code.
line-length = 160

force-exclude = '''
/(
python-avd/pyavd/_cv/api/\.\*
| python-avd/pyavd/_eos_designs/_schema/__init__\.py
| python-avd/pyavd/_eos_cli_config_gen/_schema/__init__\.py
)/
'''
force-exclude = '''.*'''

[tool.isort]
# Isort has been replaced with Ruff.
# This section should be removed later, but kept here to avoid IDE extensions from messing up the code.
extend_skip_glob = [
"python-avd/pyavd/_cv/api/**/*"
skip_glob = [
"**/*"
]
profile = "black"
skip_gitignore = true
line_length = 160
known_first_party = ["pyavd", "schema_tools"]

[tool.ruff]
line-length = 160
Expand Down
2 changes: 1 addition & 1 deletion python-avd/pyavd/_eos_designs/eos_designs_facts/uplinks.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class UplinksMixin:
@cached_property
def max_parallel_uplinks(self: EosDesignsFacts) -> int:
"""Exposed in avd_switch_facts."""
return self.shared_utils.max_parallel_uplinks
return self.shared_utils.node_config.max_parallel_uplinks

@cached_property
def max_uplink_switches(self: EosDesignsFacts) -> int:
Expand Down
Loading

0 comments on commit 1ae9597

Please sign in to comment.