Merge branch 'ansible-collections:main' into add_UTs

changelogs/fragments/241-replaced-overridden-for-l3-interfaces-module.yaml

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

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

@@ -0,0 +1,4 @@
+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/288-mclag-replaced-overridden-vlan-range-support.yaml

@@ -0,0 +1,4 @@
+---
+minor_changes:
+  - sonic_mclag - Add support for replaced and overridden states (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/288).
+  - sonic_mclag - Add VLAN range support for 'unique_ip' and 'peer_gateway' options (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/288).

changelogs/fragments/289-bgp-neighbors-prefix-limit-fix.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+  - sonic_bgp_neighbors - Fixed prefix-limit issue (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/289)

changelogs/fragments/290-bgp-as-paths-replaced-overridden-support.yaml

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

changelogs/fragments/291-port-breakout-replaced-overridden-support.yaml

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

changelogs/fragments/293-add-mgmt-vrf-handling-in-vrfs-module.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+        - sonic_vrfs - Add mgmt VRF support to sonic_vrfs module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/293).

changelogs/fragments/294-verbose-regression-report-template.yaml

@@ -0,0 +1,3 @@
+---
+trivial:
+  - regression_report - Generate regression test report based on verbosity (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/294).

changelogs/fragments/298-add-mgmt-vrf-replaced-state-handling-in-vrfs-module.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+        - sonic_vrfs - Add mgmt VRF replaced state handling to sonic_vrfs module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/298).

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/302-stp-commands-delete-state-fix.yaml

@@ -0,0 +1,2 @@
+bugfixes:
+  - stp - Correct the commands list for STP delete state (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/302).

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

@@ -0,0 +1,3 @@
+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/304-playbook-check-diff-modes-for-users-aaa.yaml

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

changelogs/fragments/306-playbook-check-diff-modes-for-acls.yaml

@@ -0,0 +1,4 @@
+minor_changes:
+  - sonic_acl_interfaces - Add support for playbook check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/306).
+  - sonic_l2_acls - Add support for playbook check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/306).
+  - sonic_l3_acls - Add support for playbook check and diff modes (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/306).

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

changelogs/fragments/313-laybook-check-diff-modes-for-static-route.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+  - sonic_static_routes - Add playbook check and diff modes support for static routes resource module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/313).

meta/runtime.yml

@@ -51,3 +51,5 @@ plugin_routing:
       redirect: dellemc.enterprise_sonic.sonic
     sonic_system:
       redirect: dellemc.enterprise_sonic.sonic
+    sonic_pki:
+      redirect: dellemc.enterprise_sonic.sonic

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

@@ -43,6 +43,6 @@ def __init__(self, **kwargs):
                                                         'type': 'list'},
                                             'name': {'required': True, '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_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'
         }

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

@@ -0,0 +1,81 @@
+#
+# -*- coding: utf-8 -*-
+# 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)
+
+#############################################
+#                WARNING                    #
+#############################################
+#
+# This file is auto generated by the resource
+#   module builder playbook.
+#
+# Do not edit this file manually.
+#
+# Changes to this file will be over written
+#   by the resource module builder.
+#
+# Changes should be made in the model used to
+#   generate this file or in the resource module
+#   builder template.
+#
+#############################################
+
+"""
+The arg spec for the sonic_dhcp_snooping module
+"""
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+
+class Dhcp_snoopingArgs(object):  # pylint: disable=R0903
+    """The arg spec for the sonic_dhcp_snooping module"""
+
+    def __init__(self, **kwargs):
+        pass
+
+    argument_spec = {
+        'config': {
+            'options': {
+                'afis': {
+                    'elements': 'dict',
+                    'options': {
+                        'afi': {
+                            'choices': ['ipv4', 'ipv6'],
+                            'required': True,
+                            'type': 'str',
+                        },
+                        'enabled': {'type': 'bool'},
+                        'source_bindings': {
+                            'elements': 'dict',
+                            'options': {
+                                'mac_addr': {'required': True, 'type': 'str'},
+                                'ip_addr': {'type': 'str'},
+                                'intf_name': {'type': 'str'},
+                                'vlan_id': {'type': 'int'},
+                            },
+                            'type': 'list',
+                        },
+                        'trusted': {
+                            'elements': 'dict',
+                            'options': {
+                                'intf_name': {'required': True, 'type': 'str'},
+                            },
+                            'type': 'list',
+                        },
+                        'verify_mac': {'type': 'bool'},
+                        'vlans': {'elements': 'str', 'type': 'list'},
+                    },
+                    'type': 'list',
+                }
+            },
+            'type': 'dict',
+        },
+        'state': {
+            'choices': ['merged', 'deleted', 'overridden', 'replaced'],
+            'default': 'merged',
+            'type': 'str',
+        },
+    }  # pylint: disable=C0301

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

@@ -1,6 +1,6 @@
 #
 # -*- coding: utf-8 -*-
-# Copyright 2021 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)
 """
@@ -47,17 +47,20 @@ def __init__(self, **kwargs):
         'static_routes',
         'ntp',
         'logging',
+        'pki',
         'ip_neighbor',
         'port_group',
         'dhcp_relay',
+        'dhcp_snooping',
         'acl_interfaces',
         'l2_acls',
         'l3_acls',
         'lldp_global',
         'mac',
         'bfd',
         'copp',
-        'route_maps'
+        'route_maps',
+        'stp'
     ]
 
     argument_spec = {

plugins/module_utils/network/sonic/argspec/l3_interfaces/l3_interfaces.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)
 
@@ -74,7 +74,7 @@ def __init__(self, **kwargs):
             'type': 'list'
         },
         'state': {
-            'choices': ['merged', 'deleted'],
+            'choices': ['merged', 'deleted', 'replaced', 'overridden'],
             'default': 'merged',
             'type': 'str'
         }

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

@@ -89,7 +89,7 @@ def __init__(self, **kwargs):
             'type': 'dict'
         },
         'state': {
-            'choices': ['merged', 'deleted'],
+            'choices': ['merged', 'deleted', 'replaced', 'overridden'],
             'default': 'merged',
             'type': 'str'
         }

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

@@ -0,0 +1,78 @@
+#
+# -*- coding: utf-8 -*-
+# Copyright 2022 Dell EMC
+# GNU General Public License v3.0+
+# (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+#############################################
+#                WARNING                    #
+#############################################
+#
+# This file is auto generated by the resource
+#   module builder playbook.
+#
+# Do not edit this file manually.
+#
+# Changes to this file will be over written
+#   by the resource module builder.
+#
+# Changes should be made in the model used to
+#   generate this file or in the resource module
+#   builder template.
+#
+#############################################
+
+"""
+The arg spec for the sonic_pki module
+"""
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+
+
+class PkiArgs(object):  # pylint: disable=R0903
+    """The arg spec for the sonic_pki module
+    """
+
+    def __init__(self, **kwargs):
+        pass
+
+    argument_spec = {
+        'config': {
+            'options': {
+                'security_profiles': {
+                    'elements': 'dict',
+                    'options':
+                    {
+                        'cdp_list': {'elements': 'str', 'type': 'list'},
+                        'certificate_name': {'type': 'str'},
+                        'key_usage_check': {'type': 'bool'},
+                        'ocsp_responder_list':
+                        {
+                            'elements': 'str',
+                            'type': 'list'
+                        },
+                        'peer_name_check': {'type': 'bool'},
+                        'profile_name': {'required': True, 'type': 'str'},
+                        'revocation_check': {'type': 'bool'},
+                        'trust_store': {'type': 'str'}
+                    },
+                    'type': 'list'
+                },
+                'trust_stores': {
+                    'elements': 'dict',
+                    'options': {
+                        'ca_name': {'elements': 'str', 'type': 'list'},
+                        'name': {'required': True, 'type': 'str'}
+                    },
+                    'type': 'list'
+                }
+            },
+            'type': 'dict'
+        },
+        'state': {
+            'choices': ['merged', 'deleted', 'replaced', 'overridden'],
+            'default': 'merged',
+            'type': 'str'
+        }
+    }  # pylint: disable=C0301

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

@@ -53,7 +53,7 @@ def __init__(self, **kwargs):
             'type': 'list'
         },
         'state': {
-            'choices': ['merged', 'deleted'],
+            'choices': ['merged', 'deleted', 'replaced', 'overridden'],
             'default': 'merged'
         }
     }  # pylint: disable=C0301