Merge branch 'main' into acls-diff-check-modes

Merge with main.

changelogs/fragments/251-replaced-overridden-for-bgp-communities-module.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+  - sonic_bgp_communities - Add support for replaced and overridden states (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/251).

changelogs/fragments/252-replaced-overridden-for-bgp-ext-communities-module.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+  - sonic_bgp_ext_communities - Add support for replaced and overridden states (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/252).

changelogs/fragments/279-playbook-check-diff-modes-and-radius-server-implement.yaml

@@ -1,2 +1,2 @@
-major_changes:
-  - Playbook check and diff modes utility functions and sonic_radius_server module support for the check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/279).
+minor_changes:
+  - sonic_radius_server - Add support for playbook check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/279).

changelogs/fragments/281-playbook-check-diff-modes-for-ntp-module.yaml

@@ -1,2 +1,3 @@
-major_changes:
-        - ntp_and_tacacs - Playbook check and diff modes support for sonic_ntp and sonic_tacacs_server modules (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/281).
+minor_changes:
+  - sonic_ntp - Add support for playbook check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/281).
+  - sonic_tacacs_server - Add support for playbook check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/281).

changelogs/fragments/284-playbook-check-diff-modes-for-system-and-port-group-modules.yaml

@@ -0,0 +1,3 @@
+minor_changes:
+        - sonic_system - Add support for playbook check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/284).
+        - sonic_port_group - Add support for playbook check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/284).

changelogs/fragments/285-playbook-check-diff-modes-for-vrfs-logging-ip-neighbor.yaml

@@ -1,2 +1,4 @@
-major_changes:
-        - vrfs_logging_ip_neighbor - Playbook check and diff modes supports for sonic_vrfs, sonic_logging and sonic_ip_neighbor modules (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/285).
+minor_changes:
+  - sonic_vrfs - Add support for playbook check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/285).
+  - sonic_logging - Add support for playbook check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/285).
+  - sonic_ip_neighbor - Add support for playbook check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/285).

changelogs/fragments/301-playbook-check-diff-modes-for-vlans-interfaces.yaml

@@ -0,0 +1,3 @@
+minor_changes:
+  - sonic_vlans - Add support for playbook check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/301).
+  - sonic_interfaces - Add support for playbook check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/301).

changelogs/fragments/303-playbook-check-diff-modes-for-l2-lag-interfaces.yaml

@@ -1,2 +1,3 @@
-major_changes:
-        - l2_lag_interfaces - Playbook check and diff modes supports for sonic_l2_interfaces and sonic_lag_interfaces modules (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/303).
+minor_changes:
+  - sonic_l2_interfaces - Add support for playbook check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/303).
+  - sonic_lag_interfaces - Add support for playbook check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/303).

changelogs/fragments/310-change-deleted-design-for-interfaces-module.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+  - sonic_interfaces - Change deleted design for interfaces module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/310).

plugins/module_utils/network/sonic/argspec/bgp_communities/bgp_communities.py

@@ -1,6 +1,6 @@
 #
 # -*- coding: utf-8 -*-
-# Copyright 2020 Dell Inc. or its subsidiaries. All Rights Reserved
+# Copyright 2023 Dell Inc. or its subsidiaries. All Rights Reserved
 # GNU General Public License v3.0+
 # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
@@ -54,6 +54,6 @@ def __init__(self, **kwargs):
                                                      'default': 'standard',
                                                      'type': 'str'}},
                                 'type': 'list'},
-                     'state': {'choices': ['merged', 'deleted'],
+                     'state': {'choices': ['merged', 'deleted', 'replaced', 'overridden'],
                                'default': 'merged',
                                'type': 'str'}}  # pylint: disable=C0301

plugins/module_utils/network/sonic/argspec/bgp_ext_communities/bgp_ext_communities.py

@@ -1,6 +1,6 @@
 #
 # -*- coding: utf-8 -*-
-# Copyright 2020 Dell Inc. or its subsidiaries. All Rights Reserved
+# Copyright 2023 Dell Inc. or its subsidiaries. All Rights Reserved
 # GNU General Public License v3.0+
 # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
@@ -68,7 +68,7 @@ def __init__(self, **kwargs):
             'type': 'list'
         },
         'state': {
-            'choices': ['merged', 'deleted'],
+            'choices': ['merged', 'deleted', 'replaced', 'overridden'],
             'default': 'merged',
             'type': 'str'
         }