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

[ios_bgp_global/ address_family] fix parsing of password_options while gathering password configuratin #1122

Merged
merged 2 commits into from
Oct 16, 2024
Merged

[ios_bgp_global/ address_family] fix parsing of password_options while gathering password configuratin #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30c29bd
fix parsing of password_options while gathering password configuratio…
KB-perByte Oct 6, 2024
526417a
Merge branch 'main' into fix_bgp_global_pass
KB-perByte Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelogs/fragments/bgp_global_render_pass.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
bugfixes:
- ios_bgp_global - fix parsing of password_options while gathering password configuration from appliance.
- ios_bgp_address_family - fix parsing of password_options while gathering password configuration from appliance.
4 changes: 2 additions & 2 deletions plugins/module_utils/network/ios/rm_templates/bgp_address_family.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1586,8 +1586,8 @@ def __init__(self, lines=None, module=None):
"getval": re.compile(
r"""
\s\sneighbor\s(?P<neighbor_address>\S+)\spassword
\s(?P<encryption>\d+)
(\s(?P<pass_key>.$))?
(\s(?P<encryption>\d+))
(\s(?P<pass_key>.+))?
$""",
re.VERBOSE,
),
Expand Down
2 changes: 1 addition & 1 deletion plugins/module_utils/network/ios/rm_templates/bgp_global.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1642,7 +1642,7 @@ def __init__(self, lines=None, module=None):
r"""
\sneighbor\s(?P<neighbor_address>\S+)\spassword
\s(?P<encryption>\d+)
(\s(?P<pass_key>.$))?
(\s(?P<pass_key>.+))?
$""",
re.VERBOSE,
),
Expand Down
9 changes: 8 additions & 1 deletion tests/unit/modules/network/ios/test_ios_bgp_global.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,7 @@ def test_ios_bgp_global_parsed(self):
timers bgp 100 200 150
redistribute connected metric 10
neighbor 192.0.2.1 remote-as 100
neighbor 192.0.2.1 password 7 DEQPITOP101395
neighbor 192.0.2.1 route-map test-route out
address-family ipv4
neighbor 192.0.2.28 activate
Expand All @@ -652,7 +653,13 @@ def test_ios_bgp_global_parsed(self):
{
"remote_as": "100",
"neighbor_address": "192.0.2.1",
"route_maps": [{"name": "test-route", "out": True}],
"route_maps": [
{"name": "test-route", "out": True},
],
"password_options": {
"encryption": 7,
"pass_key": "DEQPITOP101395",
},
},
],
}
Expand Down
Loading