Skip to content

Commit

Permalink
Merge branch 'devel' into ruff
Browse files Browse the repository at this point in the history
  • Loading branch information
gmuloc authored Aug 2, 2024
2 parents 26a3caf + 3ffe991 commit 57e9285
Show file tree
Hide file tree
Showing 26 changed files with 76 additions and 372 deletions.
10 changes: 5 additions & 5 deletions ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ The following data model keys have been removed from `eos_cli_config_gen` in v5.
| event_handlers.action_type | event_handlers.actions |
| event_handlers.regex | event_handlers.trigger_on_logging.regex |
| flow_trackings | flow_tracking |
| old key 4.1(management_api_gnmi) | new key(TODO) |
| old key 4.2(management_api_gnmi) | new key(TODO) |
| management_api_gnmi.enable_vrfs | management_api_gnmi.transport.grpc |
| management_api_gnmi.octa | management_api_gnmi.provider |
| management_security.entropy_source | management_security.entropy_sources |
| name_server | ip_name_servers |
| old key 7.1(port_channel_interfaces) | new key(TODO) |
| old key 7.2(port_channel_interfaces) | new key(TODO) |
| old key 8(radius_servers) | new key(TODO) |
| port_channel_interfaces.esi | port_channel_interfaces.evpn_ethernet_segment.identifier |
| port_channel_interfaces.rt | port_channel_interfaces.evpn_ethernet_segment.route_target |
| radius_servers | radius_server.hosts |
| router_bgp.peer_groups[].peer_filter | router_bgp.listen_ranges[].peer_filter |
| router_bgp.peer_groups[].bgp_listen_range_prefix | router_bgp.listen_ranges[].prefix |
| router_bgp.address_family_ipv4.peer_groups[].next_hop.address_family_ipv6_originate | router_bgp.address_family_ipv4.peer_groups[].next_hop.address_family_ipv6 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ interface Management1

- Attribute 32 is included in access requests using format 'myformat'

#### RADIUS Server Hosts

| VRF | RADIUS Servers | TLS | SSL Profile | Timeout | Retransmit |
| --- | -------------- | --- | ----------- | ------- | ---------- |

#### RADIUS Server Device Configuration

```eos
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
---
### Radius Server
# New data model to replace "radius_servers"
radius_server:
attribute_32_include_in_access_req:
hostname: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@
- [Management Interfaces](#management-interfaces)
- [Domain Lookup](#domain-lookup)
- [Management SSH](#management-ssh)
- [Management API gNMI](#management-api-gnmi)
- [Management API HTTP](#management-api-http)
- [Authentication](#authentication)
- [Local Users](#local-users)
- [RADIUS Server](#radius-server)
- [Monitoring](#monitoring)
- [TerminAttr Daemon](#terminattr-daemon)
- [Custom daemons](#custom-daemons)
Expand Down Expand Up @@ -164,28 +162,6 @@ management ssh
no shutdown
```

### Management API gNMI

#### Management API gNMI Summary

| VRF with gNMI | OCTA |
| ------------- | ---- |
| MGMT | enabled |
| MONITORING | enabled |

#### Management API gNMI Device Configuration

```eos
!
management api gnmi
transport grpc MGMT
ip access-group ACL-GNMI
vrf MGMT
transport grpc MONITORING
vrf MONITORING
provider eos-native
```

### Management API HTTP

#### Management API HTTP Summary
Expand Down Expand Up @@ -229,25 +205,6 @@ management api http-commands
username admin privilege 15 role network-admin nopassword
```

### RADIUS Server

#### RADIUS Server Hosts

| VRF | RADIUS Servers | TLS | SSL Profile | Timeout | Retransmit |
| --- | -------------- | --- | ----------- | ------- | ---------- |
| mgt | 10.10.10.157 | - | - | - | - |
| default | 10.10.10.249 | - | - | - | - |
| default | 10.10.10.158 | - | - | - | - |

#### RADIUS Server Device Configuration

```eos
!
radius-server host 10.10.10.157 vrf mgt key 7 <removed>
radius-server host 10.10.10.249 key 7 <removed>
radius-server host 10.10.10.158 key 7 <removed>
```

## Monitoring

### TerminAttr Daemon
Expand Down Expand Up @@ -598,7 +555,7 @@ interface Ethernet47

| Interface | Description | Type | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI |
| --------- | ----------- | ---- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- |
| Port-Channel1 | SRV01_bond0 | switched | trunk | 2-3000 | - | - | - | - | - | 0000:0000:0404:0404:0303 |
| Port-Channel1 | SRV01_bond0 | switched | trunk | 2-3000 | - | - | - | - | - | - |
| Port-Channel51 | ipv6_prefix | switched | trunk | 1-500 | - | - | - | - | - | - |

##### Flexible Encapsulation Interfaces
Expand All @@ -616,9 +573,6 @@ interface Port-Channel1
switchport
switchport trunk allowed vlan 2-3000
switchport mode trunk
evpn ethernet-segment
identifier 0000:0000:0404:0404:0303
route-target import 04:04:03:03:02:02
lacp system-id 0303.0202.0101
!
interface Port-Channel2
Expand All @@ -630,9 +584,6 @@ interface Port-Channel2.1000
vlan id 1000
encapsulation vlan
client dot1q 100 network client
evpn ethernet-segment
identifier 0000:0000:0303:0202:0101
route-target import 03:03:02:02:01:01
lacp system-id 0303.0202.0101
!
interface Port-Channel51
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ hostname host1
ip domain lookup source-interface Loopback0
ip domain lookup vrf mgt source-interface Management0
!
radius-server host 10.10.10.157 vrf mgt key 7 071B245F5A
radius-server host 10.10.10.249 key 7 071B245F5A
radius-server host 10.10.10.158 key 7 071B245F5A
!
sflow vrf MGMT destination 10.6.75.59
sflow vrf MGMT destination 10.6.75.62 123
sflow vrf MGMT source-interface Ethernet3
Expand Down Expand Up @@ -125,9 +121,6 @@ interface Port-Channel1
switchport
switchport trunk allowed vlan 2-3000
switchport mode trunk
evpn ethernet-segment
identifier 0000:0000:0404:0404:0303
route-target import 04:04:03:03:02:02
lacp system-id 0303.0202.0101
!
interface Port-Channel2
Expand All @@ -139,9 +132,6 @@ interface Port-Channel2.1000
vlan id 1000
encapsulation vlan
client dot1q 100 network client
evpn ethernet-segment
identifier 0000:0000:0303:0202:0101
route-target import 03:03:02:02:01:01
lacp system-id 0303.0202.0101
!
interface Port-Channel51
Expand Down Expand Up @@ -543,14 +533,6 @@ management api http-commands
no shutdown
ip access-group ACL-API
!
management api gnmi
transport grpc MGMT
ip access-group ACL-GNMI
vrf MGMT
transport grpc MONITORING
vrf MONITORING
provider eos-native
!
management ssh
!
vrf mgt
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@
# Testing port_channel_interfaces as dict of dict
# Dict type is deprecated in 4.0.0. To be removed in 5.0.0
port_channel_interfaces:
# Testing deprecated esi and rt variables on port-channel interfaces/subinterfaces
Port-Channel1:
description: SRV01_bond0
vlans: 2-3000
mode: trunk
esi: 0000:0000:0404:0404:0303
rt: 04:04:03:03:02:02
lacp_id: 0303.0202.0101

Port-Channel2:
Expand All @@ -26,8 +23,6 @@ port_channel_interfaces:
vlan: 100
network:
client: true
esi: 0000:0000:0303:0202:0101
rt: 03:03:02:02:01:01
lacp_id: 0303.0202.0101

Port-Channel51:
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@ roles/eos_cli_config_gen/docs/tables/ip-tacacs-source-interfaces.md
roles/eos_cli_config_gen/docs/tables/local-users.md
--8<--

### Radius server

--8<--
roles/eos_cli_config_gen/docs/tables/radius-server.md
--8<--

### Radius servers

--8<--
Expand Down

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

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

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

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
or tacacs_servers is arista.avd.defined
or ip_tacacs_source_interfaces is arista.avd.defined
or radius_server is arista.avd.defined
or radius_servers is arista.avd.defined
or ip_radius_source_interfaces is arista.avd.defined
or aaa_server_groups is arista.avd.defined
or aaa_authentication is arista.avd.defined
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,6 @@
### Management API gNMI

#### Management API gNMI Summary
{# legacy table view that will be deprecated in future releases #}
{% if management_api_gnmi.enable_vrfs is defined %}
{% if management_api_gnmi.octa is defined %}
{% set octa = 'enabled' %}
{% else %}
{% set octa = 'disabled' %}
{% endif %}

| VRF with gNMI | OCTA |
| ------------- | ---- |
{% for vrf in management_api_gnmi.enable_vrfs | arista.avd.natural_sort %}
| {{ vrf.name }} | {{ octa }} |
{% endfor %}
{% endif %}
{# new table view using the new flags #}
{% if management_api_gnmi.transport.grpc is arista.avd.defined %}

| Transport | SSL Profile | VRF | Notification Timestamp | ACL | Port |
Expand Down
Loading

0 comments on commit 57e9285

Please sign in to comment.