Prep release 6.1.0 (#249)

* Prep release 6.1.0

* fix

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix compat

* run tests

* make changes

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

CHANGELOG.rst

@@ -4,6 +4,27 @@ 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 - fixed Cliconf.edit_config() got an unexpected keyword argument 'candidate' error
+- cisco.asa.asa_acls - fixed ace parsing when source is object-group and its name contains dots
+- cisco.asa.asa_acls - fixed acl modification commands order if object/group name contains `no`
+
+Documentation Changes
+---------------------
+
+- Includes a new support related section in the README.
+
 v6.0.0
 ======
 

changelogs/changelog.yaml

@@ -212,6 +212,7 @@ releases:
       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`.
     fragments:
       - lint_fixtures.yaml
     release_date: "2023-11-30"
@@ -229,10 +230,33 @@ 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 - fixed Cliconf.edit_config() got an unexpected keyword argument
+          'candidate' error
+        - cisco.asa.asa_acls - fixed ace parsing when source is object-group and its
+          name contains dots
+        - cisco.asa.asa_acls - fixed acl modification commands order if object/group
+          name contains `no`
+      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
+      - 241-sorting-fix.yml
+      - adds_support.yaml
+      - asa_hardware.yml
+      - ignore_219.yaml
+    release_date: "2025-01-06"

galaxy.yml

@@ -11,6 +11,4 @@ readme: README.md
 repository: https://github.com/ansible-collections/cisco.asa
 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

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(

tests/unit/modules/conftest.py

@@ -27,8 +27,6 @@ def patch_ansible_module(request, mocker):
             request.param["ANSIBLE_MODULE_ARGS"]["_ansible_keep_remote_files"] = False
         args = json.dumps(request.param)
     else:
-        raise Exception(
-            "Malformed data to the patch_ansible_module pytest fixture",
-        )
+        raise Exception("Malformed data to the patch_ansible_module pytest fixture")
 
     mocker.patch("ansible.module_utils.basic._ANSIBLE_ARGS", to_bytes(args))

tests/unit/modules/network/asa/test_asa_acls.py

@@ -8,19 +8,6 @@
 
 __metaclass__ = type
 
-import sys
-
-import pytest
-
-
-# These tests and/or the module under test are unstable on Python 3.5.
-# See: https://app.shippable.com/github/ansible/ansible/runs/161331/15/tests
-# This is most likely due to CPython 3.5 not maintaining dict insertion order.
-pytestmark = pytest.mark.skipif(
-    sys.version_info[:2] == (3, 5),
-    reason="Tests and/or module are unstable on Python 3.5.",
-)
-
 from textwrap import dedent
 from unittest.mock import patch
 

tests/unit/modules/network/asa/test_asa_facts.py

@@ -18,9 +18,9 @@
 
 
 __metaclass__ = type
+from unittest.mock import patch
 
 from ansible_collections.cisco.asa.plugins.modules import asa_facts
-from ansible_collections.cisco.asa.tests.unit.compat.mock import patch
 from ansible_collections.cisco.asa.tests.unit.modules.utils import set_module_args
 
 from .asa_module import TestAsaModule, load_fixture

tests/unit/modules/network/asa/test_asa_ogs.py

@@ -8,21 +8,9 @@
 
 __metaclass__ = type
 
-import sys
-
-import pytest
-
-
-# These tests and/or the module under test are unstable on Python 3.5.
-# See: https://app.shippable.com/github/ansible/ansible/runs/161331/15/tests
-# This is most likely due to CPython 3.5 not maintaining dict insertion order.
-pytestmark = pytest.mark.skipif(
-    sys.version_info[:2] == (3, 5),
-    reason="Tests and/or module are unstable on Python 3.5.",
-)
+from unittest.mock import patch
 
 from ansible_collections.cisco.asa.plugins.modules import asa_ogs
-from ansible_collections.cisco.asa.tests.unit.compat.mock import patch
 from ansible_collections.cisco.asa.tests.unit.modules.utils import set_module_args
 
 from .asa_module import TestAsaModule, load_fixture

tests/unit/modules/utils.py

@@ -4,12 +4,12 @@
 __metaclass__ = type
 import json
 
+from unittest import TestCase
+from unittest.mock import patch
+
 from ansible.module_utils import basic
 from ansible.module_utils._text import to_bytes
 
-from ansible_collections.cisco.asa.tests.unit.compat import unittest
-from ansible_collections.cisco.asa.tests.unit.compat.mock import patch
-
 
 def set_module_args(args):
     if "_ansible_remote_tmp" not in args:
@@ -40,7 +40,7 @@ def fail_json(*args, **kwargs):
     raise AnsibleFailJson(kwargs)
 
 
-class ModuleTestCase(unittest.TestCase):
+class ModuleTestCase(TestCase):
     def setUp(self):
         self.mock_module = patch.multiple(
             basic.AnsibleModule,