Merge pull request #324 from SUNET/bugfix.confirm_mode0_commitmessage…

…notimplemented

v1.5.1 bugfix

.jenkins.yaml

@@ -45,7 +45,7 @@ extra_jobs:
     docker_name: cnaas/api
     docker_context_dir: docker/api
     docker_tags:
-      - "v1.5"
+      - "v1.6"
       - "develop"
 
   - name: cnaas-api-master
@@ -56,7 +56,7 @@ extra_jobs:
     docker_name: cnaas/api
     docker_context_dir: docker/api
     docker_tags:
-      - "v1.4"
+      - "v1.5"
       - "master"
 
   - name: cnaas-postgres

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

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
 -------------
 

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))

src/cnaas_nms/version.py

@@ -1,3 +1,3 @@
-__version__ = "1.5.0"
+__version__ = "1.5.1"
 __version_info__ = tuple([field for field in __version__.split(".")])
 __api_version__ = "v1.0"