Prep release 6.1.0

ansible-collections · Jan 6, 2025 · d003ec9 · d003ec9
1 parent 56eb2fa
commit d003ec9
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 191 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,25 @@ Cisco Asa Collection Release Notes
 
 .. contents:: Topics
 
+v6.1.0
+======
+
+Minor Changes
+-------------
+
+- cisco.asa.asa - add support to fetch hardware specific information in facts
+- cisco.asa.asa_acls - add support for specifying object-group as protocol
+
+Bugfixes
+--------
+
+- cisco.asa.asa_acls - fixed ace parsing when source is object-group and its name contains dots
+
+Documentation Changes
+---------------------
+
+- Includes a new support related section in the README.
+
 v6.0.0
 ======
 
@@ -31,7 +50,7 @@ v5.0.0
 Release Summary
 ---------------
 
-Starting from this release, the minimum `ansible-core` version this collection requires is `2.14.0`. The last known version compatible with ansible-core<2.14 is `v4.0.3`.
+Starting from this release, the minimum `ansible-core` version this collection requires is `2.14.0`. The last known version compatible with
 
 Major Changes
 -------------

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -229,10 +229,28 @@ releases:
         - Bumping `requires_ansible` to `>=2.15.0`, since previous ansible-core versions
           are EoL now.
       release_summary:
-        "With this release, the minimum required version of `ansible-core`
+        With this release, the minimum required version of `ansible-core`
         for this collection is `2.15.0`. The last version known to be compatible with
-        `ansible-core` versions below `2.15` is v5.0.1."
+        `ansible-core` versions below `2.15` is v5.0.1.
     fragments:
       - add_2.18.yaml
       - bump_215.yaml
     release_date: "2024-06-11"
+  6.1.0:
+    changes:
+      bugfixes:
+        - cisco.asa.asa_acls - fixed ace parsing when source is object-group and its
+          name contains dots
+      doc_changes:
+        - Includes a new support related section in the README.
+      minor_changes:
+        - cisco.asa.asa - add support to fetch hardware specific information in facts
+        - cisco.asa.asa_acls - add support for specifying object-group as protocol
+    fragments:
+      - 0-readme.yml
+      - 239-ace-object-group-fix.yml
+      - 240-ace-protocol-object-group.yml
+      - adds_support.yaml
+      - asa_hardware.yml
+      - ignore_219.yaml
+    release_date: "2025-01-06"
diff --git a/changelogs/fragments/0-readme.yml b/changelogs/fragments/0-readme.yml
diff --git a/changelogs/fragments/239-ace-object-group-fix.yml b/changelogs/fragments/239-ace-object-group-fix.yml
diff --git a/changelogs/fragments/240-ace-protocol-object-group.yml b/changelogs/fragments/240-ace-protocol-object-group.yml
diff --git a/changelogs/fragments/adds_support.yaml b/changelogs/fragments/adds_support.yaml
diff --git a/changelogs/fragments/asa_hardware.yml b/changelogs/fragments/asa_hardware.yml
diff --git a/changelogs/fragments/ignore_219.yaml b/changelogs/fragments/ignore_219.yaml
diff --git a/galaxy.yml b/galaxy.yml
@@ -13,4 +13,4 @@ issues: https://github.com/ansible-collections/cisco.asa/issues
 tags: [cisco, asa, networking, security]
 # NOTE(pabelanger): We create an empty version key to keep ansible-galaxy
 # happy. We dynamically inject version info based on git information.
-version: 6.0.0
+version: 6.1.0
diff --git a/plugins/module_utils/network/asa/facts/legacy/base.py b/plugins/module_utils/network/asa/facts/legacy/base.py
@@ -122,7 +122,7 @@ def populate(self):
             if "Invalid input detected" in data:
                 warnings.append("Unable to gather memory statistics")
             else:
-                mem_list = [l for l in data.splitlines() if "memory" in l]
+                mem_list = [mem for mem in data.splitlines() if "memory" in mem]
                 for each in mem_list:
                     if "Free memory" in each:
                         match = re.search(

diff --git a/tests/unit/compat/__init__.py b/tests/unit/compat/__init__.py
diff --git a/tests/unit/compat/mock.py b/tests/unit/compat/mock.py
diff --git a/tests/unit/compat/unittest.py b/tests/unit/compat/unittest.py