updating rule

Author: juarocha

roles/validate/files/rules/common/312_topology_interface_storm_control.py

@@ -1,6 +1,6 @@
 class Rule:
     id = "312"
-    description = "Verify either percentage or PPS is configured for storm-control"
+    description = "Verify either percentage or PPS is configured on the switch for storm-control"
     severity = "HIGH"
 
     @classmethod
@@ -19,16 +19,20 @@ def match(cls, data_model):
         for switch in switches:
             check = cls.data_model_key_check(switch, ['interfaces'])
             if 'interfaces' in check['keys_data']:
-                interfaces = switch.get('interfaces')
-                for interface in interfaces:
-                    pct = {k for k in pct_keys if interface.get(k) is not None}
-                    pps = {k for k in pps_keys if interface.get(k) is not None}
-                    if pct and pps:
-                        results.append(
-                            f"switch {switch.get('name')} interface {interface.get('name')}: "
-                            f"storm_control percent and pps are mutually exclusive; "
-                            f"got {sorted(pct)} and {sorted(pps)}"
-                        )
+                pct_ifaces = []
+                pps_ifaces = []
+                for interface in switch.get('interfaces'):
+                    if any(interface.get(k) is not None for k in pct_keys):
+                        pct_ifaces.append(interface.get('name'))
+                    if any(interface.get(k) is not None for k in pps_keys):
+                        pps_ifaces.append(interface.get('name'))
+
+                if pct_ifaces and pps_ifaces:
+                    results.append(
+                        f"switch {switch.get('name')}: storm_control mode must be consistent "
+                        f"across all interfaces; percent-mode interfaces: {pct_ifaces}; "
+                        f"pps-mode interfaces: {pps_ifaces}"
+                    )
 
         return results