Skip to content

Commit

Permalink
Merge branch 'devel' into port-channel
Browse files Browse the repository at this point in the history
  • Loading branch information
carlbuchmann authored Aug 2, 2024
2 parents 744b23f + 339c855 commit c76ad20
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 140 deletions.
4 changes: 2 additions & 2 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,8 +74,8 @@ 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 |
| port_channel_interfaces.esi | port_channel_interfaces.evpn_ethernet_segment.identifier |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
- [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)
Expand Down Expand Up @@ -164,28 +163,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
Original file line number Diff line number Diff line change
Expand Up @@ -537,14 +537,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.

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

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
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,6 @@
{% if management_api_gnmi is arista.avd.defined %}
!
management api gnmi
{% for vrf in management_api_gnmi.enable_vrfs | arista.avd.natural_sort %}
{% if vrf.name == 'default' %}
transport grpc default
{% else %}
transport grpc {{ vrf.name }}
{% if vrf.access_group is arista.avd.defined %}
ip access-group {{ vrf.access_group }}
{% endif %}
vrf {{ vrf.name }}
{% endif %}
{% endfor %}
{% if management_api_gnmi.octa is defined %}
provider eos-native
{% endif %}
{% if management_api_gnmi.transport is arista.avd.defined %}
{% if management_api_gnmi.transport.grpc is arista.avd.defined %}
{% for transport in management_api_gnmi.transport.grpc %}
Expand Down

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

Original file line number Diff line number Diff line change
Expand Up @@ -117,31 +117,14 @@ keys:
enable_vrfs:
type: list
deprecation:
removed: true
warning: true
new_key: transport.grpc
remove_in_version: "5.0.0"
primary_key: name
convert_types:
- dict
description: |
These should not be mixed with the new keys above.
items:
type: dict
keys:
name:
type: str
description: VRF name.
convert_types:
- int
access_group:
type: str
description: Standard IPv4 ACL name.
octa:
type: dict
deprecation:
warning: true
removed: true
new_key: provider
remove_in_version: "5.0.0"
description: |
These should not be mixed with the new keys above.
Octa activates `eos-native` provider and it is the only provider currently supported by EOS.

0 comments on commit c76ad20

Please sign in to comment.