Skip to content

Commit bfc6337

Browse files
authored
Feat(eos_cli_config_gen): Added the support for 8a type bgp password (#6182)
1 parent d5c5bdf commit bfc6337

File tree

10 files changed

+108
-6
lines changed

10 files changed

+108
-6
lines changed

ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/documentation/devices/host1.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9210,7 +9210,7 @@ router bgp 65101
92109210
neighbor MPLS-IBGP-PEERS peer group
92119211
neighbor MPLS-IBGP-PEERS remote-as 65000
92129212
neighbor MPLS-IBGP-PEERS local-as 65000 no-prepend replace-as
9213-
neighbor MPLS-IBGP-PEERS password 7 <removed>
9213+
neighbor MPLS-IBGP-PEERS password 8a <removed>
92149214
neighbor MPLS-IBGP-PEERS send-community
92159215
neighbor MPLS-IBGP-PEERS maximum-routes 0
92169216
neighbor MULTIPLE-COMMUNITY peer group
@@ -9356,6 +9356,7 @@ router bgp 65101
93569356
neighbor 192.168.255.3 missing-policy address-family all direction in action deny
93579357
neighbor 192.168.255.4 remote-as 65004
93589358
neighbor 192.168.255.4 send-community
9359+
neighbor 192.168.255.11 password 8a <removed>
93599360
neighbor 192.168.255.21 peer group EVPN-OVERLAY-PEERS
93609361
no neighbor 192.168.255.21 rib-in pre-policy retain
93619362
neighbor 192.168.255.21 missing-policy address-family all direction out action deny-in-out
@@ -9982,6 +9983,7 @@ router bgp 65101
99829983
!
99839984
vrf NHP-PEER1
99849985
neighbor 11.11.11.0 next-hop-peer
9986+
neighbor 11.11.11.0 password 8a <removed>
99859987
!
99869988
vrf RED-C1
99879989
rd 1.0.1.1:102

ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/intended/configs/host1.cfg

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5458,7 +5458,7 @@ router bgp 65101
54585458
neighbor MPLS-IBGP-PEERS peer group
54595459
neighbor MPLS-IBGP-PEERS remote-as 65000
54605460
neighbor MPLS-IBGP-PEERS local-as 65000 no-prepend replace-as
5461-
neighbor MPLS-IBGP-PEERS password 7 mWV4B6WpLCfOTyKATLWuBg==
5461+
neighbor MPLS-IBGP-PEERS password 8a $BYk2Sjahe+D9T7uDgIItSA==$JTw5JOAPcYEo0O2hsvsxFQ==$C7wmpXOo
54625462
neighbor MPLS-IBGP-PEERS send-community
54635463
neighbor MPLS-IBGP-PEERS maximum-routes 0
54645464
neighbor MULTIPLE-COMMUNITY peer group
@@ -5604,6 +5604,7 @@ router bgp 65101
56045604
neighbor 192.168.255.3 missing-policy address-family all direction in action deny
56055605
neighbor 192.168.255.4 remote-as 65004
56065606
neighbor 192.168.255.4 send-community
5607+
neighbor 192.168.255.11 password 8a $BYk2Sjahe+D9T7uDgIItSA==$JTw5JOAPcYEo0O2hsvsxFQ==$C7wmpXOo
56075608
neighbor 192.168.255.21 peer group EVPN-OVERLAY-PEERS
56085609
no neighbor 192.168.255.21 rib-in pre-policy retain
56095610
neighbor 192.168.255.21 missing-policy address-family all direction out action deny-in-out
@@ -6230,6 +6231,7 @@ router bgp 65101
62306231
!
62316232
vrf NHP-PEER1
62326233
neighbor 11.11.11.0 next-hop-peer
6234+
neighbor 11.11.11.0 password 8a $BYk2Sjahe+D9T7uDgIItSA==$JTw5JOAPcYEo0O2hsvsxFQ==$C7wmpXOo
62336235
!
62346236
vrf RED-C1
62356237
rd 1.0.1.1:102

ansible_collections/arista/avd/extensions/molecule/eos_cli_config_gen/inventory/host_vars/host1/router-bgp.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ router_bgp:
136136
type: "vpn-ipv4, vpn-ipv6"
137137
remote_as: 65000
138138
local_as: 65000
139-
password: "mWV4B6WpLCfOTyKATLWuBg=="
139+
password: "$BYk2Sjahe+D9T7uDgIItSA==$JTw5JOAPcYEo0O2hsvsxFQ==$C7wmpXOo"
140+
password_type: 8a
140141
send_community: all
141142
maximum_routes: 0
142143
- name: IPv4-UNDERLAY-PEERS
@@ -1310,6 +1311,8 @@ router_bgp:
13101311
shutdown: true
13111312
- ip_address: 192.168.251.2
13121313
- ip_address: 192.168.255.11
1314+
password: $BYk2Sjahe+D9T7uDgIItSA==$JTw5JOAPcYEo0O2hsvsxFQ==$C7wmpXOo
1315+
password_type: 8a
13131316
- ip_address: 172.31.255.0
13141317
peer_group: IPv4-UNDERLAY-PEERS
13151318
password: viDjZCwoPIoXECb3hxWioA==
@@ -1965,6 +1968,8 @@ router_bgp:
19651968
neighbors:
19661969
- ip_address: 11.11.11.0
19671970
next_hop_peer: true
1971+
password: $BYk2Sjahe+D9T7uDgIItSA==$JTw5JOAPcYEo0O2hsvsxFQ==$C7wmpXOo
1972+
password_type: 8a
19681973
- name: BLUE-C1
19691974
rd: 1.0.1.1:101
19701975
bgp:

ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ansible_collections/arista/avd/roles/eos_designs/docs/tables/network-services-vrfs-bgp-settings.md

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ router bgp {{ router_bgp.as }}
229229
neighbor {{ peer_group.name }} route-map {{ peer_group.route_map_out }} out
230230
{% endif %}
231231
{% if peer_group.password is arista.avd.defined %}
232-
neighbor {{ peer_group.name }} password 7 {{ peer_group.password | arista.avd.hide_passwords(hide_passwords) }}
232+
neighbor {{ peer_group.name }} password {{ peer_group.password_type | arista.avd.default("7") }} {{ peer_group.password | arista.avd.hide_passwords(hide_passwords) }}
233233
{% endif %}
234234
{% if peer_group.shared_secret.profile is arista.avd.defined and peer_group.shared_secret.hash_algorithm is arista.avd.defined %}
235235
neighbor {{ peer_group.name }} password shared-secret profile {{ peer_group.shared_secret.profile }} algorithm {{ peer_group.shared_secret.hash_algorithm }}
@@ -408,7 +408,7 @@ router bgp {{ router_bgp.as }}
408408
neighbor {{ neighbor.ip_address }} password shared-secret profile {{ neighbor.shared_secret.profile }} algorithm {{ neighbor.shared_secret.hash_algorithm }}
409409
{% endif %}
410410
{% if neighbor.password is arista.avd.defined %}
411-
neighbor {{ neighbor.ip_address }} password 7 {{ neighbor.password | arista.avd.hide_passwords(hide_passwords) }}
411+
neighbor {{ neighbor.ip_address }} password {{ neighbor.password_type | arista.avd.default("7") }} {{ neighbor.password | arista.avd.hide_passwords(hide_passwords) }}
412412
{% endif %}
413413
{% if neighbor.default_originate.enabled is arista.avd.defined(true) %}
414414
{% set default_originate_cli = "neighbor " ~ neighbor.ip_address ~ " default-originate" %}
@@ -2902,7 +2902,7 @@ router bgp {{ router_bgp.as }}
29022902
neighbor {{ neighbor.ip_address }} route-map {{ neighbor.route_map_out }} out
29032903
{% endif %}
29042904
{% if neighbor.password is arista.avd.defined %}
2905-
neighbor {{ neighbor.ip_address }} password 7 {{ neighbor.password | arista.avd.hide_passwords(hide_passwords) }}
2905+
neighbor {{ neighbor.ip_address }} password {{ neighbor.password_type | arista.avd.default("7") }} {{ neighbor.password | arista.avd.hide_passwords(hide_passwords) }}
29062906
{% endif %}
29072907
{% if neighbor.default_originate is arista.avd.defined %}
29082908
{% set neighbor_default_originate_cli = "neighbor " ~ neighbor.ip_address ~ " default-originate" %}

python-avd/pyavd/_eos_cli_config_gen/schema/__init__.py

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)