diff --git a/.jenkins.yaml b/.jenkins.yaml index ee18d9b8..dc8f0a2c 100644 --- a/.jenkins.yaml +++ b/.jenkins.yaml @@ -16,7 +16,6 @@ git: shallow_clone: true script: - - "ssh root@puckly.sunet.se /root/starttests.sh ${GIT_BRANCH}" # - "python3.7 -m venv venv" # - ". venv/bin/activate" # - "pip install --upgrade setuptools pip wheel mypy" diff --git a/docs/apiref/interfaces.rst b/docs/apiref/interfaces.rst index 44899740..a001226c 100644 --- a/docs/apiref/interfaces.rst +++ b/docs/apiref/interfaces.rst @@ -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 diff --git a/docs/changelog/index.rst b/docs/changelog/index.rst index 3b9e6c42..d3dfaaf5 100644 --- a/docs/changelog/index.rst +++ b/docs/changelog/index.rst @@ -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 ------------- diff --git a/requirements.txt b/requirements.txt index 335cecf5..3bc2accf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,8 +6,8 @@ Flask-JWT-Extended==4.4.4 flask-restx==1.0.5 flask==2.2.5 Flask-SocketIO==5.3.1 -gevent==21.12.0 -GitPython==3.1.35 +gevent==22.10.2 +GitPython==3.1.37 mypy==0.971 mypy-extensions==0.4.3 markupsafe==2.1.1 @@ -32,4 +32,4 @@ sqlalchemy-stubs==0.4 SQLAlchemy-Utils==0.38.3 pydantic==1.10.2 Werkzeug==2.2.3 -greenlet==1.1.3 +greenlet==3.0.1 diff --git a/src/cnaas_nms/devicehandler/sync_devices.py b/src/cnaas_nms/devicehandler/sync_devices.py index 0ab32ecc..b0b93cf9 100644 --- a/src/cnaas_nms/devicehandler/sync_devices.py +++ b/src/cnaas_nms/devicehandler/sync_devices.py @@ -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 @@ -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))