Merge branch 'main' into update_snmp_traps

.pre-commit-config.yaml

@@ -18,12 +18,12 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/asottile/add-trailing-comma
-    rev: v3.0.1
+    rev: v3.1.0
     hooks:
       - id: add-trailing-comma
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.0.2"
+    rev: "v3.0.3"
     hooks:
       - id: prettier
         entry: env CI=1 bash -c "prettier --list-different . || ec=$? && prettier --loglevel=error --write . && exit $ec"
@@ -41,6 +41,6 @@ repos:
         args: ["--filter-files"]
 
   - repo: https://github.com/psf/black
-    rev: 23.7.0
+    rev: 23.9.1
     hooks:
       - id: black

changelogs/fragments/fix_ospfv2_integration_test.yml

@@ -0,0 +1,3 @@
+---
+trivial:
+  - ios_ospfv2 - fix initial_vrf_setup in integration tests which was not working due to missing parent attribute.

changelogs/fragments/logging_global_order.yaml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - ios_logging_global - fix configuration order to configure discriminator before buffer.

plugins/module_utils/network/ios/config/logging_global/logging_global.py

@@ -108,9 +108,9 @@ def _compare(self, want, have):
         the `want` and `have` data with the `parsers` defined
         for the Logging_global network resource.
         """
+        self._compare_complex_attrs(want, have)
         self.compare(parsers=self.parsers, want=want, have=have)
         self._compare_lists_attrs(want, have)
-        self._compare_complex_attrs(want, have)
 
     def _compare_lists_attrs(self, want, have):
         """Compare list of dict"""

tests/integration/targets/ios_ospfv2/tests/cli/_initial_vrf_setup.yaml

@@ -1,16 +1,9 @@
 ---
 - name: Create and setup VRF configuration
-  vars:
+  cisco.ios.ios_config:
     lines:
-      - ip vrf blue
       - rd 100:1
       - route-target export 100:1
       - route-target import 100:1
-      - exit
-      - ip vrf ospf_vrf
-      - rd 100:2
-      - route-target export 100:2
-      - route-target import 100:2
-      - exit
-  cisco.ios.ios_config:
-    config: "{{ lines }}"
+    parents:
+      - ip vrf blue