Updated Interrupt inspector and SRIOV test case

Author: r-dailey

lisa/tools/interrupt_inspector.py

@@ -156,7 +156,7 @@ def get_interrupt_data(self) -> List[Interrupt]:
         # cpu2:timer                          4297          6
         # Total                              13950         25
         # The columns are in order: IRQ name, IRQ type, IRQ count, IRQ rate.
-        result = self.run()
+        result = self.run(force_run=True)
         mappings = result.stdout.splitlines(keepends=False)[1:-1]
         assert mappings
         interrupts = []

microsoft/testsuites/network/sriov.py

@@ -852,9 +852,15 @@ def verify_sriov_interrupts_change(self, environment: Environment) -> None:
                         client_nic_info.pci_slot
                     )
                 )
-                assert_that(len(final_pci_interrupts_by_cpus)).described_as(
-                    "final cpu count of interrupts should be equal to cpu count"
-                ).is_equal_to(client_cpu_count)
+                if isinstance(client_node.os, BSD):
+                    assert_that(len(final_pci_interrupts_by_cpus)).described_as(
+                        "initial cpu count of interrupts should be equal to cpu count"
+                        " plus one to account for control queue"
+                    ).is_equal_to(client_cpu_count + 1)
+                else:
+                    assert_that(len(final_pci_interrupts_by_cpus)).described_as(
+                        "initial cpu count of interrupts should be equal to cpu count"
+                    ).is_equal_to(client_cpu_count)
                 unused_cpu = 0
                 for (
                     cpu,