Add UTs for BFD, COPP, and MAC modules

changelogs/fragments/287-add-uts-for-bfd-copp-mac.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+  - tests - Add UTs for BFD, COPP, and MAC modules (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/287).

plugins/module_utils/network/sonic/config/copp/copp.py

@@ -328,31 +328,32 @@ def get_delete_copp_requests(self, commands, have, is_delete_all):
                     cir = group.get('cir', None)
                     cbs = group.get('cbs', None)
 
-                    cfg_copp_groups = have.get('copp_groups', None)
-                    if cfg_copp_groups:
-                        for cfg_group in cfg_copp_groups:
-                            cfg_copp_name = cfg_group.get('copp_name', None)
-                            cfg_trap_priority = cfg_group.get('trap_priority', None)
-                            cfg_trap_action = cfg_group.get('trap_action', None)
-                            cfg_queue = cfg_group.get('queue', None)
-                            cfg_cir = cfg_group.get('cir', None)
-                            cfg_cbs = cfg_group.get('cbs', None)
-
-                            if copp_name == cfg_copp_name:
-                                if trap_priority and trap_priority == cfg_trap_priority:
-                                    requests.append(self.get_delete_copp_groups_attr_request(copp_name, 'trap-priority'))
-                                if trap_action and trap_action == cfg_trap_action:
-                                    err_msg = "Deletion of trap-action attribute is not supported."
-                                    self._module.fail_json(msg=err_msg, code=405)
-                                    requests.append(self.get_delete_copp_groups_attr_request(copp_name, 'trap-action'))
-                                if queue and queue == cfg_queue:
-                                    requests.append(self.get_delete_copp_groups_attr_request(copp_name, 'queue'))
-                                if cir and cir == cfg_cir:
-                                    requests.append(self.get_delete_copp_groups_attr_request(copp_name, 'cir'))
-                                if cbs and cbs == cfg_cbs:
-                                    requests.append(self.get_delete_copp_groups_attr_request(copp_name, 'cbs'))
-                                if not trap_priority and not trap_action and not queue and not cir and not cbs:
-                                    requests.append(self.get_delete_single_copp_group_request(copp_name))
+                    if have:
+                        cfg_copp_groups = have.get('copp_groups', None)
+                        if cfg_copp_groups:
+                            for cfg_group in cfg_copp_groups:
+                                cfg_copp_name = cfg_group.get('copp_name', None)
+                                cfg_trap_priority = cfg_group.get('trap_priority', None)
+                                cfg_trap_action = cfg_group.get('trap_action', None)
+                                cfg_queue = cfg_group.get('queue', None)
+                                cfg_cir = cfg_group.get('cir', None)
+                                cfg_cbs = cfg_group.get('cbs', None)
+
+                                if copp_name == cfg_copp_name:
+                                    if trap_priority and trap_priority == cfg_trap_priority:
+                                        requests.append(self.get_delete_copp_groups_attr_request(copp_name, 'trap-priority'))
+                                    if trap_action and trap_action == cfg_trap_action:
+                                        err_msg = "Deletion of trap-action attribute is not supported."
+                                        self._module.fail_json(msg=err_msg, code=405)
+                                        requests.append(self.get_delete_copp_groups_attr_request(copp_name, 'trap-action'))
+                                    if queue and queue == cfg_queue:
+                                        requests.append(self.get_delete_copp_groups_attr_request(copp_name, 'queue'))
+                                    if cir and cir == cfg_cir:
+                                        requests.append(self.get_delete_copp_groups_attr_request(copp_name, 'cir'))
+                                    if cbs and cbs == cfg_cbs:
+                                        requests.append(self.get_delete_copp_groups_attr_request(copp_name, 'cbs'))
+                                    if not trap_priority and not trap_action and not queue and not cir and not cbs:
+                                        requests.append(self.get_delete_single_copp_group_request(copp_name))
 
         return requests
 
@@ -370,15 +371,17 @@ def get_delete_single_copp_group_request(self, copp_name):
 
     def filter_copp_groups(self, commands):
         cfg_dict = {}
-        copp_groups = commands.get('copp_groups', None)
-        if copp_groups:
-            copp_groups_list = []
-            for group in copp_groups:
-                copp_name = group.get('copp_name', None)
-                if copp_name not in reserved_copp_names:
-                    copp_groups_list.append(group)
-            if copp_groups_list:
-                cfg_dict['copp_groups'] = copp_groups_list
+
+        if commands:
+            copp_groups = commands.get('copp_groups', None)
+            if copp_groups:
+                copp_groups_list = []
+                for group in copp_groups:
+                    copp_name = group.get('copp_name', None)
+                    if copp_name not in reserved_copp_names:
+                        copp_groups_list.append(group)
+                if copp_groups_list:
+                    cfg_dict['copp_groups'] = copp_groups_list
 
         return cfg_dict
 

plugins/module_utils/network/sonic/config/mac/mac.py

@@ -317,38 +317,40 @@ def get_delete_mac_requests(self, commands, have, is_delete_all):
                     dampening_interval = mac.get('dampening_interval', None)
                     dampening_threshold = mac.get('dampening_threshold', None)
                     mac_table_entries = mac.get('mac_table_entries', [])
-                    if mac_table_entries:
-                        for entry in mac_table_entries:
-                            mac_address = entry.get('mac_address', None)
-                            vlan_id = entry.get('vlan_id', None)
-                            interface = entry.get('interface', None)
-
-                            for cfg in have:
-                                cfg_vrf_name = cfg.get('vrf_name', None)
-                                cfg_mac = cfg.get('mac', {})
-                                if cfg_mac:
-                                    cfg_aging_time = cfg_mac.get('aging_time', None)
-                                    cfg_dampening_interval = cfg_mac.get('dampening_interval', None)
-                                    cfg_dampening_threshold = cfg_mac.get('dampening_threshold', None)
-                                    cfg_mac_table_entries = cfg_mac.get('mac_table_entries', [])
-                                    if cfg_mac_table_entries:
-                                        for cfg_entry in cfg_mac_table_entries:
-                                            cfg_mac_address = cfg_entry.get('mac_address', None)
-                                            cfg_vlan_id = cfg_entry.get('vlan_id', None)
-                                            cfg_interface = cfg_entry.get('interface', None)
-                                            if vrf_name and vrf_name == cfg_vrf_name:
-                                                if aging_time and aging_time == cfg_aging_time:
-                                                    requests.append(self.get_delete_fdb_cfg_attr(vrf_name, 'mac-aging-time'))
-                                                if dampening_interval and dampening_interval == cfg_dampening_interval:
-                                                    requests.append(self.get_delete_mac_dampening_attr(vrf_name, 'interval'))
-                                                if dampening_threshold and dampening_threshold == cfg_dampening_threshold:
-                                                    requests.append(self.get_delete_mac_dampening_attr(vrf_name, 'threshold'))
+
+                    for cfg in have:
+                        cfg_vrf_name = cfg.get('vrf_name', None)
+                        cfg_mac = cfg.get('mac', {})
+                        if cfg_mac:
+                            cfg_aging_time = cfg_mac.get('aging_time', None)
+                            cfg_dampening_interval = cfg_mac.get('dampening_interval', None)
+                            cfg_dampening_threshold = cfg_mac.get('dampening_threshold', None)
+                            cfg_mac_table_entries = cfg_mac.get('mac_table_entries', [])
+
+                            if vrf_name and vrf_name == cfg_vrf_name:
+                                if aging_time and aging_time == cfg_aging_time:
+                                    requests.append(self.get_delete_fdb_cfg_attr(vrf_name, 'mac-aging-time'))
+                                if dampening_interval and dampening_interval == cfg_dampening_interval:
+                                    requests.append(self.get_delete_mac_dampening_attr(vrf_name, 'interval'))
+                                if dampening_threshold and dampening_threshold == cfg_dampening_threshold:
+                                    requests.append(self.get_delete_mac_dampening_attr(vrf_name, 'threshold'))
+
+                                if mac_table_entries:
+                                    for entry in mac_table_entries:
+                                        mac_address = entry.get('mac_address', None)
+                                        vlan_id = entry.get('vlan_id', None)
+                                        interface = entry.get('interface', None)
+
+                                        if cfg_mac_table_entries:
+                                            for cfg_entry in cfg_mac_table_entries:
+                                                cfg_mac_address = cfg_entry.get('mac_address', None)
+                                                cfg_vlan_id = cfg_entry.get('vlan_id', None)
+                                                cfg_interface = cfg_entry.get('interface', None)
                                                 if mac_address and vlan_id and mac_address == cfg_mac_address and vlan_id == cfg_vlan_id:
                                                     if interface and interface == cfg_interface:
                                                         requests.append(self.get_delete_mac_table_intf(vrf_name, mac_address, vlan_id))
                                                     elif not interface:
                                                         requests.append(self.get_delete_mac_table_entry(vrf_name, mac_address, vlan_id))
-
         return requests
 
     def get_delete_all_mac_requests(self, vrf_name):

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

@@ -233,5 +233,4 @@ def get_bfd_config(self, module):
                 bfd_cfg = response[0][1].get('openconfig-bfd:bfd', None)
         except ConnectionError as exc:
             module.fail_json(msg=str(exc), code=exc.code)
-
         return bfd_cfg

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

@@ -79,36 +79,37 @@ def render_config(self, spec, conf):
     def update_copp_groups(self, data):
         config_dict = {}
         all_copp_groups = []
-        copp_groups = data.get('copp-groups', None)
-        if copp_groups:
-            copp_group_list = copp_groups.get('copp-group', None)
-            if copp_group_list:
-                for group in copp_group_list:
-                    group_dict = {}
-                    copp_name = group['name']
-                    config = group['config']
-                    trap_priority = config.get('trap-priority', None)
-                    trap_action = config.get('trap-action', None)
-                    queue = config.get('queue', None)
-                    cir = config.get('cir', None)
-                    cbs = config.get('cbs', None)
-
-                    if copp_name:
-                        group_dict['copp_name'] = copp_name
-                    if trap_priority:
-                        group_dict['trap_priority'] = trap_priority
-                    if trap_action:
-                        group_dict['trap_action'] = trap_action
-                    if queue:
-                        group_dict['queue'] = queue
-                    if cir:
-                        group_dict['cir'] = cir
-                    if cbs:
-                        group_dict['cbs'] = cbs
-                    if group_dict:
-                        all_copp_groups.append(group_dict)
-
-        config_dict['copp_groups'] = all_copp_groups
+        if data:
+            copp_groups = data.get('copp-groups', None)
+            if copp_groups:
+                copp_group_list = copp_groups.get('copp-group', None)
+                if copp_group_list:
+                    for group in copp_group_list:
+                        group_dict = {}
+                        copp_name = group['name']
+                        config = group['config']
+                        trap_priority = config.get('trap-priority', None)
+                        trap_action = config.get('trap-action', None)
+                        queue = config.get('queue', None)
+                        cir = config.get('cir', None)
+                        cbs = config.get('cbs', None)
+
+                        if copp_name:
+                            group_dict['copp_name'] = copp_name
+                        if trap_priority:
+                            group_dict['trap_priority'] = trap_priority
+                        if trap_action:
+                            group_dict['trap_action'] = trap_action
+                        if queue:
+                            group_dict['queue'] = queue
+                        if cir:
+                            group_dict['cir'] = cir
+                        if cbs:
+                            group_dict['cbs'] = cbs
+                        if group_dict:
+                            all_copp_groups.append(group_dict)
+        if all_copp_groups:
+            config_dict['copp_groups'] = all_copp_groups
 
         return config_dict
 
@@ -123,5 +124,4 @@ def get_copp_config(self, module):
                 copp_cfg = response[0][1].get('openconfig-copp-ext:copp', None)
         except ConnectionError as exc:
             module.fail_json(msg=str(exc), code=exc.code)
-
         return copp_cfg

plugins/modules/sonic_bfd.py

@@ -239,7 +239,8 @@
 # (No "bfd peers" configuration present)
 
   - name: Merge BFD configuration
-    input:
+    dellemc.enterprise_sonic.sonic_bfd:
+    config:
       profiles:
         - profile_name: 'p1'
           enabled: True
@@ -364,7 +365,8 @@
 #         Echo transmission interval: 300ms
 
   - name: Replace BFD configuration
-    input:
+    dellemc.enterprise_sonic.sonic_bfd:
+    config:
       profiles:
         - profile_name: 'p1'
           transmit_interval: 144
@@ -456,7 +458,8 @@
 #             Echo transmission interval: 0ms
 
   - name: Override BFD configuration
-    input:
+    dellemc.enterprise_sonic.sonic_bfd:
+    config:
       single_hops:
         - remote_address: '172.68.2.1'
           vrf: 'default'
@@ -596,7 +599,8 @@
 #             Echo transmission interval: 0ms
 
   - name: Delete BFD configuration
-    input:
+    dellemc.enterprise_sonic.sonic_bfd:
+    config:
       profiles:
         - profile_name: 'p1'
           enabled: True

plugins/modules/sonic_copp.py

@@ -97,7 +97,7 @@
 # (No "copp actions" configuration present)
 
   - name: Merge CoPP groups configuration
-    dellemc.enterprise_sonic.sonic_static_routes:
+    dellemc.enterprise_sonic.sonic_copp:
     config:
       copp_groups:
         - copp_name: 'copp-1'
@@ -143,7 +143,7 @@
 #    police cir 45 cbs 45
 
   - name: Replace CoPP groups configuration
-    dellemc.enterprise_sonic.sonic_static_routes:
+    dellemc.enterprise_sonic.sonic_copp:
     config:
       copp_groups:
         - copp_name: 'copp-1'
@@ -190,7 +190,7 @@
 #    police cir 1000 cbs 1000
 
   - name: Override CoPP groups configuration
-    dellemc.enterprise_sonic.sonic_static_routes:
+    dellemc.enterprise_sonic.sonic_copp:
     config:
       copp_groups:
         - copp_name: 'copp-4'
@@ -230,7 +230,7 @@
 #    police cir 90 cbs 90
 
   - name: Delete CoPP groups configuration
-    dellemc.enterprise_sonic.sonic_static_routes:
+    dellemc.enterprise_sonic.sonic_copp:
     config:
       copp_groups:
         - copp_name: 'copp-1'

plugins/modules/sonic_mac.py

@@ -115,7 +115,8 @@
 # (No mac configuration pressent)
 
   - name: Merge MAC configurations
-    input:
+    dellemc.enterprise_sonic.sonic_mac:
+    config:
       - vrf_name: 'default'
         mac:
           aging_time: 50
@@ -161,7 +162,8 @@
 # mac address-table aging-time 50
 
   - name: Replace MAC configurations
-    input:
+    dellemc.enterprise_sonic.sonic_mac:
+    config:
       - vrf_name: 'default'
         mac:
           aging_time: 45
@@ -203,7 +205,8 @@
 # mac address-table aging-time 45
 
   - name: Override MAC cofigurations
-    input:
+    dellemc.enterprise_sonic.sonic_mac:
+    config:
       - vrf_name: 'default'
         mac:
           aging_time: 10
@@ -244,7 +247,8 @@
 # mac address-table aging-time 10
 
   - name: Delete MAC cofigurations
-    input:
+    dellemc.enterprise_sonic.sonic_mac:
+    config:
       - vrf_name: 'default'
         mac:
           aging_time: 10