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

Bug with commit confirmed / commit_message on EOS #322

Merged
merged 4 commits into from
Nov 14, 2023
Merged

Bug with commit confirmed / commit_message on EOS #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ee686d
commit_message not implemented on napalm EOS driver, causes error wit…
indy-independence Nov 1, 2023
aceacd6
Make if logic simpler
indy-independence Nov 2, 2023
137502f
Change documentation text for redundant_link to make it more understa…
indy-independence Nov 6, 2023
4dbb55c
changelog v1.5.1
indy-independence Nov 6, 2023
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
3 changes: 2 additions & 1 deletion docs/apiref/interfaces.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ Data can contain any of these optional keys:
- aggregate_id: Identifier for configuring LACP etc. Integer value.
Special value -1 means configure MLAG and use ID based on indexnum.
- bpdu_filter: bool defining STP BPDU feature enabled/disabled
- redundant_link: bool allows specifying if this link allows non-redundant downlinks
- redundant_link: bool specifying if access switch connections to this interface requires
redundant connections, which is the default. Set to false to allow non-redundant downlink.
- tags: List of strings, user-defined custom tags to use in templates
- cli_append_str: String of custom config that is appended to generated CLI config
- neighbor: Populated at init, contains hostname of peer. Should normally never
Expand Down
8 changes: 8 additions & 0 deletions docs/changelog/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Changelog
=========

Version 1.5.1
-------------

Bug fixes:

- Fix commit confirm mode 0 for EOS
- Update documentation for redundant_link

Version 1.5.0
-------------

Expand Down
3 changes: 1 addition & 2 deletions src/cnaas_nms/devicehandler/sync_devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,6 @@ def push_sync_device(
"replace": True,
"configuration": task.host["config"],
"dry_run": dry_run,
"commit_message": "Job id {}".format(job_id),
}
if dry_run:
task_args["task"] = napalm_configure
Expand Down Expand Up @@ -948,7 +947,7 @@ def sync_devices(
remove_sync_events(hostname)
dev.last_seen = datetime.datetime.utcnow()
if not dry_run and get_confirm_mode(confirm_mode_override) != 2:
if failed_hosts:
if failed_hosts and get_confirm_mode(confirm_mode_override) == 1:
logger.error(
"One or more devices failed to commit configuration, they will roll back configuration"
" in {}s: {}".format(api_settings.COMMIT_CONFIRMED_TIMEOUT, ", ".join(failed_hosts))
Expand Down